add as git submodule

1501 files changed, 24 insertions, 154770 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..346848a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "zuki-themes"]
+	path = zuki-themes
+	url = https://github.com/lassekongo83/zuki-themes.git
diff --git a/README.md b/README.md
index 8dd118d..2d2d8f9 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # shiki-colors-revival
 
-This consists mostly of a script that modifies the original Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave theme's
+This consists mostly of a script that modifies the original Zukitwo theme's
 files to fit to all of the colors in the GNOME Colors palette.
 
 At the moment, these themes are currently intended to be used with Xfce4, since
@@ -16,7 +16,7 @@ Use `./make-colors-themes` if you want to know what else the installer can do.
 
 ## Current problems
 - I'm still learning GTK, and GNOME developers, for some god-only-knows-why
-reason they decided to provide pretty awful documentation.
+  reason they decided to provide pretty awful documentation.
 - Eventually this will stop working since GNOME developers will probably think
   that GTK 3 on non-GNOME environments is deprecated or something, and not worth
   their support. It's probably better to use Qt in the future.
@@ -28,4 +28,4 @@ reason they decided to provide pretty awful documentation.
 
 ## Credits
 - Zuki-themes by [lassekongo83](http://lassekongo83.deviantart.com/)
-- Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-Colors-Xfwm by [fredbird67](http://xfce-look.org/usermanager/search.php?username=fredbird67)
+- Zukitwo-Colors-Xfwm by [fredbird67](http://xfce-look.org/usermanager/search.php?username=fredbird67)
diff --git a/Zukitwo-Brave/gtk-2.0/chromium.rc b/Zukitwo-Brave/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Brave/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Brave/gtk-2.0/gtkrc b/Zukitwo-Brave/gtk-2.0/gtkrc
deleted file mode 100644
index a2b8f54..0000000
--- a/Zukitwo-Brave/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#729fcf\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Brave/gtk-2.0/thunar.rc b/Zukitwo-Brave/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Brave/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Null/null.png b/Zukitwo-Brave/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Others/close.png b/Zukitwo-Brave/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Brave/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Others/null.png b/Zukitwo-Brave/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Brave/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Brave/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-2.0/widgets/panel.rc b/Zukitwo-Brave/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Brave/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Brave/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Brave/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/check-active.png b/Zukitwo-Brave/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Brave/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Brave/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Brave/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/check-normal.png b/Zukitwo-Brave/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Brave/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Brave/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Brave/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/header-separator.png b/Zukitwo-Brave/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Brave/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Brave/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/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Brave/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Brave/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/null.png b/Zukitwo-Brave/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Brave/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Brave/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/Zukitwo-Brave/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Brave/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Brave/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/Zukitwo-Brave/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Brave/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/radio-active.png b/Zukitwo-Brave/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Brave/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Brave/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Brave/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/radio-normal.png b/Zukitwo-Brave/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Brave/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/slider-hover.png b/Zukitwo-Brave/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/slider-ins.png b/Zukitwo-Brave/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/slider.png b/Zukitwo-Brave/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Brave/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Brave/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Brave/gtk-3.0/assets/switch-off.png b/Zukitwo-Brave/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/switch-off.svg b/Zukitwo-Brave/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Brave/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Brave/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Brave/gtk-3.0/assets/switch-on.png b/Zukitwo-Brave/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/assets/switch-on.svg b/Zukitwo-Brave/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Brave/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Brave/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Brave/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Brave/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/button-active.png b/Zukitwo-Brave/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/button-focus.png b/Zukitwo-Brave/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/button-ins.png b/Zukitwo-Brave/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/button.png b/Zukitwo-Brave/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Brave/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Brave/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-fallback.css b/Zukitwo-Brave/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-main-common.css b/Zukitwo-Brave/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-main.css b/Zukitwo-Brave/gtk-3.0/gtk-main.css
deleted file mode 100644
index b690d07..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #729fcf;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Brave/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Brave/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Brave/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Brave/gtk-3.0/gtk-widgets.css b/Zukitwo-Brave/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Brave/gtk-3.0/gtk.css b/Zukitwo-Brave/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Brave/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Brave/gtk-3.0/other-applications.css b/Zukitwo-Brave/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Brave/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Brave/gtk-3.0/settings.ini b/Zukitwo-Brave/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Brave/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Brave/gtk-3.0/unity.css b/Zukitwo-Brave/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Brave/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls.css b/Zukitwo-Brave/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Brave/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Brave/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/menu.png b/Zukitwo-Brave/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Brave/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Brave/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Brave/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/index.theme b/Zukitwo-Brave/index.theme
deleted file mode 100644
index 1b7de45..0000000
--- a/Zukitwo-Brave/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave
-MetacityTheme=Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Brave/metacity-1/close_focused_normal.svg b/Zukitwo-Brave/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Brave/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/close_focused_prelight.svg b/Zukitwo-Brave/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Brave/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/close_focused_pressed.svg b/Zukitwo-Brave/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Brave/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/close_unfocused.svg b/Zukitwo-Brave/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Brave/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Brave/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Brave/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/maximize_focused_normal.svg b/Zukitwo-Brave/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Brave/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Brave/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Brave/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Brave/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Brave/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/maximize_unfocused.svg b/Zukitwo-Brave/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Brave/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Brave/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Brave/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/menu.png b/Zukitwo-Brave/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Brave/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Brave/metacity-1/menu_prelight.png b/Zukitwo-Brave/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Brave/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/metacity-1/metacity-theme-2.xml b/Zukitwo-Brave/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index 45193f9..0000000
--- a/Zukitwo-Brave/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Brave/metacity-1/metacity-theme-3.xml b/Zukitwo-Brave/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index b85ec1f..0000000
--- a/Zukitwo-Brave/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave-Brave</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Brave/metacity-1/minimize_focused_normal.svg b/Zukitwo-Brave/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Brave/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Brave/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Brave/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Brave/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Brave/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/minimize_unfocused.svg b/Zukitwo-Brave/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Brave/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Brave/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Brave/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Brave/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Brave/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Brave/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Brave/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Brave/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Brave/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Brave/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Brave/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Brave/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Brave/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Brave/patches/enable-dark-menubar.patch b/Zukitwo-Brave/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Brave/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Brave/patches/panel.rc.patch b/Zukitwo-Brave/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Brave/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Brave/unity/close.png b/Zukitwo-Brave/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Brave/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/close_focused_normal.png b/Zukitwo-Brave/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Brave/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/close_focused_prelight.png b/Zukitwo-Brave/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Brave/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/close_focused_pressed.png b/Zukitwo-Brave/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Brave/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/close_unfocused.png b/Zukitwo-Brave/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Brave/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/close_unfocused_prelight.png b/Zukitwo-Brave/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Brave/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/close_unfocused_pressed.png b/Zukitwo-Brave/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Brave/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize.png b/Zukitwo-Brave/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Brave/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize_focused_normal.png b/Zukitwo-Brave/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Brave/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize_focused_prelight.png b/Zukitwo-Brave/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Brave/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize_focused_pressed.png b/Zukitwo-Brave/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Brave/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize_unfocused.png b/Zukitwo-Brave/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Brave/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize_unfocused_prelight.png b/Zukitwo-Brave/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Brave/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/maximize_unfocused_pressed.png b/Zukitwo-Brave/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Brave/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize.png b/Zukitwo-Brave/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Brave/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize_focused_normal.png b/Zukitwo-Brave/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Brave/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize_focused_prelight.png b/Zukitwo-Brave/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Brave/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize_focused_pressed.png b/Zukitwo-Brave/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Brave/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize_unfocused.png b/Zukitwo-Brave/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Brave/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize_unfocused_prelight.png b/Zukitwo-Brave/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Brave/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/minimize_unfocused_pressed.png b/Zukitwo-Brave/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Brave/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize.png b/Zukitwo-Brave/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Brave/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize_focused_normal.png b/Zukitwo-Brave/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Brave/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize_focused_prelight.png b/Zukitwo-Brave/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Brave/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize_focused_pressed.png b/Zukitwo-Brave/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Brave/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize_unfocused.png b/Zukitwo-Brave/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Brave/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Brave/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Brave/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Brave/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Brave/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Brave/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-active.png b/Zukitwo-Brave/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-active.xpm b/Zukitwo-Brave/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Brave/xfwm4/bottom-inactive.png b/Zukitwo-Brave/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-inactive.xpm b/Zukitwo-Brave/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Brave/xfwm4/bottom-left-active.png b/Zukitwo-Brave/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-left-active.xpm b/Zukitwo-Brave/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Brave/xfwm4/bottom-left-inactive.png b/Zukitwo-Brave/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Brave/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Brave/xfwm4/bottom-right-active.png b/Zukitwo-Brave/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-right-active.xpm b/Zukitwo-Brave/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Brave/xfwm4/bottom-right-inactive.png b/Zukitwo-Brave/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Brave/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Brave/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Brave/xfwm4/close-active.xpm b/Zukitwo-Brave/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Brave/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/close-inactive.xpm b/Zukitwo-Brave/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Brave/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Brave/xfwm4/close-prelight.xpm b/Zukitwo-Brave/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Brave/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/close-pressed.xpm b/Zukitwo-Brave/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Brave/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/hide-active.xpm b/Zukitwo-Brave/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Brave/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/hide-inactive.xpm b/Zukitwo-Brave/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Brave/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Brave/xfwm4/hide-prelight.xpm b/Zukitwo-Brave/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Brave/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/hide-pressed.xpm b/Zukitwo-Brave/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Brave/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/left-active.png b/Zukitwo-Brave/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Brave/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/left-active.xpm b/Zukitwo-Brave/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Brave/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Brave/xfwm4/left-inactive.png b/Zukitwo-Brave/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Brave/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/left-inactive.xpm b/Zukitwo-Brave/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Brave/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Brave/xfwm4/maximize-active.xpm b/Zukitwo-Brave/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Brave/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/maximize-inactive.xpm b/Zukitwo-Brave/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Brave/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Brave/xfwm4/maximize-prelight.xpm b/Zukitwo-Brave/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Brave/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/maximize-pressed.xpm b/Zukitwo-Brave/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Brave/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Brave/xfwm4/menu-active.xpm b/Zukitwo-Brave/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Brave/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Brave/xfwm4/menu-inactive.xpm b/Zukitwo-Brave/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Brave/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Brave/xfwm4/menu-prelight.xpm b/Zukitwo-Brave/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Brave/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Brave/xfwm4/menu-pressed.xpm b/Zukitwo-Brave/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Brave/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Brave/xfwm4/right-active.png b/Zukitwo-Brave/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Brave/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/right-active.xpm b/Zukitwo-Brave/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Brave/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Brave/xfwm4/right-inactive.png b/Zukitwo-Brave/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Brave/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/right-inactive.xpm b/Zukitwo-Brave/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Brave/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Brave/xfwm4/themerc b/Zukitwo-Brave/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Brave/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Brave/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Brave/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Brave/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-1-active.xpm b/Zukitwo-Brave/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Brave/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-1-inactive.xpm b/Zukitwo-Brave/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Brave/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-2-active.xpm b/Zukitwo-Brave/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Brave/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-2-inactive.xpm b/Zukitwo-Brave/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Brave/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-3-active.xpm b/Zukitwo-Brave/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Brave/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-3-inactive.xpm b/Zukitwo-Brave/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Brave/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-4-active.xpm b/Zukitwo-Brave/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Brave/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-4-inactive.xpm b/Zukitwo-Brave/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Brave/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-5-active.xpm b/Zukitwo-Brave/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Brave/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-5-inactive.xpm b/Zukitwo-Brave/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Brave/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Brave/xfwm4/title-left-active.png b/Zukitwo-Brave/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Brave/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/title-right-active.png b/Zukitwo-Brave/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Brave/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Brave/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Brave/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Brave/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Brave/xfwm4/top-left-active.xpm b/Zukitwo-Brave/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Brave/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Brave/xfwm4/top-left-inactive.xpm b/Zukitwo-Brave/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Brave/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Brave/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Brave/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Brave/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Brave/xfwm4/top-right-active.xpm b/Zukitwo-Brave/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Brave/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Brave/xfwm4/top-right-inactive.xpm b/Zukitwo-Brave/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Brave/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Dust/gtk-2.0/chromium.rc b/Zukitwo-Dust/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Dust/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Dust/gtk-2.0/gtkrc b/Zukitwo-Dust/gtk-2.0/gtkrc
deleted file mode 100644
index f639528..0000000
--- a/Zukitwo-Dust/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#27241F\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#b49372\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#27241F\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#27241F\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#27241F\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#27241F\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Dust/gtk-2.0/thunar.rc b/Zukitwo-Dust/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Dust/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Null/null.png b/Zukitwo-Dust/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Others/close.png b/Zukitwo-Dust/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Dust/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Others/null.png b/Zukitwo-Dust/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Dust/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Dust/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-2.0/widgets/panel.rc b/Zukitwo-Dust/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Dust/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Dust/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Dust/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/check-active.png b/Zukitwo-Dust/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Dust/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Dust/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Dust/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/check-normal.png b/Zukitwo-Dust/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Dust/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Dust/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Dust/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/header-separator.png b/Zukitwo-Dust/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Dust/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Dust/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/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Dust/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Dust/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/null.png b/Zukitwo-Dust/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Dust/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Dust/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/Zukitwo-Dust/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Dust/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Dust/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/Zukitwo-Dust/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Dust/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/radio-active.png b/Zukitwo-Dust/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Dust/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Dust/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Dust/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/radio-normal.png b/Zukitwo-Dust/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Dust/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/slider-hover.png b/Zukitwo-Dust/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/slider-ins.png b/Zukitwo-Dust/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/slider.png b/Zukitwo-Dust/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Dust/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Dust/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Dust/gtk-3.0/assets/switch-off.png b/Zukitwo-Dust/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/switch-off.svg b/Zukitwo-Dust/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Dust/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Dust/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Dust/gtk-3.0/assets/switch-on.png b/Zukitwo-Dust/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/assets/switch-on.svg b/Zukitwo-Dust/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Dust/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Dust/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Dust/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Dust/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/button-active.png b/Zukitwo-Dust/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/button-focus.png b/Zukitwo-Dust/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/button-ins.png b/Zukitwo-Dust/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/button.png b/Zukitwo-Dust/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Dust/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Dust/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-fallback.css b/Zukitwo-Dust/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-main-common.css b/Zukitwo-Dust/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-main.css b/Zukitwo-Dust/gtk-3.0/gtk-main.css
deleted file mode 100644
index ef95b68..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #b49372;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Dust/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Dust/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Dust/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Dust/gtk-3.0/gtk-widgets.css b/Zukitwo-Dust/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Dust/gtk-3.0/gtk.css b/Zukitwo-Dust/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Dust/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Dust/gtk-3.0/other-applications.css b/Zukitwo-Dust/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Dust/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Dust/gtk-3.0/settings.ini b/Zukitwo-Dust/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Dust/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Dust/gtk-3.0/unity.css b/Zukitwo-Dust/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Dust/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls.css b/Zukitwo-Dust/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Dust/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Dust/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/menu.png b/Zukitwo-Dust/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Dust/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Dust/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Dust/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/index.theme b/Zukitwo-Dust/index.theme
deleted file mode 100644
index 367831d..0000000
--- a/Zukitwo-Dust/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust
-MetacityTheme=Zukitwo-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Dust/metacity-1/close_focused_normal.svg b/Zukitwo-Dust/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Dust/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/close_focused_prelight.svg b/Zukitwo-Dust/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Dust/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/close_focused_pressed.svg b/Zukitwo-Dust/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Dust/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/close_unfocused.svg b/Zukitwo-Dust/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Dust/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Dust/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Dust/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/maximize_focused_normal.svg b/Zukitwo-Dust/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Dust/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Dust/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Dust/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Dust/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Dust/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/maximize_unfocused.svg b/Zukitwo-Dust/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Dust/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Dust/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Dust/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/menu.png b/Zukitwo-Dust/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Dust/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Dust/metacity-1/menu_prelight.png b/Zukitwo-Dust/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Dust/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/metacity-1/metacity-theme-2.xml b/Zukitwo-Dust/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index f3ce816..0000000
--- a/Zukitwo-Dust/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Dust/metacity-1/metacity-theme-3.xml b/Zukitwo-Dust/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index ef56cc0..0000000
--- a/Zukitwo-Dust/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust-Dust</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Dust/metacity-1/minimize_focused_normal.svg b/Zukitwo-Dust/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Dust/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Dust/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Dust/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Dust/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Dust/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/minimize_unfocused.svg b/Zukitwo-Dust/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Dust/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Dust/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Dust/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Dust/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Dust/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Dust/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Dust/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Dust/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Dust/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Dust/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Dust/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Dust/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Dust/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Dust/patches/enable-dark-menubar.patch b/Zukitwo-Dust/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Dust/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Dust/patches/panel.rc.patch b/Zukitwo-Dust/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Dust/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Dust/unity/close.png b/Zukitwo-Dust/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Dust/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/close_focused_normal.png b/Zukitwo-Dust/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Dust/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/close_focused_prelight.png b/Zukitwo-Dust/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Dust/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/close_focused_pressed.png b/Zukitwo-Dust/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Dust/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/close_unfocused.png b/Zukitwo-Dust/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Dust/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/close_unfocused_prelight.png b/Zukitwo-Dust/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Dust/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/close_unfocused_pressed.png b/Zukitwo-Dust/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Dust/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize.png b/Zukitwo-Dust/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Dust/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize_focused_normal.png b/Zukitwo-Dust/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Dust/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize_focused_prelight.png b/Zukitwo-Dust/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Dust/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize_focused_pressed.png b/Zukitwo-Dust/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Dust/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize_unfocused.png b/Zukitwo-Dust/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Dust/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize_unfocused_prelight.png b/Zukitwo-Dust/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Dust/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/maximize_unfocused_pressed.png b/Zukitwo-Dust/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Dust/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize.png b/Zukitwo-Dust/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Dust/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize_focused_normal.png b/Zukitwo-Dust/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Dust/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize_focused_prelight.png b/Zukitwo-Dust/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Dust/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize_focused_pressed.png b/Zukitwo-Dust/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Dust/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize_unfocused.png b/Zukitwo-Dust/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Dust/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize_unfocused_prelight.png b/Zukitwo-Dust/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Dust/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/minimize_unfocused_pressed.png b/Zukitwo-Dust/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Dust/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize.png b/Zukitwo-Dust/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Dust/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize_focused_normal.png b/Zukitwo-Dust/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Dust/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize_focused_prelight.png b/Zukitwo-Dust/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Dust/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize_focused_pressed.png b/Zukitwo-Dust/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Dust/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize_unfocused.png b/Zukitwo-Dust/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Dust/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Dust/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Dust/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Dust/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Dust/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Dust/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-active.png b/Zukitwo-Dust/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-active.xpm b/Zukitwo-Dust/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Dust/xfwm4/bottom-inactive.png b/Zukitwo-Dust/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-inactive.xpm b/Zukitwo-Dust/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Dust/xfwm4/bottom-left-active.png b/Zukitwo-Dust/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-left-active.xpm b/Zukitwo-Dust/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Dust/xfwm4/bottom-left-inactive.png b/Zukitwo-Dust/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Dust/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Dust/xfwm4/bottom-right-active.png b/Zukitwo-Dust/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-right-active.xpm b/Zukitwo-Dust/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Dust/xfwm4/bottom-right-inactive.png b/Zukitwo-Dust/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Dust/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Dust/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Dust/xfwm4/close-active.xpm b/Zukitwo-Dust/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Dust/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/close-inactive.xpm b/Zukitwo-Dust/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Dust/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Dust/xfwm4/close-prelight.xpm b/Zukitwo-Dust/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Dust/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/close-pressed.xpm b/Zukitwo-Dust/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Dust/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/hide-active.xpm b/Zukitwo-Dust/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Dust/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/hide-inactive.xpm b/Zukitwo-Dust/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Dust/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Dust/xfwm4/hide-prelight.xpm b/Zukitwo-Dust/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Dust/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/hide-pressed.xpm b/Zukitwo-Dust/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Dust/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/left-active.png b/Zukitwo-Dust/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Dust/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/left-active.xpm b/Zukitwo-Dust/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Dust/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Dust/xfwm4/left-inactive.png b/Zukitwo-Dust/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Dust/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/left-inactive.xpm b/Zukitwo-Dust/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Dust/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Dust/xfwm4/maximize-active.xpm b/Zukitwo-Dust/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Dust/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/maximize-inactive.xpm b/Zukitwo-Dust/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Dust/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Dust/xfwm4/maximize-prelight.xpm b/Zukitwo-Dust/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Dust/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/maximize-pressed.xpm b/Zukitwo-Dust/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Dust/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Dust/xfwm4/menu-active.xpm b/Zukitwo-Dust/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Dust/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Dust/xfwm4/menu-inactive.xpm b/Zukitwo-Dust/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Dust/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Dust/xfwm4/menu-prelight.xpm b/Zukitwo-Dust/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Dust/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Dust/xfwm4/menu-pressed.xpm b/Zukitwo-Dust/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Dust/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Dust/xfwm4/right-active.png b/Zukitwo-Dust/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Dust/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/right-active.xpm b/Zukitwo-Dust/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Dust/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Dust/xfwm4/right-inactive.png b/Zukitwo-Dust/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Dust/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/right-inactive.xpm b/Zukitwo-Dust/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Dust/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Dust/xfwm4/themerc b/Zukitwo-Dust/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Dust/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Dust/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Dust/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Dust/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-1-active.xpm b/Zukitwo-Dust/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Dust/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-1-inactive.xpm b/Zukitwo-Dust/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Dust/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-2-active.xpm b/Zukitwo-Dust/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Dust/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-2-inactive.xpm b/Zukitwo-Dust/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Dust/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-3-active.xpm b/Zukitwo-Dust/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Dust/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-3-inactive.xpm b/Zukitwo-Dust/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Dust/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-4-active.xpm b/Zukitwo-Dust/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Dust/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-4-inactive.xpm b/Zukitwo-Dust/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Dust/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-5-active.xpm b/Zukitwo-Dust/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Dust/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-5-inactive.xpm b/Zukitwo-Dust/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Dust/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Dust/xfwm4/title-left-active.png b/Zukitwo-Dust/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Dust/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/title-right-active.png b/Zukitwo-Dust/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Dust/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Dust/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Dust/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Dust/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Dust/xfwm4/top-left-active.xpm b/Zukitwo-Dust/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Dust/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Dust/xfwm4/top-left-inactive.xpm b/Zukitwo-Dust/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Dust/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Dust/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Dust/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Dust/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Dust/xfwm4/top-right-active.xpm b/Zukitwo-Dust/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Dust/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Dust/xfwm4/top-right-inactive.xpm b/Zukitwo-Dust/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Dust/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Human/gtk-2.0/chromium.rc b/Zukitwo-Human/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Human/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Human/gtk-2.0/gtkrc b/Zukitwo-Human/gtk-2.0/gtkrc
deleted file mode 100644
index 8e07d98..0000000
--- a/Zukitwo-Human/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#f7a145\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Human/gtk-2.0/thunar.rc b/Zukitwo-Human/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Human/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Null/null.png b/Zukitwo-Human/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Others/close.png b/Zukitwo-Human/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Human/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Others/null.png b/Zukitwo-Human/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Human/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Human/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Human/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Human/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Human/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-2.0/widgets/panel.rc b/Zukitwo-Human/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Human/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Human/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Human/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/check-active.png b/Zukitwo-Human/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Human/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Human/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Human/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/check-normal.png b/Zukitwo-Human/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Human/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Human/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Human/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/header-separator.png b/Zukitwo-Human/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Human/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Human/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/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Human/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Human/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/null.png b/Zukitwo-Human/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Human/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Human/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/Zukitwo-Human/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Human/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Human/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/Zukitwo-Human/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Human/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/radio-active.png b/Zukitwo-Human/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Human/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Human/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Human/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/radio-normal.png b/Zukitwo-Human/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Human/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/slider-hover.png b/Zukitwo-Human/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/slider-ins.png b/Zukitwo-Human/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/slider.png b/Zukitwo-Human/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Human/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Human/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Human/gtk-3.0/assets/switch-off.png b/Zukitwo-Human/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/switch-off.svg b/Zukitwo-Human/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Human/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Human/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Human/gtk-3.0/assets/switch-on.png b/Zukitwo-Human/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/assets/switch-on.svg b/Zukitwo-Human/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Human/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Human/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Human/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Human/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/button-active.png b/Zukitwo-Human/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/button-focus.png b/Zukitwo-Human/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/button-ins.png b/Zukitwo-Human/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/button.png b/Zukitwo-Human/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Human/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Human/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/gtk-fallback.css b/Zukitwo-Human/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Human/gtk-3.0/gtk-main-common.css b/Zukitwo-Human/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Human/gtk-3.0/gtk-main.css b/Zukitwo-Human/gtk-3.0/gtk-main.css
deleted file mode 100644
index 2c5e174..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #f7a145;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Human/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Human/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Human/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Human/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Human/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Human/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Human/gtk-3.0/gtk-widgets.css b/Zukitwo-Human/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Human/gtk-3.0/gtk.css b/Zukitwo-Human/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Human/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Human/gtk-3.0/other-applications.css b/Zukitwo-Human/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Human/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Human/gtk-3.0/settings.ini b/Zukitwo-Human/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Human/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Human/gtk-3.0/unity.css b/Zukitwo-Human/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Human/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Human/gtk-3.0/window-controls.css b/Zukitwo-Human/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Human/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Human/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Human/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Human/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/menu.png b/Zukitwo-Human/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Human/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Human/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Human/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/index.theme b/Zukitwo-Human/index.theme
deleted file mode 100644
index d163f28..0000000
--- a/Zukitwo-Human/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human
-MetacityTheme=Zukitwo-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Human/metacity-1/close_focused_normal.svg b/Zukitwo-Human/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Human/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/close_focused_prelight.svg b/Zukitwo-Human/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Human/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/close_focused_pressed.svg b/Zukitwo-Human/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Human/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/close_unfocused.svg b/Zukitwo-Human/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Human/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Human/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Human/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/maximize_focused_normal.svg b/Zukitwo-Human/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Human/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Human/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Human/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Human/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Human/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/maximize_unfocused.svg b/Zukitwo-Human/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Human/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Human/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Human/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/menu.png b/Zukitwo-Human/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Human/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Human/metacity-1/menu_prelight.png b/Zukitwo-Human/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Human/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/metacity-1/metacity-theme-2.xml b/Zukitwo-Human/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index 3131a8d..0000000
--- a/Zukitwo-Human/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Human/metacity-1/metacity-theme-3.xml b/Zukitwo-Human/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index 3767c8e..0000000
--- a/Zukitwo-Human/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human-Human</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Human/metacity-1/minimize_focused_normal.svg b/Zukitwo-Human/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Human/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Human/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Human/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Human/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Human/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/minimize_unfocused.svg b/Zukitwo-Human/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Human/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Human/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Human/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Human/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Human/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Human/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Human/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Human/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Human/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Human/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Human/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Human/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Human/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Human/patches/enable-dark-menubar.patch b/Zukitwo-Human/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Human/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Human/patches/panel.rc.patch b/Zukitwo-Human/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Human/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Human/unity/close.png b/Zukitwo-Human/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Human/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/close_focused_normal.png b/Zukitwo-Human/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Human/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/close_focused_prelight.png b/Zukitwo-Human/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Human/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/close_focused_pressed.png b/Zukitwo-Human/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Human/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/close_unfocused.png b/Zukitwo-Human/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Human/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/close_unfocused_prelight.png b/Zukitwo-Human/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Human/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/close_unfocused_pressed.png b/Zukitwo-Human/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Human/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize.png b/Zukitwo-Human/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Human/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize_focused_normal.png b/Zukitwo-Human/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Human/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize_focused_prelight.png b/Zukitwo-Human/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Human/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize_focused_pressed.png b/Zukitwo-Human/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Human/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize_unfocused.png b/Zukitwo-Human/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Human/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize_unfocused_prelight.png b/Zukitwo-Human/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Human/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/maximize_unfocused_pressed.png b/Zukitwo-Human/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Human/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize.png b/Zukitwo-Human/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Human/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize_focused_normal.png b/Zukitwo-Human/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Human/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize_focused_prelight.png b/Zukitwo-Human/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Human/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize_focused_pressed.png b/Zukitwo-Human/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Human/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize_unfocused.png b/Zukitwo-Human/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Human/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize_unfocused_prelight.png b/Zukitwo-Human/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Human/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/minimize_unfocused_pressed.png b/Zukitwo-Human/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Human/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize.png b/Zukitwo-Human/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Human/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize_focused_normal.png b/Zukitwo-Human/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Human/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize_focused_prelight.png b/Zukitwo-Human/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Human/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize_focused_pressed.png b/Zukitwo-Human/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Human/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize_unfocused.png b/Zukitwo-Human/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Human/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Human/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Human/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Human/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Human/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Human/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-active.png b/Zukitwo-Human/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Human/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-active.xpm b/Zukitwo-Human/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Human/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Human/xfwm4/bottom-inactive.png b/Zukitwo-Human/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Human/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-inactive.xpm b/Zukitwo-Human/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Human/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Human/xfwm4/bottom-left-active.png b/Zukitwo-Human/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Human/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-left-active.xpm b/Zukitwo-Human/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Human/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Human/xfwm4/bottom-left-inactive.png b/Zukitwo-Human/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Human/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Human/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Human/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Human/xfwm4/bottom-right-active.png b/Zukitwo-Human/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Human/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-right-active.xpm b/Zukitwo-Human/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Human/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Human/xfwm4/bottom-right-inactive.png b/Zukitwo-Human/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Human/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Human/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Human/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Human/xfwm4/close-active.xpm b/Zukitwo-Human/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Human/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/close-inactive.xpm b/Zukitwo-Human/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Human/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Human/xfwm4/close-prelight.xpm b/Zukitwo-Human/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Human/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/close-pressed.xpm b/Zukitwo-Human/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Human/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/hide-active.xpm b/Zukitwo-Human/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Human/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/hide-inactive.xpm b/Zukitwo-Human/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Human/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Human/xfwm4/hide-prelight.xpm b/Zukitwo-Human/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Human/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/hide-pressed.xpm b/Zukitwo-Human/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Human/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/left-active.png b/Zukitwo-Human/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Human/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/left-active.xpm b/Zukitwo-Human/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Human/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Human/xfwm4/left-inactive.png b/Zukitwo-Human/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Human/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/left-inactive.xpm b/Zukitwo-Human/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Human/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Human/xfwm4/maximize-active.xpm b/Zukitwo-Human/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Human/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/maximize-inactive.xpm b/Zukitwo-Human/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Human/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Human/xfwm4/maximize-prelight.xpm b/Zukitwo-Human/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Human/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/maximize-pressed.xpm b/Zukitwo-Human/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Human/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Human/xfwm4/menu-active.xpm b/Zukitwo-Human/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Human/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Human/xfwm4/menu-inactive.xpm b/Zukitwo-Human/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Human/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Human/xfwm4/menu-prelight.xpm b/Zukitwo-Human/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Human/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Human/xfwm4/menu-pressed.xpm b/Zukitwo-Human/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Human/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Human/xfwm4/right-active.png b/Zukitwo-Human/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Human/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/right-active.xpm b/Zukitwo-Human/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Human/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Human/xfwm4/right-inactive.png b/Zukitwo-Human/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Human/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/right-inactive.xpm b/Zukitwo-Human/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Human/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Human/xfwm4/themerc b/Zukitwo-Human/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Human/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Human/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Human/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Human/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-1-active.xpm b/Zukitwo-Human/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Human/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-1-inactive.xpm b/Zukitwo-Human/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Human/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-2-active.xpm b/Zukitwo-Human/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Human/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-2-inactive.xpm b/Zukitwo-Human/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Human/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-3-active.xpm b/Zukitwo-Human/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Human/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-3-inactive.xpm b/Zukitwo-Human/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Human/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-4-active.xpm b/Zukitwo-Human/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Human/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-4-inactive.xpm b/Zukitwo-Human/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Human/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-5-active.xpm b/Zukitwo-Human/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Human/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-5-inactive.xpm b/Zukitwo-Human/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Human/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Human/xfwm4/title-left-active.png b/Zukitwo-Human/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Human/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/title-right-active.png b/Zukitwo-Human/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Human/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Human/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Human/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Human/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Human/xfwm4/top-left-active.xpm b/Zukitwo-Human/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Human/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Human/xfwm4/top-left-inactive.xpm b/Zukitwo-Human/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Human/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Human/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Human/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Human/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Human/xfwm4/top-right-active.xpm b/Zukitwo-Human/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Human/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Human/xfwm4/top-right-inactive.xpm b/Zukitwo-Human/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Human/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Illustrious/gtk-2.0/chromium.rc b/Zukitwo-Illustrious/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Illustrious/gtk-2.0/gtkrc b/Zukitwo-Illustrious/gtk-2.0/gtkrc
deleted file mode 100644
index 15c883d..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#f08290\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Illustrious/gtk-2.0/thunar.rc b/Zukitwo-Illustrious/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Null/null.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Others/close.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Others/null.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-2.0/widgets/panel.rc b/Zukitwo-Illustrious/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Illustrious/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/check-active.png b/Zukitwo-Illustrious/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Illustrious/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/check-normal.png b/Zukitwo-Illustrious/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Illustrious/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Illustrious/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Illustrious/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/header-separator.png b/Zukitwo-Illustrious/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Illustrious/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Illustrious/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/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Illustrious/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Illustrious/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/null.png b/Zukitwo-Illustrious/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Illustrious/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Illustrious/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/Zukitwo-Illustrious/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Illustrious/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Illustrious/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/Zukitwo-Illustrious/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/radio-active.png b/Zukitwo-Illustrious/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Illustrious/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/radio-normal.png b/Zukitwo-Illustrious/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Illustrious/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/slider-hover.png b/Zukitwo-Illustrious/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/slider-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/slider.png b/Zukitwo-Illustrious/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Illustrious/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Illustrious/gtk-3.0/assets/switch-off.png b/Zukitwo-Illustrious/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off.svg b/Zukitwo-Illustrious/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Illustrious/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Illustrious/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Illustrious/gtk-3.0/assets/switch-on.png b/Zukitwo-Illustrious/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on.svg b/Zukitwo-Illustrious/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Illustrious/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Illustrious/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Illustrious/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/button-active.png b/Zukitwo-Illustrious/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/button-focus.png b/Zukitwo-Illustrious/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/button-ins.png b/Zukitwo-Illustrious/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/button.png b/Zukitwo-Illustrious/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Illustrious/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-fallback.css b/Zukitwo-Illustrious/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-main-common.css b/Zukitwo-Illustrious/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-main.css b/Zukitwo-Illustrious/gtk-3.0/gtk-main.css
deleted file mode 100644
index dad29c4..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #f08290;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets.css b/Zukitwo-Illustrious/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/gtk.css b/Zukitwo-Illustrious/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Illustrious/gtk-3.0/other-applications.css b/Zukitwo-Illustrious/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/settings.ini b/Zukitwo-Illustrious/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Illustrious/gtk-3.0/unity.css b/Zukitwo-Illustrious/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls.css b/Zukitwo-Illustrious/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/menu.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Illustrious/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/index.theme b/Zukitwo-Illustrious/index.theme
deleted file mode 100644
index 0aaa51b..0000000
--- a/Zukitwo-Illustrious/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious
-MetacityTheme=Zukitwo-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Illustrious/metacity-1/close_focused_normal.svg b/Zukitwo-Illustrious/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Illustrious/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/close_focused_prelight.svg b/Zukitwo-Illustrious/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Illustrious/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/close_focused_pressed.svg b/Zukitwo-Illustrious/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Illustrious/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/close_unfocused.svg b/Zukitwo-Illustrious/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Illustrious/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Illustrious/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Illustrious/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/maximize_focused_normal.svg b/Zukitwo-Illustrious/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Illustrious/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Illustrious/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Illustrious/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Illustrious/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Illustrious/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/maximize_unfocused.svg b/Zukitwo-Illustrious/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Illustrious/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Illustrious/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Illustrious/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/menu.png b/Zukitwo-Illustrious/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Illustrious/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/metacity-1/menu_prelight.png b/Zukitwo-Illustrious/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Illustrious/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/metacity-1/metacity-theme-2.xml b/Zukitwo-Illustrious/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index f8801d5..0000000
--- a/Zukitwo-Illustrious/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Illustrious/metacity-1/metacity-theme-3.xml b/Zukitwo-Illustrious/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index 8af3dbc..0000000
--- a/Zukitwo-Illustrious/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious-Illustrious</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Illustrious/metacity-1/minimize_focused_normal.svg b/Zukitwo-Illustrious/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Illustrious/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Illustrious/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Illustrious/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Illustrious/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Illustrious/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/minimize_unfocused.svg b/Zukitwo-Illustrious/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Illustrious/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Illustrious/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Illustrious/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Illustrious/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Illustrious/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Illustrious/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Illustrious/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Illustrious/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Illustrious/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Illustrious/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Illustrious/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Illustrious/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Illustrious/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Illustrious/patches/enable-dark-menubar.patch b/Zukitwo-Illustrious/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Illustrious/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Illustrious/patches/panel.rc.patch b/Zukitwo-Illustrious/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Illustrious/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Illustrious/unity/close.png b/Zukitwo-Illustrious/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Illustrious/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/close_focused_normal.png b/Zukitwo-Illustrious/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Illustrious/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/close_focused_prelight.png b/Zukitwo-Illustrious/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Illustrious/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/close_focused_pressed.png b/Zukitwo-Illustrious/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Illustrious/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/close_unfocused.png b/Zukitwo-Illustrious/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Illustrious/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/close_unfocused_prelight.png b/Zukitwo-Illustrious/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Illustrious/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/close_unfocused_pressed.png b/Zukitwo-Illustrious/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Illustrious/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize.png b/Zukitwo-Illustrious/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Illustrious/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize_focused_normal.png b/Zukitwo-Illustrious/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Illustrious/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize_focused_prelight.png b/Zukitwo-Illustrious/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Illustrious/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize_focused_pressed.png b/Zukitwo-Illustrious/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Illustrious/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize_unfocused.png b/Zukitwo-Illustrious/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Illustrious/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize_unfocused_prelight.png b/Zukitwo-Illustrious/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Illustrious/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/maximize_unfocused_pressed.png b/Zukitwo-Illustrious/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Illustrious/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize.png b/Zukitwo-Illustrious/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Illustrious/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize_focused_normal.png b/Zukitwo-Illustrious/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Illustrious/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize_focused_prelight.png b/Zukitwo-Illustrious/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Illustrious/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize_focused_pressed.png b/Zukitwo-Illustrious/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Illustrious/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize_unfocused.png b/Zukitwo-Illustrious/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Illustrious/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize_unfocused_prelight.png b/Zukitwo-Illustrious/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Illustrious/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/minimize_unfocused_pressed.png b/Zukitwo-Illustrious/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Illustrious/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize.png b/Zukitwo-Illustrious/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize_focused_normal.png b/Zukitwo-Illustrious/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize_focused_prelight.png b/Zukitwo-Illustrious/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize_focused_pressed.png b/Zukitwo-Illustrious/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize_unfocused.png b/Zukitwo-Illustrious/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Illustrious/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Illustrious/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Illustrious/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-active.png b/Zukitwo-Illustrious/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-active.xpm b/Zukitwo-Illustrious/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-inactive.png b/Zukitwo-Illustrious/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-inactive.xpm b/Zukitwo-Illustrious/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-left-active.png b/Zukitwo-Illustrious/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-left-active.xpm b/Zukitwo-Illustrious/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-left-inactive.png b/Zukitwo-Illustrious/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Illustrious/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-right-active.png b/Zukitwo-Illustrious/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-right-active.xpm b/Zukitwo-Illustrious/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-right-inactive.png b/Zukitwo-Illustrious/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Illustrious/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Illustrious/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Illustrious/xfwm4/close-active.xpm b/Zukitwo-Illustrious/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Illustrious/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/close-inactive.xpm b/Zukitwo-Illustrious/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Illustrious/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Illustrious/xfwm4/close-prelight.xpm b/Zukitwo-Illustrious/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Illustrious/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/close-pressed.xpm b/Zukitwo-Illustrious/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Illustrious/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/hide-active.xpm b/Zukitwo-Illustrious/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Illustrious/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/hide-inactive.xpm b/Zukitwo-Illustrious/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Illustrious/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Illustrious/xfwm4/hide-prelight.xpm b/Zukitwo-Illustrious/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Illustrious/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/hide-pressed.xpm b/Zukitwo-Illustrious/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Illustrious/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/left-active.png b/Zukitwo-Illustrious/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Illustrious/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/left-active.xpm b/Zukitwo-Illustrious/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Illustrious/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Illustrious/xfwm4/left-inactive.png b/Zukitwo-Illustrious/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Illustrious/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/left-inactive.xpm b/Zukitwo-Illustrious/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Illustrious/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Illustrious/xfwm4/maximize-active.xpm b/Zukitwo-Illustrious/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Illustrious/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/maximize-inactive.xpm b/Zukitwo-Illustrious/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Illustrious/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Illustrious/xfwm4/maximize-prelight.xpm b/Zukitwo-Illustrious/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Illustrious/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/maximize-pressed.xpm b/Zukitwo-Illustrious/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Illustrious/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Illustrious/xfwm4/menu-active.xpm b/Zukitwo-Illustrious/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Illustrious/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Illustrious/xfwm4/menu-inactive.xpm b/Zukitwo-Illustrious/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Illustrious/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Illustrious/xfwm4/menu-prelight.xpm b/Zukitwo-Illustrious/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Illustrious/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Illustrious/xfwm4/menu-pressed.xpm b/Zukitwo-Illustrious/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Illustrious/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Illustrious/xfwm4/right-active.png b/Zukitwo-Illustrious/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Illustrious/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/right-active.xpm b/Zukitwo-Illustrious/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Illustrious/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Illustrious/xfwm4/right-inactive.png b/Zukitwo-Illustrious/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Illustrious/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/right-inactive.xpm b/Zukitwo-Illustrious/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Illustrious/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Illustrious/xfwm4/themerc b/Zukitwo-Illustrious/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Illustrious/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Illustrious/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Illustrious/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-1-active.xpm b/Zukitwo-Illustrious/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-1-inactive.xpm b/Zukitwo-Illustrious/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-2-active.xpm b/Zukitwo-Illustrious/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-2-inactive.xpm b/Zukitwo-Illustrious/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-3-active.xpm b/Zukitwo-Illustrious/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-3-inactive.xpm b/Zukitwo-Illustrious/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-4-active.xpm b/Zukitwo-Illustrious/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-4-inactive.xpm b/Zukitwo-Illustrious/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-5-active.xpm b/Zukitwo-Illustrious/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-5-inactive.xpm b/Zukitwo-Illustrious/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Illustrious/xfwm4/title-left-active.png b/Zukitwo-Illustrious/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/title-right-active.png b/Zukitwo-Illustrious/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Illustrious/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Illustrious/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Illustrious/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Illustrious/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Illustrious/xfwm4/top-left-active.xpm b/Zukitwo-Illustrious/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Illustrious/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Illustrious/xfwm4/top-left-inactive.xpm b/Zukitwo-Illustrious/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Illustrious/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Illustrious/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Illustrious/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Illustrious/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Illustrious/xfwm4/top-right-active.xpm b/Zukitwo-Illustrious/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Illustrious/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Illustrious/xfwm4/top-right-inactive.xpm b/Zukitwo-Illustrious/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Illustrious/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Noble/gtk-2.0/chromium.rc b/Zukitwo-Noble/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Noble/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Noble/gtk-2.0/gtkrc b/Zukitwo-Noble/gtk-2.0/gtkrc
deleted file mode 100644
index c1ed9b0..0000000
--- a/Zukitwo-Noble/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#ad7fa8\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Noble/gtk-2.0/thunar.rc b/Zukitwo-Noble/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Noble/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Null/null.png b/Zukitwo-Noble/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Others/close.png b/Zukitwo-Noble/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Noble/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Others/null.png b/Zukitwo-Noble/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Noble/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Noble/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-2.0/widgets/panel.rc b/Zukitwo-Noble/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Noble/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Noble/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Noble/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/check-active.png b/Zukitwo-Noble/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Noble/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Noble/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Noble/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/check-normal.png b/Zukitwo-Noble/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Noble/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Noble/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Noble/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/header-separator.png b/Zukitwo-Noble/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Noble/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Noble/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/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Noble/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Noble/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/null.png b/Zukitwo-Noble/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Noble/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Noble/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/Zukitwo-Noble/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Noble/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Noble/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/Zukitwo-Noble/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Noble/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/radio-active.png b/Zukitwo-Noble/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Noble/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Noble/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Noble/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/radio-normal.png b/Zukitwo-Noble/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Noble/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/slider-hover.png b/Zukitwo-Noble/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/slider-ins.png b/Zukitwo-Noble/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/slider.png b/Zukitwo-Noble/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Noble/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Noble/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Noble/gtk-3.0/assets/switch-off.png b/Zukitwo-Noble/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/switch-off.svg b/Zukitwo-Noble/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Noble/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Noble/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Noble/gtk-3.0/assets/switch-on.png b/Zukitwo-Noble/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/assets/switch-on.svg b/Zukitwo-Noble/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Noble/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Noble/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Noble/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Noble/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/button-active.png b/Zukitwo-Noble/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/button-focus.png b/Zukitwo-Noble/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/button-ins.png b/Zukitwo-Noble/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/button.png b/Zukitwo-Noble/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Noble/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Noble/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-fallback.css b/Zukitwo-Noble/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-main-common.css b/Zukitwo-Noble/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-main.css b/Zukitwo-Noble/gtk-3.0/gtk-main.css
deleted file mode 100644
index 2a84b16..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #ad7fa8;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Noble/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Noble/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Noble/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Noble/gtk-3.0/gtk-widgets.css b/Zukitwo-Noble/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Noble/gtk-3.0/gtk.css b/Zukitwo-Noble/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Noble/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Noble/gtk-3.0/other-applications.css b/Zukitwo-Noble/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Noble/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Noble/gtk-3.0/settings.ini b/Zukitwo-Noble/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Noble/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Noble/gtk-3.0/unity.css b/Zukitwo-Noble/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Noble/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls.css b/Zukitwo-Noble/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Noble/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Noble/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/menu.png b/Zukitwo-Noble/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Noble/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Noble/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Noble/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/index.theme b/Zukitwo-Noble/index.theme
deleted file mode 100644
index 44cf03b..0000000
--- a/Zukitwo-Noble/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble
-MetacityTheme=Zukitwo-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Noble/metacity-1/close_focused_normal.svg b/Zukitwo-Noble/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Noble/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/close_focused_prelight.svg b/Zukitwo-Noble/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Noble/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/close_focused_pressed.svg b/Zukitwo-Noble/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Noble/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/close_unfocused.svg b/Zukitwo-Noble/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Noble/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Noble/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Noble/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/maximize_focused_normal.svg b/Zukitwo-Noble/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Noble/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Noble/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Noble/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Noble/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Noble/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/maximize_unfocused.svg b/Zukitwo-Noble/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Noble/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Noble/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Noble/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/menu.png b/Zukitwo-Noble/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Noble/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Noble/metacity-1/menu_prelight.png b/Zukitwo-Noble/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Noble/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/metacity-1/metacity-theme-2.xml b/Zukitwo-Noble/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index 13ad330..0000000
--- a/Zukitwo-Noble/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Noble/metacity-1/metacity-theme-3.xml b/Zukitwo-Noble/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index 3579e1f..0000000
--- a/Zukitwo-Noble/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble-Noble</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Noble/metacity-1/minimize_focused_normal.svg b/Zukitwo-Noble/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Noble/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Noble/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Noble/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Noble/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Noble/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/minimize_unfocused.svg b/Zukitwo-Noble/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Noble/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Noble/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Noble/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Noble/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Noble/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Noble/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Noble/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Noble/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Noble/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Noble/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Noble/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Noble/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Noble/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Noble/patches/enable-dark-menubar.patch b/Zukitwo-Noble/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Noble/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Noble/patches/panel.rc.patch b/Zukitwo-Noble/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Noble/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Noble/unity/close.png b/Zukitwo-Noble/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Noble/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/close_focused_normal.png b/Zukitwo-Noble/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Noble/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/close_focused_prelight.png b/Zukitwo-Noble/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Noble/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/close_focused_pressed.png b/Zukitwo-Noble/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Noble/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/close_unfocused.png b/Zukitwo-Noble/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Noble/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/close_unfocused_prelight.png b/Zukitwo-Noble/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Noble/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/close_unfocused_pressed.png b/Zukitwo-Noble/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Noble/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize.png b/Zukitwo-Noble/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Noble/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize_focused_normal.png b/Zukitwo-Noble/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Noble/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize_focused_prelight.png b/Zukitwo-Noble/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Noble/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize_focused_pressed.png b/Zukitwo-Noble/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Noble/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize_unfocused.png b/Zukitwo-Noble/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Noble/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize_unfocused_prelight.png b/Zukitwo-Noble/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Noble/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/maximize_unfocused_pressed.png b/Zukitwo-Noble/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Noble/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize.png b/Zukitwo-Noble/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Noble/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize_focused_normal.png b/Zukitwo-Noble/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Noble/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize_focused_prelight.png b/Zukitwo-Noble/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Noble/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize_focused_pressed.png b/Zukitwo-Noble/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Noble/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize_unfocused.png b/Zukitwo-Noble/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Noble/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize_unfocused_prelight.png b/Zukitwo-Noble/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Noble/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/minimize_unfocused_pressed.png b/Zukitwo-Noble/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Noble/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize.png b/Zukitwo-Noble/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Noble/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize_focused_normal.png b/Zukitwo-Noble/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Noble/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize_focused_prelight.png b/Zukitwo-Noble/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Noble/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize_focused_pressed.png b/Zukitwo-Noble/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Noble/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize_unfocused.png b/Zukitwo-Noble/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Noble/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Noble/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Noble/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Noble/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Noble/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Noble/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-active.png b/Zukitwo-Noble/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-active.xpm b/Zukitwo-Noble/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Noble/xfwm4/bottom-inactive.png b/Zukitwo-Noble/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-inactive.xpm b/Zukitwo-Noble/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Noble/xfwm4/bottom-left-active.png b/Zukitwo-Noble/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-left-active.xpm b/Zukitwo-Noble/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Noble/xfwm4/bottom-left-inactive.png b/Zukitwo-Noble/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Noble/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Noble/xfwm4/bottom-right-active.png b/Zukitwo-Noble/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-right-active.xpm b/Zukitwo-Noble/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Noble/xfwm4/bottom-right-inactive.png b/Zukitwo-Noble/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Noble/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Noble/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Noble/xfwm4/close-active.xpm b/Zukitwo-Noble/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Noble/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/close-inactive.xpm b/Zukitwo-Noble/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Noble/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Noble/xfwm4/close-prelight.xpm b/Zukitwo-Noble/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Noble/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/close-pressed.xpm b/Zukitwo-Noble/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Noble/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/hide-active.xpm b/Zukitwo-Noble/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Noble/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/hide-inactive.xpm b/Zukitwo-Noble/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Noble/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Noble/xfwm4/hide-prelight.xpm b/Zukitwo-Noble/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Noble/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/hide-pressed.xpm b/Zukitwo-Noble/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Noble/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/left-active.png b/Zukitwo-Noble/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Noble/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/left-active.xpm b/Zukitwo-Noble/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Noble/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Noble/xfwm4/left-inactive.png b/Zukitwo-Noble/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Noble/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/left-inactive.xpm b/Zukitwo-Noble/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Noble/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Noble/xfwm4/maximize-active.xpm b/Zukitwo-Noble/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Noble/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/maximize-inactive.xpm b/Zukitwo-Noble/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Noble/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Noble/xfwm4/maximize-prelight.xpm b/Zukitwo-Noble/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Noble/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/maximize-pressed.xpm b/Zukitwo-Noble/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Noble/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Noble/xfwm4/menu-active.xpm b/Zukitwo-Noble/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Noble/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Noble/xfwm4/menu-inactive.xpm b/Zukitwo-Noble/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Noble/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Noble/xfwm4/menu-prelight.xpm b/Zukitwo-Noble/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Noble/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Noble/xfwm4/menu-pressed.xpm b/Zukitwo-Noble/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Noble/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Noble/xfwm4/right-active.png b/Zukitwo-Noble/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Noble/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/right-active.xpm b/Zukitwo-Noble/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Noble/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Noble/xfwm4/right-inactive.png b/Zukitwo-Noble/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Noble/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/right-inactive.xpm b/Zukitwo-Noble/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Noble/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Noble/xfwm4/themerc b/Zukitwo-Noble/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Noble/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Noble/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Noble/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Noble/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-1-active.xpm b/Zukitwo-Noble/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Noble/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-1-inactive.xpm b/Zukitwo-Noble/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Noble/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-2-active.xpm b/Zukitwo-Noble/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Noble/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-2-inactive.xpm b/Zukitwo-Noble/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Noble/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-3-active.xpm b/Zukitwo-Noble/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Noble/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-3-inactive.xpm b/Zukitwo-Noble/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Noble/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-4-active.xpm b/Zukitwo-Noble/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Noble/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-4-inactive.xpm b/Zukitwo-Noble/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Noble/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-5-active.xpm b/Zukitwo-Noble/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Noble/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-5-inactive.xpm b/Zukitwo-Noble/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Noble/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Noble/xfwm4/title-left-active.png b/Zukitwo-Noble/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Noble/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/title-right-active.png b/Zukitwo-Noble/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Noble/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Noble/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Noble/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Noble/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Noble/xfwm4/top-left-active.xpm b/Zukitwo-Noble/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Noble/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Noble/xfwm4/top-left-inactive.xpm b/Zukitwo-Noble/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Noble/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Noble/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Noble/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Noble/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Noble/xfwm4/top-right-active.xpm b/Zukitwo-Noble/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Noble/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Noble/xfwm4/top-right-inactive.xpm b/Zukitwo-Noble/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Noble/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Wine/gtk-2.0/chromium.rc b/Zukitwo-Wine/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Wine/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Wine/gtk-2.0/gtkrc b/Zukitwo-Wine/gtk-2.0/gtkrc
deleted file mode 100644
index 9568923..0000000
--- a/Zukitwo-Wine/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#de4e4e\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Wine/gtk-2.0/thunar.rc b/Zukitwo-Wine/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Wine/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Null/null.png b/Zukitwo-Wine/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Others/close.png b/Zukitwo-Wine/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Wine/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Others/null.png b/Zukitwo-Wine/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Wine/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Wine/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-2.0/widgets/panel.rc b/Zukitwo-Wine/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Wine/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Wine/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Wine/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/check-active.png b/Zukitwo-Wine/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Wine/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Wine/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Wine/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/check-normal.png b/Zukitwo-Wine/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Wine/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Wine/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Wine/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/header-separator.png b/Zukitwo-Wine/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Wine/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Wine/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/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Wine/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Wine/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/null.png b/Zukitwo-Wine/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Wine/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Wine/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/Zukitwo-Wine/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Wine/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Wine/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/Zukitwo-Wine/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Wine/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/radio-active.png b/Zukitwo-Wine/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Wine/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Wine/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Wine/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/radio-normal.png b/Zukitwo-Wine/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Wine/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/slider-hover.png b/Zukitwo-Wine/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/slider-ins.png b/Zukitwo-Wine/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/slider.png b/Zukitwo-Wine/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Wine/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Wine/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Wine/gtk-3.0/assets/switch-off.png b/Zukitwo-Wine/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/switch-off.svg b/Zukitwo-Wine/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Wine/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Wine/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Wine/gtk-3.0/assets/switch-on.png b/Zukitwo-Wine/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/assets/switch-on.svg b/Zukitwo-Wine/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Wine/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Wine/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Wine/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Wine/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/button-active.png b/Zukitwo-Wine/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/button-focus.png b/Zukitwo-Wine/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/button-ins.png b/Zukitwo-Wine/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/button.png b/Zukitwo-Wine/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Wine/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Wine/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-fallback.css b/Zukitwo-Wine/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-main-common.css b/Zukitwo-Wine/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-main.css b/Zukitwo-Wine/gtk-3.0/gtk-main.css
deleted file mode 100644
index e524fc8..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #de4e4e;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Wine/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Wine/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Wine/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Wine/gtk-3.0/gtk-widgets.css b/Zukitwo-Wine/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Wine/gtk-3.0/gtk.css b/Zukitwo-Wine/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Wine/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Wine/gtk-3.0/other-applications.css b/Zukitwo-Wine/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Wine/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Wine/gtk-3.0/settings.ini b/Zukitwo-Wine/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Wine/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Wine/gtk-3.0/unity.css b/Zukitwo-Wine/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Wine/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls.css b/Zukitwo-Wine/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Wine/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Wine/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/menu.png b/Zukitwo-Wine/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Wine/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Wine/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Wine/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/index.theme b/Zukitwo-Wine/index.theme
deleted file mode 100644
index ab542a1..0000000
--- a/Zukitwo-Wine/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine
-MetacityTheme=Zukitwo-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Wine/metacity-1/close_focused_normal.svg b/Zukitwo-Wine/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Wine/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/close_focused_prelight.svg b/Zukitwo-Wine/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Wine/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/close_focused_pressed.svg b/Zukitwo-Wine/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Wine/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/close_unfocused.svg b/Zukitwo-Wine/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Wine/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Wine/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Wine/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/maximize_focused_normal.svg b/Zukitwo-Wine/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Wine/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Wine/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Wine/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Wine/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Wine/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/maximize_unfocused.svg b/Zukitwo-Wine/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Wine/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Wine/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Wine/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/menu.png b/Zukitwo-Wine/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Wine/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Wine/metacity-1/menu_prelight.png b/Zukitwo-Wine/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Wine/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/metacity-1/metacity-theme-2.xml b/Zukitwo-Wine/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index 456fe9f..0000000
--- a/Zukitwo-Wine/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Wine/metacity-1/metacity-theme-3.xml b/Zukitwo-Wine/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index 1691c01..0000000
--- a/Zukitwo-Wine/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine-Wine</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Wine/metacity-1/minimize_focused_normal.svg b/Zukitwo-Wine/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Wine/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Wine/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Wine/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Wine/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Wine/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/minimize_unfocused.svg b/Zukitwo-Wine/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Wine/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Wine/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Wine/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Wine/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Wine/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Wine/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Wine/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Wine/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Wine/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Wine/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Wine/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Wine/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Wine/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wine/patches/enable-dark-menubar.patch b/Zukitwo-Wine/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Wine/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Wine/patches/panel.rc.patch b/Zukitwo-Wine/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Wine/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Wine/unity/close.png b/Zukitwo-Wine/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Wine/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/close_focused_normal.png b/Zukitwo-Wine/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Wine/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/close_focused_prelight.png b/Zukitwo-Wine/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Wine/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/close_focused_pressed.png b/Zukitwo-Wine/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Wine/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/close_unfocused.png b/Zukitwo-Wine/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Wine/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/close_unfocused_prelight.png b/Zukitwo-Wine/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Wine/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/close_unfocused_pressed.png b/Zukitwo-Wine/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Wine/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize.png b/Zukitwo-Wine/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wine/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize_focused_normal.png b/Zukitwo-Wine/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wine/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize_focused_prelight.png b/Zukitwo-Wine/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Wine/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize_focused_pressed.png b/Zukitwo-Wine/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wine/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize_unfocused.png b/Zukitwo-Wine/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Wine/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize_unfocused_prelight.png b/Zukitwo-Wine/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Wine/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/maximize_unfocused_pressed.png b/Zukitwo-Wine/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wine/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize.png b/Zukitwo-Wine/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Wine/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize_focused_normal.png b/Zukitwo-Wine/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Wine/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize_focused_prelight.png b/Zukitwo-Wine/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Wine/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize_focused_pressed.png b/Zukitwo-Wine/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Wine/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize_unfocused.png b/Zukitwo-Wine/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Wine/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize_unfocused_prelight.png b/Zukitwo-Wine/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Wine/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/minimize_unfocused_pressed.png b/Zukitwo-Wine/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Wine/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize.png b/Zukitwo-Wine/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wine/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize_focused_normal.png b/Zukitwo-Wine/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wine/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize_focused_prelight.png b/Zukitwo-Wine/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Wine/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize_focused_pressed.png b/Zukitwo-Wine/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wine/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize_unfocused.png b/Zukitwo-Wine/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Wine/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Wine/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Wine/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wine/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Wine/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wine/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-active.png b/Zukitwo-Wine/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-active.xpm b/Zukitwo-Wine/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Wine/xfwm4/bottom-inactive.png b/Zukitwo-Wine/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-inactive.xpm b/Zukitwo-Wine/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Wine/xfwm4/bottom-left-active.png b/Zukitwo-Wine/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-left-active.xpm b/Zukitwo-Wine/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Wine/xfwm4/bottom-left-inactive.png b/Zukitwo-Wine/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Wine/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Wine/xfwm4/bottom-right-active.png b/Zukitwo-Wine/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-right-active.xpm b/Zukitwo-Wine/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Wine/xfwm4/bottom-right-inactive.png b/Zukitwo-Wine/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Wine/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Wine/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Wine/xfwm4/close-active.xpm b/Zukitwo-Wine/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Wine/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/close-inactive.xpm b/Zukitwo-Wine/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Wine/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Wine/xfwm4/close-prelight.xpm b/Zukitwo-Wine/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Wine/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/close-pressed.xpm b/Zukitwo-Wine/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Wine/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/hide-active.xpm b/Zukitwo-Wine/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Wine/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/hide-inactive.xpm b/Zukitwo-Wine/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Wine/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Wine/xfwm4/hide-prelight.xpm b/Zukitwo-Wine/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Wine/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/hide-pressed.xpm b/Zukitwo-Wine/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Wine/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/left-active.png b/Zukitwo-Wine/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Wine/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/left-active.xpm b/Zukitwo-Wine/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Wine/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wine/xfwm4/left-inactive.png b/Zukitwo-Wine/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Wine/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/left-inactive.xpm b/Zukitwo-Wine/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Wine/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wine/xfwm4/maximize-active.xpm b/Zukitwo-Wine/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Wine/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/maximize-inactive.xpm b/Zukitwo-Wine/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Wine/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Wine/xfwm4/maximize-prelight.xpm b/Zukitwo-Wine/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Wine/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/maximize-pressed.xpm b/Zukitwo-Wine/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Wine/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wine/xfwm4/menu-active.xpm b/Zukitwo-Wine/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Wine/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Wine/xfwm4/menu-inactive.xpm b/Zukitwo-Wine/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Wine/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Wine/xfwm4/menu-prelight.xpm b/Zukitwo-Wine/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Wine/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Wine/xfwm4/menu-pressed.xpm b/Zukitwo-Wine/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Wine/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Wine/xfwm4/right-active.png b/Zukitwo-Wine/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Wine/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/right-active.xpm b/Zukitwo-Wine/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Wine/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wine/xfwm4/right-inactive.png b/Zukitwo-Wine/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Wine/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/right-inactive.xpm b/Zukitwo-Wine/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Wine/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wine/xfwm4/themerc b/Zukitwo-Wine/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Wine/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Wine/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Wine/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Wine/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-1-active.xpm b/Zukitwo-Wine/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Wine/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-1-inactive.xpm b/Zukitwo-Wine/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Wine/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-2-active.xpm b/Zukitwo-Wine/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Wine/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-2-inactive.xpm b/Zukitwo-Wine/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Wine/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-3-active.xpm b/Zukitwo-Wine/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Wine/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-3-inactive.xpm b/Zukitwo-Wine/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Wine/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-4-active.xpm b/Zukitwo-Wine/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Wine/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-4-inactive.xpm b/Zukitwo-Wine/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Wine/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-5-active.xpm b/Zukitwo-Wine/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Wine/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-5-inactive.xpm b/Zukitwo-Wine/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Wine/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wine/xfwm4/title-left-active.png b/Zukitwo-Wine/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Wine/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/title-right-active.png b/Zukitwo-Wine/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Wine/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Wine/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Wine/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Wine/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Wine/xfwm4/top-left-active.xpm b/Zukitwo-Wine/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Wine/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Wine/xfwm4/top-left-inactive.xpm b/Zukitwo-Wine/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Wine/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Wine/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Wine/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Wine/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Wine/xfwm4/top-right-active.xpm b/Zukitwo-Wine/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Wine/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Wine/xfwm4/top-right-inactive.xpm b/Zukitwo-Wine/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Wine/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Wise/gtk-2.0/chromium.rc b/Zukitwo-Wise/gtk-2.0/chromium.rc
deleted file mode 100644
index aeecbdc..0000000
--- a/Zukitwo-Wise/gtk-2.0/chromium.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-# ==============================================================================
-# CHROMIUM SPECIFIC SETTINGS
-# ==============================================================================
-
-style "chromium_toolbar_button" {
-	engine "murrine" {
-		roundness = 3
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame"
-{
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 16
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = shade (0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade (1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-widget_class "*Chrom*Button*" style "chromium_toolbar_button"
-
-
-
-
-
-
diff --git a/Zukitwo-Wise/gtk-2.0/gtkrc b/Zukitwo-Wise/gtk-2.0/gtkrc
deleted file mode 100644
index 0f90fe9..0000000
--- a/Zukitwo-Wise/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,725 +0,0 @@
-# Author: lassekongo83
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# See the file COPYING for the full license text.
-
-# 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.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color:#d8d8d8\nselected_bg_color:#97bf60\nbase_color:#ffffff" # Background, base.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nfg_color:#101010\nselected_fg_color:#ffffff\ntext_color:#1a1a1a" # Foreground, text.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nlink_color:#08c" # Hyperlinks
-gtk_color_scheme = "menubar_bg_color:#212121\nmenubar_fg_color:#cecece\nmenuitem_fg_color:#ffffff\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
-
-### EXTERNAL FILES ###
-include "widgets/panel.rc"	# This includes the file that handles the panels.
-
-### MISC ###
-gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
-gtk-button-images	= 0 # Enables icons in buttons
-gtk-toolbar-style	= 0 # Disables text in toolbar
-gtk-auto-mnemonics	= 1 # Disables ugly lines under menu items
-
-####################
-## Default Styles ##
-####################
-
-style "murrine-default" {
-	GnomeHRef	::link_color			= @link_color		
-	GtkHTML		::link-color			= @link_color
- 	GtkIMHtmlr	::hyperlink-color		= @link_color
-	GtkIMHtml	::hyperlink-color		= @link_color
-	GtkWidget	::link-color			= @link_color
-	GtkWidget	::visited-link-color		= @text_color
-
-	GtkButton	::child-displacement-x		= 1
-	GtkButton	::child-displacement-y		= 1
-	GtkButton	::default-border		= { 0, 0, 0, 0 }
-	GtkButtonBox	::child-min-height		= 26
-	GtkCheckButton	::indicator-size		= 15
-	
-	GtkWidget	::new-tooltip-style		= 1
-	GtkWidget	::focus-line-width		= 1
-	GtkWidget	::focus-padding			= 0 # Keeping this at 0 prevents the Firefox tabs from jumping a few pixels when you create a new tab. Set the value locally if needed.
-
-	GtkImage	::x-ayatana-indicator-dynamic	= 1
-
-	GtkScrollbar	::has-backward-stepper		= 0  
-	GtkScrollbar	::has-forward-stepper		= 0
-	GtkScrollbar	::min-slider-length		= 15
-	GtkScrollbar	::slider-width			= 13
-	GtkScrollbar	::trough-border			= 0
-	GtkScrollbar	::activate-slider		= 1
-
-	GtkScrolledWindow ::scrollbar-spacing		= 0
-	GtkScrolledWindow ::scrollbars-within-bevel	= 1
-
-	GtkPaned	::handle-size			= 6
-
-	GtkRange	::trough-border			= 0
-	GtkRange	::slider-width			= 11
-	GtkRange	::stepper-size			= 0
-	GtkRange	::stepper_spacing		= 0
-	GtkRange	::trough-under-steppers		= 0
-
-	GtkScale	::slider-length			= 16
-	GtkScale	::slider-width			= 16
-
-	GtkMenuBar	::internal-padding		= 0
-	GtkExpander	::expander-size			= 16
-	GtkToolbar	::internal-padding		= 0
-	GtkTreeView	::expander-size			= 6
-	GtkTreeView	::indent-expanders		= 1
-	GtkTreeView	::vertical-separator		= 1
-	GtkNotebook	::tab-overlap			= -1
-
-	GtkMenu		::horizontal-padding		= 0
-	GtkMenu		::vertical-padding		= 0
-	GtkMenuItem	::horizontal-padding		= 0
-
-	WnckTasklist	::fade-overlay-rect		= 0
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry	::honors-transparent-bg-hint	= 1
-	GtkEntry	::state-hint			= 0
-	GtkEntry	::progress-border		= { 2, 2, 2, 2 }
-
-	GtkProgressBar	::min-horizontal-bar-height	= 16
-	GtkProgressBar	::min-vertical-bar-width	= 16
-	
-	#GtkToolbar	::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified.
-	#GtkMenuBar	::shadow-type = GTK_SHADOW_NONE # Makes menus flat and unified.
-	GtkMenuBar	::window-dragging		= 1
-	GtkToolbar	::window-dragging		= 1
-
-	# The little ugly gripper at the bottom right needs to go.
-	GtkWindow	::resize-grip-height		= 0
-	GtkWindow	::resize-grip-width		= 0
-
-	xthickness = 1
-	ythickness = 1
-
-	### Color Definitions ###
-
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]		= @fg_color
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= @fg_color
-	fg[INSENSITIVE]		= darker (@bg_color)
-	bg[NORMAL]		= @bg_color
-	bg[PRELIGHT]		= shade (1.02, @bg_color)
-	bg[SELECTED]		= @selected_bg_color
-	bg[INSENSITIVE]		= @bg_color
-	bg[ACTIVE]		= shade (1.04, @bg_color)
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @bg_color)
-	base[ACTIVE]		= shade (0.92, @selected_bg_color)
-	base[SELECTED]		= shade (0.93, @selected_bg_color)
-	base[INSENSITIVE]	= @bg_color
-	text[NORMAL]		= @text_color
-	text[PRELIGHT]		= @text_color
-	text[ACTIVE]		= @selected_fg_color
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= darker (@bg_color)
-
-	### Murrine Settings ###
-	
-	engine "murrine" {
-		animation		= FALSE
-		arrowstyle		= 1			# 0 = normal arrows, 1 = filled arrows		
-		border_shades		= {1.0, 0.8}		# gradient to draw on border		
-		colorize_scrollbar	= FALSE		
-		comboboxstyle		= 0			# 0 = normal combobox, 1 = colorized combobox below arrow		
-		contrast		= 0.4 			# 0.8 for less contrast, more than 1.0 for more contrast on borders
-		default_button_color	= shade (1.12, @selected_bg_color)
-		focus_color		= @selected_bg_color
-		focusstyle		= 3
-		glazestyle		= 1			# 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
-		gradient_shades		= {1.1,1.1,0.94,0.94}	# Sets the gradients on the widgets.
-		glowstyle		= 0			# 0,1,2,3,4
-		glow_shade		= 1.1
-		highlight_shade		= 1.0			# set highlight amount for buttons or widgets
-		lightborder_shade	= 1.1			# sets lightborder amount for buttons or widgets
-		lightborderstyle	= 0			# 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle	= 1			# 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle		= 1			# 0 = nothing, 1 = dotted
-		menubaritemstyle	= 0			# 0 = menuitem look, 1 = button look
-		menubarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle		= 0			# 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0			# 0 = no vertical menu stripe, 1 = display vertical menu stripe
-		prelight_shade		= .95			# shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors		
-		reliefstyle		= 2			# 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		rgba			= FALSE			# FALSE = disabled, TRUE = enabled
-		roundness		= 2			# 0 = squared, 1 = old default, more will increase roundness
-		scrollbarstyle		= 0			# 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		separatorstyle		= 1			# 0 = Hard seperators 1 = Smooth seperators
-		sliderstyle		= 0			# 0 = nothing added, 1 = handles
-		stepperstyle		= 1			# 0 = standard, 1 = integrated stepper handles, 2 = unknown
-		progressbarstyle	= 1			# 0 = nothing, 1 = stripes, 2 = lines
-		shadow_shades		= {0.5, 0.0}		# gradient for shadows.		
-		textstyle		= 0			# 0 = normal text, 1 = inset. Very resource heavy!
-		toolbarstyle		= 2			# 0 = flat, 1 = glassy, 2 = gradient		
-		trough_shades		= {0.98, 1.06}		# draw gradient on trough of GtkScrollbar and GtkProgressbar
-	}
-}
-
-### THEME MODULES ###
-
-style "murrine-dark" {
-	base[NORMAL]		= @bg_color_dark
-	base[PRELIGHT]		= shade (0.95, @bg_color_dark)
-	base[INSENSITIVE]	= @bg_color_dark
-	bg[NORMAL]		= @bg_color_dark
-	bg[PRELIGHT]		= shade (1.02, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (1.04, @bg_color_dark)
-	fg[NORMAL]		= @text_color_dark
-	fg[PRELIGHT]		= @text_color_dark
-	fg[SELECTED]		= @text_color_dark
-	fg[ACTIVE]		= @text_color_dark
-	fg[INSENSITIVE]		= darker (@bg_color)
-	text[NORMAL]		= @text_color_dark
-	text[PRELIGHT]		= @text_color_dark
-	text[ACTIVE]		= @text_color_dark
-	text[SELECTED]		= @text_color_dark
-	text[INSENSITIVE]	= darker (@bg_color_dark)
-}
-
-style "murrine-thin"		= "murrine-default"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide"		= "murrine-default"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider"		= "murrine-default"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest"		= "murrine-default"	{ xthickness = 4 ythickness = 4 }
-style "murrine-thin-dark"	= "murrine-dark"	{ xthickness = 0 ythickness = 0 }
-style "murrine-wide-dark"	= "murrine-dark"	{ xthickness = 2 ythickness = 2 }
-style "murrine-wider-dark"	= "murrine-dark"	{ xthickness = 3 ythickness = 3 }
-style "murrine-widest-dark"	= "murrine-dark"	{ xthickness = 4 ythickness = 4 }
-
-###################
-## Widget Styles ##
-###################
-
-style "murrine-entry" = "murrine-wider" {
-	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
-	fg[SELECTED] = @text_color
-}
-
-style "murrine-button" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.13, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-		roundness		= 2
-		border_shades		= {0.95, 0.8}
-		shadow_shades		= {1.0, 0.1}
-	}
-}
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.1, @bg_color)
-	bg[ACTIVE] = shade (0.97, @bg_color)
-	fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2 # Width of tabs and notebook borders.
-	ythickness = 1 # Height of tabs and notebook borders.
-
-	engine "murrine" {
-		contrast		= .8
-		gradient_shades		= {1.28,1.28,0.87,0.87}
-		focusstyle		= 2
-		lightborder_shade	= 1.16
-		roundness		= 4
-	}
-}
-
-style "notebook-close" { stock["gtk-close"] = {{ "widgets/Others/close.png", *, *, * }} } # Close icon on tabs
-
-style "murrine-menubar" = "murrine-default" {
-	ythickness	= 0
-	bg[NORMAL]	= @menubar_bg_color
-	fg[NORMAL]	= @menubar_fg_color
-	fg[PRELIGHT]	= @fg_color
-        fg[SELECTED]    = @fg_color
-}
-
-style "murrine-menubar-menuitem" = "murrine-wider" {
-	xthickness	= 6
-	bg[PRELIGHT]	= @selected_bg_color
-	bg[SELECTED]	= @selected_bg_color
-        fg[NORMAL]	= @menuitem_fg_color
-        fg[PRELIGHT]	= @menuitem_fg_color
-        fg[SELECTED]	= @menuitem_fg_color
-
-	engine "murrine" {
-		contrast = .0 
-		roundness = 0
-		border_shades = { 1.0, 0.8 }
-		gradient_shades = {1.0, 1.0, 0.85, 0.85}
-	}
-}
-
-style "murrine-menu" {
-	xthickness = 0
-	ythickness = 0
-
-	bg[NORMAL] = @base_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0 # Roundness of menu items.
-		textstyle = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	xthickness = 2
-	ythickness = 3
-
-	bg[SELECTED] = shade (0.95, @selected_bg_color)
-	bg[PRELIGHT] = shade (0.95, @selected_bg_color)
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		border_shades = { 1.2, 1.0 }
-		roundness = 0
-		textstyle = 0
-	}
-}
-
-# This style is there to modify the separator menu items. The goals are:
-# 1. Get a specific height.
-# 2. The line should go to the edges (ie. no border at the left/right)
-style "murrine_separator_menu_item" {
-	bg[NORMAL] = @base_color # Remove for visible separators.
-	xthickness = 1
-	ythickness = 0
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
-	
-	engine "murrine" {
-		contrast = 0.6 # Set the contrast to 0.6 for visible separators.
-		separatorstyle = 0
-	}
-}
-
-style "murrine-treeview" {
-	GtkTreeView::odd_row_color	= shade (0.97, @base_color)
-	GtkTreeView::even_row_color	= @base_color
-
-  	engine "murrine" { roundness = 0 } # This makes treeview progressbars square.
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-	xthickness = 2
-	ythickness = 0
-	
-	bg[NORMAL]	= shade (0.98, @bg_color) # Color for treeview headers.
-	bg[PRELIGHT]	= shade (1.10, @bg_color) # Color for treeview header prelight.
-	bg[ACTIVE]	= shade (0.85, @bg_color) # Color for pressed-treeview.
-  	
-	engine "murrine" {
-		roundness		= 0  # This makes treeview progressbars square.
-		contrast		= .8
-		lightborder_shade	= 1.0
-		border_shades		= { 1.1, 1.1 }
-		gradient_shades		= {1.0,1.0,1.1,1.1}
-	}
-}
-
-style "murrine-frame-title" { fg[NORMAL] = lighter (@fg_color) }
-
-style "murrine-tooltips" = "murrine-wider" {
-	bg[NORMAL] = @tooltip_bg_color
-	fg[NORMAL] = @tooltip_fg_color
-	engine "murrine" {textstyle = 0}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-	engine "murrine" {
-		contrast		= 1.0
-		lightborder_shade	= 1.2
-		trough_shades		= { 1.06, 1.16}
-		gradient_shades		= {0.95,0.95,1.1,1.1}
-		border_shades		= { 1.1, 1.1 }
-		roundness		= 0
-	}
-}
-
-style "murrine-statusbar" {
-	xthickness = 2
-}
-
-style "murrine-comboboxentry" { engine "murrine" { contrast = .4 }}
-
-style "murrine-spinbutton" { 
-	bg[ACTIVE] = shade (0.85, @bg_color) # Color for pressed-spinbuttons. 
-}
-
-style "murrine-scale" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.2, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 7
-		contrast	= .8
-		border_shades	= {1.0, 1.0}
-		trough_shades	= {1.06, 1.16}
-	}
-}
-
-style "pixmap-scale" {
-	engine "pixmap" {
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-horizontal.png"
-			border		= { 2, 2, 0, 0 }
-			stretch		= TRUE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= BOX
-			detail		= "trough"
-			file		= "widgets/Scale/trough-vertical.png"
-			border		= { 0, 0, 2, 2 }
-			stretch		= TRUE
-			orientation	= VERTICAL
-		}
-
-# Horizontal
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= HORIZONTAL
-		}
-
-# Vertical
-
-	image
-		{
-			function	= SLIDER
-			state           = NORMAL
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = PRELIGHT
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-hover.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-	image
-		{
-			function	= SLIDER
-			state           = INSENSITIVE
-			file		= "widgets/Others/null.png"
-			border		= { 0, 0, 0, 0 }
-			stretch		= FALSE
-			overlay_file	= "widgets/Scale/slider-ins.png"
-			overlay_stretch	= FALSE
-			orientation	= VERTICAL
-		}
-
-# Function below removes ugly boxes
-	image
-		{
-			function	= BOX
-			file        	= "widgets/Others/null.png"
-			border      	= { 3, 3, 3, 3 }
-			stretch         = TRUE
-		}
-
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL]	= shade (0.90, @bg_color)
-	bg[SELECTED]	= shade (0.6, @base_color)
-	bg[ACTIVE]	= shade (0.8, @bg_color)
-	bg[PRELIGHT]	= shade (0.8, @bg_color)
-	
-	engine "murrine" {
-		roundness	= 8
-		border_shades	= {0.80, 0.80}
-		contrast	= 0.0
-	}
-}
-
-style "murrine-sidebar" {
-	xthickness = 0
-	ythickness = 0
-
-	base[NORMAL]	= @bg_color
-	bg[NORMAL]	= @bg_color
-	text[NORMAL]	= @text_color
-
-	font_name	= "Regular"
-
-	GtkTreeView::odd_row_color	= @bg_color
-	GtkTreeView::even_row_color	= @bg_color
-
-	engine "murrine" { listviewstyle = 0 }
-}
-
-style "murrine-toggleswitch" = "murrine-wider" {
-	ythickness = 4
-
-	bg[ACTIVE]	= shade (0.80, @bg_color)
-	bg[NORMAL]	= shade (1.15, @bg_color)
-	bg[PRELIGHT]	= shade (1.13, @selected_bg_color)
-	bg[SELECTED]	= shade (0.75, @selected_bg_color)
-	bg[INSENSITIVE]	= shade (0.98, @bg_color)
-	
-	engine "murrine" {
-		contrast		= 1.25
-		lightborderstyle	= 1
-	}
-}
-
-style "murrine-radiocheck" = "murrine-wider" {
-	bg[NORMAL]	= shade (1.06, @bg_color) 
-	bg[PRELIGHT]	= shade (1.06, @bg_color)  
-	bg[ACTIVE]	= shade (0.85, @bg_color)
-	bg[SELECTED]	= shade (1.0, @selected_bg_color)  
-	bg[INSENSITIVE]	= shade (0.95, @bg_color)
-
-  	engine "murrine" {
-		contrast		= .8
-		lightborder_shade	= 1.9
-	}
-}
-
-style "murrine-radiocheck-menu" {
-	fg[PRELIGHT]	= @selected_fg_color
-	text[PRELIGHT]	= @selected_fg_color
-		
-	engine "murrine" {}
-}
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	ythickness = 2
-}
-
-style "pixmap-sidebar-handle-left" {
-	GtkPaned::handle-size = 1
-
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# Murrine default style is applied to every widget.
-class "GtkWidget"	style "murrine-default"
-
-# Increase the x/ythickness in some widgets.
-class "GtkFrame"	style "murrine-wide"
-class "GtkEntry"	style "murrine-entry"
-class "GtkSeparator"	style "murrine-wide"
-class "GtkCalendar"	style "murrine-wide"
-class "GtkInfoBar"	style "murrine-default"
-class "GtkIconView"	style "murrine-default"
-
-class "GtkToolbar"	style "murrine-toolbar"
-
-class "GtkSpinButton"	style "murrine-spinbutton"
-class "GtkScale"	style "pixmap-scale"
-class "GtkVScale"	style "pixmap-scale"
-class "GtkHScale"	style "pixmap-scale"
-
-class "GtkScrollbar"	style "murrine-scrollbar"
-class "GtkVScrollbar"	style "murrine-scrollbar"
-class "GtkHScrollbar"	style "murrine-scrollbar"
-
-widget "*ToggleSwitch*"	style "murrine-toggleswitch"
-
-widget "*SidebarHandleLeft"	style "pixmap-sidebar-handle-left"
-widget "*SidebarContent"	style "murrine-sidebar"
-
-# General matching following, the order is choosen so that the right styles override each other eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better (That is modify *every* widget in the notebook, and change those back that we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkViewport>"		style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>"	style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLabel>"		style "murrine-notebook-bg"
-
-widget_class "*<GtkButton>"	style "murrine-button"
-widget_class "*<GtkNotebook>"	style "murrine-notebook"
-widget_class "*<GtkNotebook>*"	style "notebook-close"
-widget_class "*<GtkStatusbar>*"	style "murrine-statusbar"
-
-widget_class "*<GtkComboBoxEntry>*"		style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*"			style "murrine-comboboxentry"
-
-widget_class "*<GtkMenuBar>*"			style "murrine-menubar"
-widget_class "*<GtkMenu>*"			style "murrine-menu"
-widget_class "*<GtkMenuItem>*"			style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*"		style "murrine_separator_menu_item"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*"	style "murrine-menubar-menuitem"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"		style "murrine-frame-title"
-widget_class "*.<GtkTreeView>*"			style "murrine-treeview"
-
-widget_class "*<GtkProgress>"			style "murrine-progressbar"
-widget_class "*<GtkProgressBar>"		style "murrine-progressbar"
-
-widget_class "*<GtkRadioButton>*"		style "murrine-radiocheck"
-widget_class "*<GtkCheckButton>*"		style "murrine-radiocheck"
-class "GtkCheckMenuItem"			style:highest "murrine-radiocheck-menu"
-class "GtkRadioMenuItem"			style:highest "murrine-radiocheck-menu"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>"	style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>"		style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>"		style "murrine-treeview-header"
-
-################################
-# FIXME: This will not work if one embeds eg. a button into the tooltip.
-################################
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-###################################################
-# SPECIAL CASES AND WORKAROUNDS
-###################################################
-
-# Wrokaround style for places where the text color is used instead of the fg color.
-style "text_is_fg_color_workaround" {
-	text[NORMAL]      = @fg_color
-	text[PRELIGHT]    = @fg_color
-	text[SELECTED]    = @selected_fg_color
-	text[ACTIVE]      = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for menus where the text color is used instead of the fg color.
-style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL] = @fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @fg_color
-	text[INSENSITIVE] = darker (@bg_color)
-}
-
-# Workaround style for places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]        = @text_color
-	fg[PRELIGHT]      = @text_color
-	fg[SELECTED]      = @selected_fg_color
-	fg[ACTIVE]        = @selected_fg_color
-	fg[INSENSITIVE]   = darker (@bg_color)
-}
-
-# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-# Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
-# This is the part of the workaround that fixes the menus
-widget "*.gtk-combobox-popup-menu.*" style "menuitem_text_is_fg_color_workaround"
-
-# Work around the usage of GtkLabel inside GtkListItems to display text.
-# This breaks because the label is shown on a background that is based on the base color.
-widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
-# GtkCList also uses the fg color to draw text on top of the base colors.
-widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
-widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
-
-# Thickness for indicator menu items
-widget "*IdoEntryMenuItem*" style "murrine-wide"
-
-# XFCE desktop icon text looks weird when murrine textstyle is on.
-style "xfdesktop-icon-view" { engine "murrine" { textstyle = 0 }}
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-widget "xfwm4-tabwin*" style "murrine-dark"
-
-# Invisible toolbar separator
-style "murrine-toolseparator" {
-	xthickness = 0
-  	ythickness = 0
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			file		= "widgets/Others/null.png"
-			border		= { 2, 2, 2, 2 }
-			stretch		= TRUE
-    		}
- 	}
-}
-class "GtkSeparatorToolItem" style "murrine-toolseparator"
-
-### EXTERNAL FILES ###
-include "chromium.rc"	# Chromium styling
-include "thunar.rc"	# Thunar styling
diff --git a/Zukitwo-Wise/gtk-2.0/thunar.rc b/Zukitwo-Wise/gtk-2.0/thunar.rc
deleted file mode 100644
index 4cd1b14..0000000
--- a/Zukitwo-Wise/gtk-2.0/thunar.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-# ========================
-# THUNAR SPECIFIC SETTINGS
-# ========================
-
-style "thunar-location" {
-	ThunarLocationButtons::spacing = 0
-}
-
-style "thunar-handle" {
-	GtkPaned::handle-size = 1
-	engine "pixmap" {
-		image { function = HANDLE file = "/widgets/Others/handle.png" stretch = TRUE border = { 0, 0, 0, 0 } }
-	}
-}
-
-style "thunar-statusbar" {
-	bg[NORMAL] = @base_color
-
-	engine "pixmap"	{
-		image {
-			function	= RESIZE_GRIP
-			recolorable	= FALSE
-			detail		= "statusbar"
-			overlay_file	= "/widgets/Others/null.png"
-			overlay_border	= {0,0,0,0 }
-			overlay_stretch	= FALSE
-		}
-        }
-}
-
-style "thunar-sidepane" {
-	GtkTreeView::odd_row_color = @bg_color
-	GtkTreeView::even_row_color = @bg_color
-}
-
-style "thunar-frame" {
-	xthickness = 0
-	ythickness = 0
-}
-
-widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame"
-widget_class "*ThunarLocationButtons*" style "thunar-location"
-widget_class "*ThunarShortcutsView*" style "thunar-sidepane"
-widget_class "*ThunarTreeView*" style "thunar-sidepane"
-widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle"
-widget_class "*ThunarStatusbar*" style "thunar-statusbar"
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Null/null.png b/Zukitwo-Wise/gtk-2.0/widgets/Null/null.png
deleted file mode 100644
index a762744..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Null/null.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Others/close.png b/Zukitwo-Wise/gtk-2.0/widgets/Others/close.png
deleted file mode 100644
index 0d4de51..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Others/close.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Others/handle.png b/Zukitwo-Wise/gtk-2.0/widgets/Others/handle.png
deleted file mode 100644
index 0fbb411..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Others/handle.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Others/null.png b/Zukitwo-Wise/gtk-2.0/widgets/Others/null.png
deleted file mode 100644
index 9bb72bb..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Others/null.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/arrow-blank.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/arrow-blank.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/arrow-blank.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/arrow-down.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/arrow-down.png
deleted file mode 100644
index 6b9c03d..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/arrow-down.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/handle-h.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/handle-h.png
deleted file mode 100644
index 7bdf649..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/handle-h.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/handle-v.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/handle-v.png
deleted file mode 100644
index 6e8eba1..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/handle-v.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-bg.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-bg.png
deleted file mode 100644
index 7874100..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-bg.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-active.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-active.png
deleted file mode 100644
index c4e8118..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-hover.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-hover.png
deleted file mode 100644
index 208e0d7..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-inactive.png b/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider-hover.png b/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider-hover.png
deleted file mode 100644
index b6385bc..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider-ins.png b/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider.png b/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Scale/slider.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Scale/trough-horizontal.png b/Zukitwo-Wise/gtk-2.0/widgets/Scale/trough-horizontal.png
deleted file mode 100644
index 2de3050..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Scale/trough-horizontal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/Scale/trough-vertical.png b/Zukitwo-Wise/gtk-2.0/widgets/Scale/trough-vertical.png
deleted file mode 100644
index 333de7c..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/Scale/trough-vertical.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-2.0/widgets/panel.rc b/Zukitwo-Wise/gtk-2.0/widgets/panel.rc
deleted file mode 100644
index 6f32469..0000000
--- a/Zukitwo-Wise/gtk-2.0/widgets/panel.rc
+++ /dev/null
@@ -1,200 +0,0 @@
-style "theme-panel"
-{
-	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 0
-
-	bg_pixmap[NORMAL]	= "/widgets/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 (1.20, @bg_color_dark)
-	bg[SELECTED]		= shade (0.90, @selected_bg_color)
-	bg[INSENSITIVE]		= @bg_color_dark
-	bg[ACTIVE]		= shade (0.8, @bg_color_dark)
-	fg[NORMAL]		= "#f5f5f5"
-	fg[PRELIGHT]		= "#ffffff"
-	fg[SELECTED]		= @selected_fg_color
-	fg[ACTIVE]		= "#f5f5f5"
-	fg[INSENSITIVE]		= "#f0f0f0"
-	text[NORMAL]		= "#f5f5f5"
-	text[PRELIGHT]		= "#ffffff"
-	text[ACTIVE]		= "#f5f5f5"
-	text[SELECTED]		= @selected_fg_color
-	text[INSENSITIVE]	= "#f0f0f0"
-	
-	engine "murrine" {
-	}
-}
-
-style "theme-panel-buttons"
-{
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= PRELIGHT
-			file		= "Panel/panel-button-hover.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= ACTIVE
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= SELECTED
-			file		= "Panel/panel-button-active.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-		}
-		image {
-			function	= ARROW
-			recolorable	= TRUE
-			arrow_direction	= DOWN
-		}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]	= "#f5f5f5"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#f5f5f5"
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-widget "*PanelWidget*"			style "theme-panel"
-widget "*PanelApplet*"			style "theme-panel"
-widget "*fast-user-switch*"		style "theme-panel"
-widget "*gdm-user-switch*"		style "theme-panel"
-widget "*CPUFreq*Applet*"		style "theme-panel"
-widget "*indicator-applet*"		style "theme-panel"
-class "PanelApp*"			style "theme-panel"
-class "PanelToplevel*"			style "theme-panel"
-widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*PanelFrame*" 		style "theme-panel"
-widget_class "*PanelAppletFrame*" 	style "theme-panel"
-widget_class "*PanelWidget*.*"		style "theme-panel"
-#widget_class "*notif*"			style "theme-panel"
-#widget_class "*Notif*"			style "theme-panel"
-widget_class "*Tray*"			style "theme-panel" 
-widget_class "*tray*"			style "theme-panel"
-widget_class "*computertemp*"		style "theme-panel"
-widget_class "*Applet*Tomboy*"		style "theme-panel"
-widget_class "*Applet*Netstatus*"	style "theme-panel"
-
-# Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "theme-panel"
-class "*Xfce*Panel*"	style "theme-panel"
-
-# Panel buttons
-widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
-#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
-
-# XFCE panel buttons
-widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
-widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
-widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
-
-# lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel-buttons"
-widget "*.taskbar.*"		style "theme-panel-buttons"
-widget_class "*GtkBgbox*"	style "theme-panel-buttons"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
-
-# Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
-
-# Fix xfce-notifyd button
-style "xfce-notifyd-button" {
-	fg[NORMAL]	= @text_color
-	fg[PRELIGHT]	= @text_color
-	fg[ACTIVE]	= @text_color
-}
-
-widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/Zukitwo-Wise/gtk-3.0/assets/check-active-ins.png b/Zukitwo-Wise/gtk-3.0/assets/check-active-ins.png
deleted file mode 100644
index 819568e..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/check-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/check-active.png b/Zukitwo-Wise/gtk-3.0/assets/check-active.png
deleted file mode 100644
index 8b4e510..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/check-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/check-mixed-active-ins.png b/Zukitwo-Wise/gtk-3.0/assets/check-mixed-active-ins.png
deleted file mode 100644
index 65465b9..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/check-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/check-mixed-active.png b/Zukitwo-Wise/gtk-3.0/assets/check-mixed-active.png
deleted file mode 100644
index 1550b0f..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/check-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/check-normal-ins.png b/Zukitwo-Wise/gtk-3.0/assets/check-normal-ins.png
deleted file mode 100644
index 51abbca..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/check-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/check-normal.png b/Zukitwo-Wise/gtk-3.0/assets/check-normal.png
deleted file mode 100644
index b175843..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/check-normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/dnd-counter.svg b/Zukitwo-Wise/gtk-3.0/assets/dnd-counter.svg
deleted file mode 100644
index d16ea2f..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/dnd-counter.svg
+++ /dev/null
@@ -1,183 +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="72"
-   height="72"
-   id="svg4267"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="dnd-emblem.svg">
-  <defs
-     id="defs4269">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0"
-       id="radialGradient26234"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-    <linearGradient
-       id="linearGradient22968-2-3-0"
-       inkscape:collect="always">
-      <stop
-         id="stop22970-0-16-4"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       height="1.24"
-       y="-0.12"
-       width="1.24"
-       x="-0.12"
-       id="filter27236-2"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27238-6"
-         stdDeviation="1.9"
-         inkscape:collect="always" />
-    </filter>
-    <linearGradient
-       id="linearGradient22968-2-3-0-6">
-      <stop
-         id="stop22970-0-16-4-2"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop22972-8-3-4-6"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <clipPath
-       id="clipPath27307-6"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
-         d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
-         sodipodi:ry="9.96875"
-         sodipodi:rx="9.96875"
-         sodipodi:cy="169.78125"
-         sodipodi:cx="796.03125"
-         id="path27309-78"
-         style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-    </clipPath>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter27327-9"
-       inkscape:collect="always">
-      <feGaussianBlur
-         id="feGaussianBlur27329-7"
-         stdDeviation="0.598125"
-         inkscape:collect="always" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22968-2-3-0-6"
-       id="radialGradient5163"
-       gradientUnits="userSpaceOnUse"
-       cx="797"
-       cy="165"
-       fx="797"
-       fy="165"
-       r="20.5" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.01"
-     inkscape:cx="46.532863"
-     inkscape:cy="38.421319"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="742"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4272">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <g
-       style="display:inline;overflow:visible"
-       id="g24889"
-       transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
-      <g
-         transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
-         id="g24145-0"
-         style="display:inline">
-        <g
-           style="display:inline"
-           transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
-           id="g27242-9">
-          <path
-             sodipodi:type="inkscape:offset"
-             inkscape:radius="0"
-             inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659 189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
-             xlink:href="#path27224-3"
-             style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
-             id="path27228-0"
-             inkscape:href="#path27224-3"
-             d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0 19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
-             transform="translate(0,3)" />
-          <path
-             sodipodi:type="arc"
-             style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             id="path27224-3"
-             sodipodi:cx="797"
-             sodipodi:cy="170"
-             sodipodi:rx="19"
-             sodipodi:ry="19"
-             d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341 8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
-        </g>
-        <path
-           clip-path="url(#clipPath27307-6)"
-           sodipodi:type="arc"
-           style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
-           id="path27301-28"
-           sodipodi:cx="796.03125"
-           sodipodi:cy="169.78125"
-           sodipodi:rx="9.96875"
-           sodipodi:ry="9.96875"
-           d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316 -9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
-           transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/grid-selection-checked.svg b/Zukitwo-Wise/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index 248ebc9..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,237 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-checked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.1794877"
-       rx="7.1794877"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5036);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9"
-       width="40"
-       height="40"
-       x="0"
-       y="8"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       style="display:inline;enable-background:new"
-       id="g15291-9"
-       transform="matrix(2.0481319,0,0,2.0481319,-949.79991,-333.53349)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         style="enable-background:new"
-         id="g16853-4"
-         transform="translate(877.50354,-102.83507)">
-        <rect
-           ry="0.80653393"
-           rx="0.80653393"
-           y="-284.86218"
-           x="-409.50739"
-           height="11.023263"
-           width="11.042357"
-           id="rect6506-6"
-           style="color:#000000;fill:url(#linearGradient15341-5);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1);stroke-width:0.48824981;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="scale(1,-1)" />
-      </g>
-    </g>
-    <g
-       style="display:inline;enable-background:new"
-       id="g5886"
-       transform="matrix(1.025641,0,0,1.025641,-189.74359,-219.69231)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-on.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:path-effect="#path-effect5837"
-         id="path5835"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         style="fill:none;stroke:url(#linearGradient5891);stroke-width:5.8499999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#4787c8;stroke-width:2.92499995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         id="path5880"
-         inkscape:path-effect="#path-effect5837"
-         inkscape:original-d="m 198.5,240 5.25,5.25 13.875,-13.875"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="csccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 197.71875,240.4375 c 0.65604,-0.56057 1.41045,-1.32862 1.90625,-0.8125 l 3.8125,3.96875 13.25,-12.65625 c 0.6875,-0.6875 1.90625,0.21875 1.90625,0.21875"
-         inkscape:path-effect="#path-effect5884"
-         id="path5882"
-         d="m 197.71875,240.4375 c -0.113,-0.1009 -0.19813,-0.23267 -0.24374,-0.37713 -0.0456,-0.14446 -0.0515,-0.30115 -0.0175,-0.44876 0.034,-0.14762 0.10786,-0.28567 0.21068,-0.39693 0.10281,-0.11125 0.23413,-0.19547 0.37723,-0.24518 0.1431,-0.0497 0.29748,-0.065 0.44812,-0.0491 0.15065,0.0159 0.29731,0.0628 0.43264,0.13085 0.27066,0.13614 0.48894,0.35524 0.69883,0.57373 l 3.8125,3.96875 13.25,-12.65625 c 0.14959,-0.14288 0.30236,-0.28546 0.48132,-0.38923 0.17895,-0.10377 0.38437,-0.16706 0.59112,-0.16016 0.20674,0.007 0.41161,0.0857 0.56458,0.22493 0.15297,0.13925 0.25142,0.33712 0.26923,0.54321"
-         style="fill:none;stroke:#7ea7d3;stroke-width:0.97499996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/grid-selection-unchecked.svg b/Zukitwo-Wise/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 622752d..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,278 +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="40"
-   height="40"
-   id="svg5038"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="grid-selection-unchecked.svg">
-  <defs
-     id="defs5040">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5872"
-       id="linearGradient5891"
-       gradientUnits="userSpaceOnUse"
-       x1="205.84143"
-       y1="246.7094"
-       x2="206.74803"
-       y2="231.24142" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5872">
-      <stop
-         style="stop-color:#13508e;stop-opacity:1;"
-         offset="0"
-         id="stop5874" />
-      <stop
-         style="stop-color:#1862af;stop-opacity:1"
-         offset="1"
-         id="stop5876" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5837"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5012"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect5884"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1"
-       id="linearGradient15341-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1609.9926,-78.958432)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3"
-       id="linearGradient15343-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.84941206,0,0,0.84794288,-623.98415,-483.16392)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,144.29163,-314.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5726"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient85841-7-0">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8" />
-      <stop
-         id="stop85845-0-5"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04849388,0,0,0.53398858,-4.8290974,-542.54487)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5036"
-       xlink:href="#linearGradient85841-7-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10354-2-9-1-7"
-       id="linearGradient15341-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.0481327,0,0,2.0481327,-2450.0351,382.43617)"
-       x1="1205.5752"
-       y1="-186.45331"
-       x2="1205.5752"
-       y2="-202.34555" />
-    <linearGradient
-       id="linearGradient10354-2-9-1-7"
-       inkscape:collect="always">
-      <stop
-         id="stop10356-2-8-2-9"
-         offset="0"
-         style="stop-color:#bcbfb8;stop-opacity:1" />
-      <stop
-         id="stop10358-2-6-2-3"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10332-5-3-3-8"
-       id="linearGradient15343-1-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7397086,0,0,1.7366996,-430.55893,-445.43032)"
-       x1="260.92538"
-       y1="233.77748"
-       x2="260.92538"
-       y2="248.97633" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10332-5-3-3-8">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10334-5-3-1-4" />
-      <stop
-         style="stop-color:#8f9985;stop-opacity:1"
-         offset="1"
-         id="stop10336-29-3-4-0" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.04728153,0,0,0.52063887,344.29163,-313.78125)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5772"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient85841-7-0-9">
-      <stop
-         style="stop-color:#242424;stop-opacity:1"
-         offset="0"
-         id="stop85843-4-8-3" />
-      <stop
-         id="stop85845-0-5-1"
-         offset="0.63381755"
-         style="stop-color:#101010;stop-opacity:1;" />
-      <stop
-         style="stop-color:#262626;stop-opacity:1"
-         offset="1"
-         id="stop85847-7-3-3" />
-    </linearGradient>
-    <linearGradient
-       y2="1106.5294"
-       x2="808"
-       y1="1040.7369"
-       x1="806.39526"
-       gradientTransform="matrix(0.0484939,0,0,0.5339888,-4.8290988,-542.54512)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5153"
-       xlink:href="#linearGradient85841-7-0-9"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="-27.714286"
-     inkscape:cy="24"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata5043">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <rect
-       ry="7.179491"
-       rx="7.179491"
-       style="opacity:0.75;color:#000000;fill:url(#linearGradient5153);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect85718-2-9-0"
-       width="40.000019"
-       height="40.000019"
-       x="0"
-       y="7.9999809"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       ry="1.6518886"
-       rx="1.6518886"
-       y="-39.282047"
-       x="8.7179489"
-       height="22.577105"
-       width="22.616215"
-       id="rect6506-6-8"
-       style="color:#000000;fill:url(#linearGradient15341-5-8);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient15343-1-8);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/jimmac/SparkleShare/gnome-mockups/boxes/interactive/img/checkbox-off.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/header-separator.png b/Zukitwo-Wise/gtk-3.0/assets/header-separator.png
deleted file mode 100644
index dcd3695..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/header-separator.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/header-separator@2.png b/Zukitwo-Wise/gtk-3.0/assets/header-separator@2.png
deleted file mode 100644
index fc71275..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/header-separator@2.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 049a09f..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.39215687;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
deleted file mode 100644
index fc75bfb..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked-selected.svg
+++ /dev/null
@@ -1,66 +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-checkbox-checked.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 4819b8f..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,66 +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="Nytt dokument 3">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="25.06349"
-     inkscape:cy="10.941332"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="399"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       sodipodi:nodetypes="ccc"
-       d="m 399.28571,541.29075 2.99485,3.21429 7.00515,-7.5"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path6301-5"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index e37b20b..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed-selected.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 466f05f..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,69 +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-checkbox-mixed.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index da94c64..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,69 +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-checkbox-checked-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect5494-2"
-       width="8.9375"
-       height="2"
-       x="399.21329"
-       y="539.51373"
-       rx="1.8653847"
-       ry="1" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 3cd2cb0..0000000
--- a/Zukitwo-Wise/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/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked-selected.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked-selected.svg
deleted file mode 100644
index 15ee80b..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked-selected.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="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535718999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked.svg b/Zukitwo-Wise/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 354c585..0000000
--- a/Zukitwo-Wise/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-checkbox-mixed-insensitive.svg">
-  <defs
-     id="defs4961" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="3.2189413"
-     inkscape:cy="11.077361"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="746"
-     inkscape:window-height="463"
-     inkscape:window-x="0"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4964">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-398.2133,-533.50504)">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95535719;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 407.2133,541.01375 c 0,1.93299 -1.567,3.5 -3.5,3.5 -1.93299,0 -3.5,-1.56701 -3.5,-3.5 0,-1.933 1.56701,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
-       id="path4945"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/null.png b/Zukitwo-Wise/gtk-3.0/assets/null.png
deleted file mode 100644
index 8777a4c..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/null.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/pane-separator-grip-vertical.svg b/Zukitwo-Wise/gtk-3.0/assets/pane-separator-grip-vertical.svg
deleted file mode 100644
index 9d1190c..0000000
--- a/Zukitwo-Wise/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/Zukitwo-Wise/gtk-3.0/assets/pane-separator-grip.svg b/Zukitwo-Wise/gtk-3.0/assets/pane-separator-grip.svg
deleted file mode 100644
index e2fa9be..0000000
--- a/Zukitwo-Wise/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/Zukitwo-Wise/gtk-3.0/assets/radio-active-ins.png b/Zukitwo-Wise/gtk-3.0/assets/radio-active-ins.png
deleted file mode 100644
index a8f0a03..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/radio-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/radio-active.png b/Zukitwo-Wise/gtk-3.0/assets/radio-active.png
deleted file mode 100644
index c517be2..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/radio-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/radio-mixed-active-ins.png b/Zukitwo-Wise/gtk-3.0/assets/radio-mixed-active-ins.png
deleted file mode 100644
index da7cb0f..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/radio-mixed-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/radio-mixed-active.png b/Zukitwo-Wise/gtk-3.0/assets/radio-mixed-active.png
deleted file mode 100644
index 8af2cc6..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/radio-mixed-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/radio-normal-ins.png b/Zukitwo-Wise/gtk-3.0/assets/radio-normal-ins.png
deleted file mode 100644
index 2c9af32..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/radio-normal-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/radio-normal.png b/Zukitwo-Wise/gtk-3.0/assets/radio-normal.png
deleted file mode 100644
index 4aefd43..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/radio-normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/resize-grip.svg b/Zukitwo-Wise/gtk-3.0/assets/resize-grip.svg
deleted file mode 100644
index fa1f587..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/resize-grip.svg
+++ /dev/null
@@ -1,117 +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="13"
-   height="13"
-   id="svg17653"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="resize-grip.svg">
-  <defs
-     id="defs17655" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.311078"
-     inkscape:cx="-8.2186936"
-     inkscape:cy="8.0008486"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1022"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata17658">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-3)">
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5513"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5515"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-392.19484)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5517"
-       sodipodi:cx="868.63647"
-       sodipodi:cy="617.14966"
-       sodipodi:rx="1.9003495"
-       sodipodi:ry="1.9003495"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-395.46756)" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-560.57081,-398.74029)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5519"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-567.11626,-392.19484)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5521"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.65777374,0,0,0.65777374,-563.84354,-395.46756)"
-       d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
-       sodipodi:ry="1.9003495"
-       sodipodi:rx="1.9003495"
-       sodipodi:cy="617.14966"
-       sodipodi:cx="868.63647"
-       id="path5523"
-       style="fill:#b9beb3;fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-checked.svg b/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-checked.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-checked.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-prelight.svg b/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-prelight.svg
deleted file mode 100644
index ea4aca4..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-checked.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-selected-prelight.svg b/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
deleted file mode 100644
index 7ec4500..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-selected-prelight.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-selected.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-selected.svg b/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-selected.svg
deleted file mode 100644
index e6c11b1..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/sidebar-radio-selected.svg
+++ /dev/null
@@ -1,66 +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="16"
-   height="16"
-   id="svg27352"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="sidebar-radio-prelight.svg">
-  <defs
-     id="defs27354" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-3.6523764"
-     inkscape:cy="12.856863"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="958"
-     inkscape:window-height="587"
-     inkscape:window-x="38"
-     inkscape:window-y="91"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata27357">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path5784-4"
-       sodipodi:cx="660.96808"
-       sodipodi:cy="255.0668"
-       sodipodi:rx="4.5078058"
-       sodipodi:ry="7.2937827"
-       d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
-       transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/slider-hover.png b/Zukitwo-Wise/gtk-3.0/assets/slider-hover.png
deleted file mode 100644
index 72c5437..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/slider-hover.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/slider-ins.png b/Zukitwo-Wise/gtk-3.0/assets/slider-ins.png
deleted file mode 100644
index f31f5c9..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/slider-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/slider.png b/Zukitwo-Wise/gtk-3.0/assets/slider.png
deleted file mode 100644
index 3fdda2c..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/slider.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/switch-off-ins.png b/Zukitwo-Wise/gtk-3.0/assets/switch-off-ins.png
deleted file mode 100755
index a0448e6..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-off-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/switch-off-ins.svg b/Zukitwo-Wise/gtk-3.0/assets/switch-off-ins.svg
deleted file mode 100755
index 72e7d0b..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-off-ins.svg
+++ /dev/null
@@ -1,739 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5849"
-       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="radialGradient5851"
-       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="radialGradient5854"
-       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="radialGradient5856"
-       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="linearGradient5860"
-       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="linearGradient5864"
-       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="linearGradient5867"
-       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="23.856749"
-     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="g6377">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5867);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(#linearGradient5864);stroke-width:1;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(#linearGradient5860);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(#radialGradient5854);fill-opacity:1;stroke:url(#radialGradient5856);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5849);fill-opacity:1;stroke:url(#radialGradient5851);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/Zukitwo-Wise/gtk-3.0/assets/switch-off.png b/Zukitwo-Wise/gtk-3.0/assets/switch-off.png
deleted file mode 100755
index daa5fb0..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-off.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/switch-off.svg b/Zukitwo-Wise/gtk-3.0/assets/switch-off.svg
deleted file mode 100755
index e636bd8..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-off.svg
+++ /dev/null
@@ -1,739 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient4454"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <linearGradient
-       id="linearGradient3986">
-      <stop
-         style="stop-color:#878787;stop-opacity:1;"
-         offset="0"
-         id="stop3988" />
-      <stop
-         style="stop-color:#4b4b4b;stop-opacity:1;"
-         offset="1"
-         id="stop3990" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3965-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967-3" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969-2" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4446"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3668">
-      <stop
-         style="stop-color:#828282;stop-opacity:0.68627453;"
-         offset="0"
-         id="stop3670" />
-      <stop
-         style="stop-color:#828282;stop-opacity:0;"
-         offset="1"
-         id="stop3672" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient4448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3675">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3677" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3679" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient4030"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)" />
-    <linearGradient
-       id="linearGradient4198">
-      <stop
-         style="stop-color:#c0c0c0;stop-opacity:1;"
-         offset="0"
-         id="stop4200" />
-      <stop
-         style="stop-color:#d1d1d1;stop-opacity:1;"
-         offset="1"
-         id="stop4202" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient3942">
-      <stop
-         id="stop3944"
-         offset="0"
-         style="stop-color:#878787;stop-opacity:1;" />
-      <stop
-         id="stop3946"
-         offset="1"
-         style="stop-color:#828282;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3245"
-       gradientUnits="userSpaceOnUse"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-69.099883)" />
-    <linearGradient
-       id="linearGradient4125-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127-6" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129-9" />
-    </linearGradient>
-    <linearGradient
-       y2="541.57648"
-       x2="428.21423"
-       y1="548.57648"
-       x1="428.21423"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3706"
-       xlink:href="#linearGradient4125-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-452.52807,-115.86523)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3818"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-416.55472,-62.061548)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-165.43988,-33.503598)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3822"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-380.57475,-1121.7091)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3826"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,302.4183,579.58171)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3828"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,456.76009,559.90988)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-112.7912,8.7486417)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3986"
-       id="linearGradient3832"
-       gradientUnits="userSpaceOnUse"
-       x1="67.50013"
-       y1="-13.499995"
-       x2="67.50013"
-       y2="-29.500275" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,438.83875,535.54566)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-130.71254,-15.61558)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965-6"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,284.49696,555.21749)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133-1"
-       id="linearGradient3076"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4198"
-       id="linearGradient3079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1578947,0,0,1.1,-183.36122,-57.86782)"
-       x1="482.21423"
-       y1="526.57648"
-       x2="482.21423"
-       y2="546.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3942"
-       id="linearGradient3082"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8750093,0,0,1.150008,-434.47606,-86.42577)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125-9"
-       id="linearGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3994"
-       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="radialGradient3996"
-       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="radialGradient3999"
-       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="radialGradient4001"
-       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="linearGradient4005"
-       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="linearGradient4008"
-       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="linearGradient4011"
-       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="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22945)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="31.343809"
-     inkscape:cy="19.944651"
-     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="1406"
-     inkscape:window-height="916"
-     inkscape:window-x="136"
-     inkscape:window-y="43"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078" />
-  </sodipodi:namedview>
-  <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="g4018">
-      <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(#linearGradient4014);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(#linearGradient4011);stroke-width:1;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(#linearGradient4008);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(#linearGradient4005);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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         transform="matrix(1.5,0,0,1.3846154,265.03944,559.31897)" />
-      <path
-         style="fill:url(#radialGradient3999);fill-opacity:1;stroke:url(#radialGradient4001);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(#radialGradient3994);fill-opacity:1;stroke:url(#radialGradient3996);stroke-width:1.12810218" />
-      <path
-         transform="matrix(1.13333,0,0,-1.13333,287.53967,507.95238)"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         transform="matrix(1.2666816,0,0,-1.2666816,278.49109,505.13266)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/switch-on-ins.png b/Zukitwo-Wise/gtk-3.0/assets/switch-on-ins.png
deleted file mode 100755
index a8f1302..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-on-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/switch-on-ins.svg b/Zukitwo-Wise/gtk-3.0/assets/switch-on-ins.svg
deleted file mode 100755
index 0bc09e1..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-on-ins.svg
+++ /dev/null
@@ -1,731 +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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4284"
-       id="radialGradient5307"
-       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="radialGradient5309"
-       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="radialGradient5312"
-       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="radialGradient5314"
-       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="linearGradient5318"
-       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="linearGradient5322"
-       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="linearGradient5325"
-       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="14.3756"
-     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="1298"
-     inkscape:window-height="801"
-     inkscape:window-x="191"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <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="g5835">
-      <rect
-         style="fill:none;stroke:url(#linearGradient5325);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(#linearGradient5322);stroke-width:1;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(#linearGradient5318);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(#radialGradient5312);fill-opacity:1;stroke:url(#radialGradient5314);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient5307);fill-opacity:1;stroke:url(#radialGradient5309);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/Zukitwo-Wise/gtk-3.0/assets/switch-on.png b/Zukitwo-Wise/gtk-3.0/assets/switch-on.png
deleted file mode 100755
index 54eea5b..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-on.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/assets/switch-on.svg b/Zukitwo-Wise/gtk-3.0/assets/switch-on.svg
deleted file mode 100755
index 13db48c..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/switch-on.svg
+++ /dev/null
@@ -1,409 +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.svg">
-  <defs
-     id="defs3484">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient4207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-360.37115,-41.099883)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4125">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.48627451;"
-         offset="0"
-         id="stop4127" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4129" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient4214"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-288.41783,-1196.4744)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       id="linearGradient4133">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.1254902;"
-         offset="0"
-         id="stop4135" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0627451;"
-         offset="1"
-         id="stop4137" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient4064">
-      <stop
-         id="stop4066"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop4068"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,416.57522,654.34706)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3967" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient4220"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,570.91702,634.67523)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       id="linearGradient3459">
-      <stop
-         id="stop3461"
-         offset="0"
-         style="stop-color:#4a79a5;stop-opacity:0.50980395;" />
-      <stop
-         id="stop3463"
-         offset="1"
-         style="stop-color:#4a79a5;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,1.365723,83.513995)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <linearGradient
-       id="linearGradient3466">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.39285713;"
-         offset="0"
-         id="stop3468" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3470" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3792"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3794"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0358675,0.32475847,0.33853201,1.2979227,460.83876,535.54569)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.077388,0,0,1.0773891,-108.71254,-15.615547)"
-       cx="459.21423"
-       cy="508.57648"
-       fx="459.21423"
-       fy="508.57648"
-       r="7.8299899" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4064"
-       id="radialGradient3038"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3040"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2051902,0,0,1.2051887,306.49696,555.21752)"
-       cx="66"
-       cy="-19"
-       fx="66"
-       fy="-19"
-       r="7" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4133"
-       id="linearGradient3044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7916673,0,0,1.049997,-398.49609,-1097.3449)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4125"
-       id="linearGradient3049"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.958336,0,0,1.2500004,-470.44941,-140.22942)"
-       x1="428.21423"
-       y1="548.57648"
-       x2="428.21423"
-       y2="541.57648" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="24.763904"
-     inkscape:cy="14.85084"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1166"
-     inkscape:window-height="707"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3487">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-350.99212,-519.36632)">
-    <g
-       id="g4854">
-      <rect
-         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"
-         id="rect4189"
-         width="46.999901"
-         height="24.999901"
-         x="351.49219"
-         y="519.86639"
-         rx="13.35611"
-         ry="12.499951" />
-      <rect
-         ry="11.50003"
-         rx="12.356178"
-         y="520.86633"
-         x="352.4921"
-         height="23.000061"
-         width="45.000061"
-         id="rect4191"
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         style="fill:#6699cc;fill-opacity:1;stroke:none"
-         id="rect4193"
-         width="44"
-         height="22"
-         x="352.99213"
-         y="521.36633"
-         rx="11.856148"
-         ry="11" />
-      <rect
-         style="fill:none;stroke:url(#linearGradient3044);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4195"
-         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 c 0,3.589851 -2.686292,6.5 -6,6.5 -3.313708,0 -6,-2.910149 -6,-6.5 0,-3.589851 2.686292,-6.5 6,-6.5 3.313708,0 6,2.910149 6,6.5 z"
-         sodipodi:ry="6.5"
-         sodipodi:rx="6"
-         sodipodi:cy="-19.5"
-         sodipodi:cx="66"
-         id="path4197"
-         style="fill:#ececec;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4199"
-         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(#radialGradient3038);fill-opacity:1;stroke:url(#radialGradient3040);stroke-width:1.12735164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:url(#radialGradient3033);fill-opacity:1;stroke:url(#radialGradient3035);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="path4201"
-         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="path4203"
-         sodipodi:cx="67.5"
-         sodipodi:cy="-21.5"
-         sodipodi:rx="7.5"
-         sodipodi:ry="7.5"
-         d="m 75,-21.5 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 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 c 0,4.142136 -3.357864,7.5 -7.5,7.5 -4.142136,0 -7.5,-3.357864 -7.5,-7.5 0,-4.142136 3.357864,-7.5 7.5,-7.5 4.142136,0 7.5,3.357864 7.5,7.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="-21.5"
-         sodipodi:cx="67.5"
-         id="path4205"
-         style="fill:none;stroke:#336699;stroke-width:0.78928715000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <rect
-         style="fill:none;stroke:#336699;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4852"
-         width="45.000061"
-         height="23.000061"
-         x="352.4921"
-         y="520.86633"
-         rx="12.356178"
-         ry="11.50003" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/gtk-3.0/assets/thumbnail-frame.png b/Zukitwo-Wise/gtk-3.0/assets/thumbnail-frame.png
deleted file mode 100644
index ba5d721..0000000
--- a/Zukitwo-Wise/gtk-3.0/assets/thumbnail-frame.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/button-active-focus.png b/Zukitwo-Wise/gtk-3.0/borders/button-active-focus.png
deleted file mode 100644
index c087f2a..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/button-active-focus.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/button-active-ins.png b/Zukitwo-Wise/gtk-3.0/borders/button-active-ins.png
deleted file mode 100644
index 2c474fb..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/button-active-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/button-active.png b/Zukitwo-Wise/gtk-3.0/borders/button-active.png
deleted file mode 100644
index ec2a671..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/button-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/button-focus.png b/Zukitwo-Wise/gtk-3.0/borders/button-focus.png
deleted file mode 100755
index 14fe2cf..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/button-focus.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/button-ins.png b/Zukitwo-Wise/gtk-3.0/borders/button-ins.png
deleted file mode 100644
index ca1f903..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/button-ins.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/button.png b/Zukitwo-Wise/gtk-3.0/borders/button.png
deleted file mode 100644
index f0abc6a..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/button.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/borders/nohl-generic-border.png b/Zukitwo-Wise/gtk-3.0/borders/nohl-generic-border.png
deleted file mode 100644
index bcf97af..0000000
--- a/Zukitwo-Wise/gtk-3.0/borders/nohl-generic-border.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-fallback.css b/Zukitwo-Wise/gtk-3.0/gtk-fallback.css
deleted file mode 100644
index f96d1b3..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-fallback.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
-}
-
-.menubar .menu {
-	border-image: linear-gradient(to top,
-		alpha(@borders, 0.80),
-		alpha(@borders, 0.60) 33%,
-		alpha(@borders, 0.50) 66%,
-		transparent 99%) 1 1 1 1/ 1px 1px 1px 1px;
-}
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-main-common.css b/Zukitwo-Wise/gtk-3.0/gtk-main-common.css
deleted file mode 100644
index bdb06b2..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-main-common.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* common color definitions to the light and dark variations */
-
-/******************************
- * Destructive action buttons *
- ******************************/
-@define-color destructive_action_button_a #e03d3d;
-@define-color destructive_action_button_b #ef2929;
-@define-color destructive_action_button_border #9d4242;
-@define-color destructive_action_button_fg #ffffff;
-@define-color destructive_action_button_shadow shade(@destructive_action_button_border, 1.15);
-
-/*******
- * OSD *
- *******/
-@define-color osd_highlight #ffffff;
-@define-color osd_lowlight #525252;
-@define-color osd_base #212526;
-@define-color osd_base_backdrop shade(@osd_base, 1.40);
-
-@define-color osd_fg #ededed;
-@define-color osd_bg alpha(@osd_base, 0.80);
-@define-color osd_bg_backdrop alpha(@osd_base_backdrop, 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_bg, 0.25);
-@define-color osd_button_bg_insensitive_active alpha(@osd_bg, 0.16);
-
-@define-color osd_button_bg_hover_a alpha(@osd_highlight, 0.28);
-@define-color osd_button_bg_hover_b alpha(@osd_lowlight, 0.14);
-@define-color osd_button_bg_hover_c alpha(@osd_highlight, 0.14);
-
-@define-color osd_button_bg_active_a alpha(black, .9);
-@define-color osd_button_bg_active_b alpha(black, 0.4);
-@define-color osd_button_bg_active_c alpha(black, 0);
-
-@define-color osd_button_bg_backdrop alpha(@osd_bg, 0.18);
-@define-color osd_button_bg_backdrop_hover alpha(@osd_bg, 0.25);
-@define-color osd_button_bg_backdrop_active alpha(@osd_bg, 0.35);
-@define-color osd_button_bg_backdrop_insensitive alpha(@osd_bg, 0.08);
-
-@define-color osd_button_fg_backdrop shade(@osd_fg, 0.70);
-@define-color osd_button_fg_backdrop_active shade(@osd_fg, 0.95);
-
-@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_border_active alpha(@osd_highlight, 0.8);
-@define-color osd_button_inset shade(@osd_fg, 0.67);
-@define-color osd_button_shadow alpha(black, 0.35);
-
-@define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
-
-@define-color osd_view_bg alpha(@osd_bg, 0.60);
-@define-color osd_view_bg_backdrop alpha(@osd_bg_backdrop, 0.60);
-
-@define-color osd_scrollbar_trough shade(@osd_base, 1.70);
-@define-color osd_scrollbar_trough_backdrop shade(@osd_base_backdrop, 1.40);
-
-@define-color osd_scrollbar_slider shade(@osd_scrollbar_trough, 1.50);
-@define-color osd_scrollbar_slider_prelight shade(@osd_scrollbar_trough, 1.80);
-@define-color osd_scrollbar_slider_active shade(@osd_scrollbar_trough, 2.10);
-@define-color osd_scrollbar_slider_backdrop shade(@osd_scrollbar_trough_backdrop, 1.50);
-
-/***********
- * Popover *
- ***********/
-@define-color osd_popover_bg alpha(@osd_base, 0.90);
-
-/*********************
- * Error/Warning/... *
- *********************/
-@define-color link_color #4a90d9;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color infobar_fg_color white;
-@define-color infobar_text_shadow alpha(black, 0.3);
-
-/*****************
- * Fallback Mode *
- *****************/
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-/************
- * Tooltips *
- ************/
-@define-color theme_tooltip_bg_color #f5f5b5;
-@define-color theme_tooltip_fg_color #000000;
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-main.css b/Zukitwo-Wise/gtk-3.0/gtk-main.css
deleted file mode 100644
index 3632dd3..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-main.css
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Default color scheme */
-@define-color theme_base_color #ffffff;
-@define-color theme_bg_color #d8d8d8;
-@define-color theme_selected_bg_color #97bf60;
-@define-color theme_text_color #1a1a1a;
-@define-color theme_fg_color #101010;
-@define-color theme_selected_fg_color #ffffff;
-
-@define-color placeholder_text_color shade(@text_color, 3.5);
-
-@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
-@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
-@define-color theme_unfocused_fg_color shade(@theme_bg_color, 0.6);
-@define-color theme_unfocused_bg_color @theme_bg_color;
-@define-color theme_unfocused_selected_bg_color shade(@theme_unfocused_bg_color, 0.95);
-@define-color theme_unfocused_selected_fg_color @theme_fg_color;
-@define-color unfocused_button_background @theme_unfocused_bg_color;
-@define-color unfocused_borders @borders;
-@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
-@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
-@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
-@define-color unfocused_dark_bg mix(@theme_unfocused_bg_color, @unfocused_borders, 0.3);
-
-@define-color menu_bg_color shade (@theme_bg_color, 1.1);
-@define-color menu_fg_color @theme_fg_color;
-
-@define-color menu_controls_color shade (@theme_fg_color, 0.9);
-
-@define-color menu_combobox_border @theme_selected_bg_color;
-@define-color menu_separator shade (@menu_bg_color, 0.96);
-
-@define-color inactive_frame_color #ccc;
-
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
-@define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
-
-@define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
-@define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
-
-@define-color button_gradient_color_a shade(@theme_bg_color, 1.14);
-@define-color button_gradient_color_b shade(@theme_bg_color, 1.04);
-@define-color button_gradient_color_c shade(@theme_bg_color, 1.06);
-@define-color borders shade(@theme_bg_color, 0.82);
-
-@define-color button_active_gradient_color_a shade(@theme_bg_color, 0.8);
-@define-color button_active_gradient_color_b shade(@theme_bg_color, 0.9);
-@define-color button_active_text @theme_fg_color;
-@define-color button_active_text_shadow alpha(white, 0.4);
-@define-color button_text_shadow alpha(white, 0.4);
-
-@define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
-@define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
-
-@define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
-@define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
-@define-color insensitive_borders shade(@internal_element_color, 1.37);
-@define-color insensitive_scale_borders @insensitive_borders;
-
-@define-color trough_bg_color_a shade(@theme_bg_color, 0.89);
-@define-color trough_bg_color_b shade(@theme_bg_color, 0.96);
-
-@define-color infobar_bg_color rgb (138, 173, 212);
-
-@define-color scrollbar_trough shade(@theme_bg_color, 0.98);
-@define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.0);
-@define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 0.9);
-@define-color scrollbar_slider @theme_bg_color;
-@define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.5);
-@define-color scrollbar_slider_active @theme_selected_bg_color;
-@define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
-@define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
-
-@define-color switch_slider_color #eee;
-@define-color switch_trough_active_color @theme_base_color;
-@define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color switch_trough_active_bg_b shade(@theme_selected_bg_color, 0.89);
-
-@define-color progressbar_background_a shade(@theme_selected_bg_color, 0.95);
-@define-color progressbar_background_b shade(@theme_selected_bg_color, 1.1);
-@define-color progressbar_pattern shade(@theme_selected_bg_color, 0.8);
-@define-color progressbar_border @progressbar_pattern;
-@define-color progressbar_unfocused_background @unfocused_dark_bg;
-@define-color progressbar_unfocused_border @unfocused_borders;
-@define-color progressbar_unfocused_trough @theme_unfocused_bg_color;
-
-@define-color entry_text_color @theme_text_color;
-@define-color entry_background_a shade(@theme_base_color, 0.94);
-@define-color entry_background_b @theme_base_color;
-
-@define-color entry_inset alpha(black, 0.1);
-
-@define-color internal_element_color @borders;
-@define-color internal_element_prelight @theme_text_color;
-@define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
-
-@define-color scale_trough_bg_a shade(@theme_bg_color, 0.9);
-@define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
-@define-color scale_shadow alpha(white, 0.50);
-@define-color scale_progress_fill @theme_selected_bg_color;
-@define-color scale_highlight_border @theme_selected_bg_color;
-@define-color scale_highlight_bg @theme_selected_bg_color;
-@define-color scale_highlight_shadow alpha(white, 0.50);
-
-@define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.89);
-@define-color notebook_selected_tab_color shade(@theme_selected_bg_color, 0.96);
-
-@define-color notebook_tab_gradient_a shade(@theme_bg_color, 1.06);
-@define-color notebook_tab_gradient_b shade(@theme_bg_color, 1.0);
-@define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
-
-@define-color toolbar_gradient_a shade(@borders, 1.15);
-@define-color toolbar_gradient_b shade(@borders, 1.25);
-@define-color toolbar_gradient_c shade(@borders, 1.3);
-
-/* start for zukitwo */
-@define-color toolbar_border_top shade(@borders, 0.9);
-@define-color toolbar_border_bottom shade(@borders, 1.1);
-/* end for zukitwo */
-
-@define-color toolbar_active_button_color shade(@theme_bg_color, 0.8);
-@define-color toolbar_button_prelight alpha(white, 0.4);
-@define-color toolbar_separator @borders;
-
-@define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
-@define-color content_view_bg #f1f1f1;
-@define-color list_box_bg #fafafa;
-
-@define-color app_notification_a shade(@theme_bg_color, 0.92);
-@define-color app_notification_b shade(@theme_bg_color, 1.0);
-@define-color app_notification_c shade(@theme_bg_color, 1.05);
-
-@define-color app_notification_border @borders;
-
-@define-color treeview_focus_border #2a79cb;
-
-@define-color view_separators shade(@borders, 1.1);
-@define-color view_symbolic_color shade(@internal_element_color, 0.80);
-
-@define-color expander_row_selected_color shade(@theme_selected_bg_color, 1.2);
-
-@define-color inset_light_color alpha(white, 0.45);
-@define-color inset_dark_color alpha(black, 0.07);
-
-@define-color suggested_action_button_a shade(@theme_selected_bg_color, 0.96);
-@define-color suggested_action_button_b shade(@theme_selected_bg_color, 0.89);
-@define-color suggested_action_button_border shade(@theme_selected_bg_color, 0.82);
-@define-color suggested_action_button_fg @theme_base_color;
-@define-color suggested_action_button_shadow shade(@suggested_action_button_border, 1.15);
-
-/**************************
- * Selection Mode classes *
- **************************/
-@define-color selection_toolbar_bg_a shade(@theme_selected_bg_color, 0.96);
-@define-color selection_toolbar_bg_b shade(@theme_selected_bg_color, 0.89);
-@define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
-@define-color selection_toolbar_fg @theme_fg_color;
-@define-color selection_toolbar_shadow alpha(white, 0.40);
-@define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
-
-@define-color selection_toolbar_button_a shade(@theme_selected_bg_color, 1.2);
-@define-color selection_toolbar_button_b shade(@theme_selected_bg_color, 1.0);
-@define-color selection_toolbar_button_fg @theme_base_color;
-@define-color selection_toolbar_button_border @selection_toolbar_fg;
-@define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
-@define-color selection_toolbar_button_shadow alpha(white, 0.15);
-
-@define-color selection_toolbar_suggested_button_a @theme_base_color;
-@define-color selection_toolbar_suggested_button_b @theme_bg_color;
-@define-color selection_toolbar_suggested_button_c #f3f4f3;
-@define-color selection_toolbar_suggested_button_fg @theme_text_color;
-@define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
-@define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
-
-@define-color selection_menu_fg @selection_toolbar_fg;
-@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
-@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
-
-/**************
- * GNOME Apps *
- **************/
-@define-color entry_tag_bg shade(@theme_selected_bg_color, 0.89);
-@define-color entry_tag_fg @theme_base_color;
-
-/******
- * WM *
- ******/
-@define-color wm_title @theme_fg_color;
-@define-color wm_unfocused_title @theme_unfocused_fg_color;
-@define-color wm_highlight #ffffff;
-@define-color wm_title_highlight_dark alpha(#ffffff, 0.0);
-@define-color wm_title_highlight #ffffff;
-@define-color wm_title_shadow @wm_title_highlight;
-
-@define-color wm_bg_a shade (@theme_bg_color, 1.1);
-@define-color wm_bg_b @theme_bg_color;
-
-@define-color wm_shadow alpha(black, 0.5);
-@define-color wm_border alpha(black,0.18);
-
-@define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
-@define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
-@define-color wm_button_bg_c shade (@theme_bg_color, 0.8);
-@define-color wm_button_bg_d shade (@theme_bg_color, 0.9);
-
-@define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1);
-@define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1);
-@define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1);
-@define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1);
-
-@define-color wm_button_bg_active_a shade (@theme_bg_color, 0.7);
-@define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
-@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
-
-@import url("gtk-main-common.css");
-@import url("gtk-widgets-backgrounds.css");
-@import url("gtk-widgets-borders.css");
-@import url("gtk-widgets-assets.css");
-@import url("gtk-widgets.css");
-@import url("other-applications.css");
-@import url("unity.css");
-@import url("window-controls.css");
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-widgets-assets.css b/Zukitwo-Wise/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 9b96b3b..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
-/*******************
- * Pane separators *
- *******************/
-/*.pane-separator {
-	background-image: url("assets/pane-separator-grip.svg");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.pane-separator:hover {
-	background-image: url("assets/pane-separator-grip-prelight.svg");
-}
-
-.pane-separator.vertical {
-	background-image: url("assets/pane-separator-grip-vertical.svg");
-}
-
-.pane-separator.vertical:hover {
-	background-image: url("assets/pane-separator-grip-vertical-prelight.svg");
-}*/
-
-/*************************
- * Header bar separator  *
- *************************/
-
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
-	background: transparent;
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-color: transparent;
-	border-image: -gtk-scaled(url("assets/header-separator.png"),url("assets/header-separator@2.png")) 0 1 0 1 / 0 1px 0 1px stretch;
-}
-
-/*************************
- * Check and Radio items *
- *************************/
-
-/* draw regular check and radio items using our SVG assets */
-
-.check,
-.view.cell.check {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
-	background-image: url("assets/check-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.check:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
-	background-image: url("assets/check-normal-ins.png");
-}
-
-.check row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.check:active,
-.view.cell.check:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:checked,
-.view.cell.check:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
-	background-image: url("assets/check-active.png");
-}
-
-.check:active:insensitive,
-.check:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
-	background-image: url("assets/check-active-ins.png");
-}
-
-.check:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
-	background-image: url("assets/check-mixed-active.png");
-}
-
-.check:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
-	background-image: url("assets/check-mixed-active-ins.png");
-}
-
-.radio,
-.view.cell.radio {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
-	background-image: url("assets/radio-normal.png");
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.radio:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
-	background-image: url("assets/radio-normal-ins.png");
-}
-
-.radio row:insensitive {
-	background-color: transparent;
-}
-
-/* active and checked needs to be seperated for older GTK support? */
-.radio:active,
-.view.cell.radio:active {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-.radio:checked,
-.view.cell.radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
-	background-image: url("assets/radio-active.png");
-}
-
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
-	background-image: url("assets/radio-active-ins.png");
-}
-
-.radio:inconsistent {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
-	background-image: url("assets/radio-mixed-active.png");
-}
-
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
-	background-image: url("assets/radio-mixed-active-ins.png");
-}
-
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
-	background-image: url("assets/sidebar-radio-checked.svg");
-}
-
-.sidebar .view.radio:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
-	background-image: url("assets/sidebar-radio-prelight.svg");
-}
-
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
-	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
-	background-image: 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"));
-	background-image: url("assets/sidebar-radio-selected-prelight.svg");	
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
- 	background-image: url("assets/switch-off.png");
-}
-
-GtkSwitch.trough:active {
-	background-image: url("assets/switch-on.png");
-}
-
-GtkSwitch.trough:insensitive {
-	background-image: url("assets/switch-off-ins.png");
-}
-
-GtkSwitch.trough:active:insensitive {
-	background-image: url("assets/switch-on-ins.png");
-}
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
-}
-
-/********************************
- * Touch text selection handles *
- ********************************/
-.cursor-handle.bottom {
-	background-image: url("assets/slider.png");
-}
-
-.cursor-handle.top {
-	background-image: url("assets/slider.png");
-}
-
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/****************
- * Content view *
- ****************/
-.content-view.view {
-	/*background-image: url("assets/noise-texture-light.png");*/
-}
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-widgets-backgrounds.css b/Zukitwo-Wise/gtk-3.0/gtk-widgets-backgrounds.css
deleted file mode 100644
index 9f6720b..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-widgets-backgrounds.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
-	background-image: linear-gradient(to bottom, 
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-	background-color: transparent;
-}
-
-.button.default {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.05),
-		shade(@theme_selected_bg_color, 1.0));
-	background-color: transparent;
-}
-
-.button.default:hover {
-	background-image: linear-gradient(to bottom, 
-		shade(@theme_selected_bg_color, 1.1),
-		shade(@theme_selected_bg_color, 1.05));
-	background-color: transparent;
-}
-
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active, 
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent; 
-}
-
-.trough,
-.trough.highlight,
-.trough row {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent; 
-}
-
-.button:checked:hover,
-.button:active:hover,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent; 
-}
-
-/* Primary and inline toolbars pushed button background */
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
-	background-image: linear-gradient(to bottom,
-		@button_active_gradient_color_a,
-		@button_active_gradient_color_b);
-	background-color: transparent;
-}
-
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@button_active_gradient_color_a, 1.05),
-		shade (@button_active_gradient_color_b, 1.05));
-	background-color: transparent;
-}
-
-/* Prelit button background */
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_hover_gradient_color_a,
-		@button_hover_gradient_color_b);
-}
-
-/* Prelit button on primary toolbar background */
-.primary-toolbar .button:hover {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		@button_gradient_color_a,
-		@button_gradient_color_b);
-}
-
-/* Insensitive button background */
-.button:insensitive,
-.spinbutton.vertical .button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive {
-	background-image: none;
-	background-color: @insensitive_bg_color;
-}
-
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.button:checked:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar .button:checked:insensitive,
-.toolbar GtkComboBox .button:active:insensitive,
-.toolbar GtkComboBox .button:checked:insensitive {
-	background-image: linear-gradient(to bottom,
-		shade(@insensitive_bg_color, 0.95),
-		@insensitive_bg_color 40%,
-		@insensitive_bg_color);
-	background-color: transparent;
-}
-
-/* Entry background */
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
-	background-image: linear-gradient(to bottom,
-		@entry_background_a,
-		@entry_background_b);
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-/* Entry pushed button background */
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:checked,
-/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
-GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.9),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 1px @entry_inset, 
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-column-header.button,
-column-header .button {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 1.0),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
-}
-
-column-header.button:hover,
-column-header .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_b, 0.96),
-		@entry_background_b);
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
-}
-
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.92),
-		@entry_background_b);
-	background-color: transparent;
-	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.5);
-	border-image: none;
-}
-
-/* Insensitive entry background */
-.entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.level-bar.trough:insensitive {
-	background-color: @insensitive_bg_color;
-	background-image: none;
-	box-shadow: none;
-}
-
-/* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
-	background-image: linear-gradient(to right,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: transparent;
-}
-
-.scale.trough {
-	background-image: linear-gradient(to bottom,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-.scale.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scale_trough_bg_a,
-		@scale_trough_bg_b);
-}
-
-/* Active switch background*/
-GtkSwitch.trough:active,
-.scale.progressbar {
-	background-image: linear-gradient(to bottom,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-.scale.progressbar.vertical {
-	background-image: linear-gradient(to right,
-		@switch_trough_active_bg_a,
-		@switch_trough_active_bg_b);
-	background-color: transparent;
-}
-
-/* Progressbar backgrounds */
-
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	background-image: linear-gradient(to left top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-	background-size: 40px 40px, auto;
-	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
-}
-
-.progressbar.vertical {
-	background-image: linear-gradient(to right top,
-		alpha (@progressbar_pattern, 0.25),
-		alpha (@progressbar_pattern, 0.25) 25%,
-		transparent 25%,
-		transparent 50%,
-		alpha (@progressbar_pattern, 0.25) 50%,
-		alpha (@progressbar_pattern, 0.25) 75%,
-		transparent 75%,
-		transparent),
-		linear-gradient(to right,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-widgets-borders.css b/Zukitwo-Wise/gtk-3.0/gtk-widgets-borders.css
deleted file mode 100644
index cd39f77..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-widgets-borders.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/* Borders */
-
-/* generic element borders */
-.entry,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.button:active,
-.button:checked,
-.spinbutton.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:active,
-.spinbutton.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough,
-.trough.highlight {
-	border: 1px solid @borders;
-}
-
-.entry:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.button:active:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.button:insensitive,
-.button.default:insensitive,
-.spinbutton.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button.default:insensitive,
-.inline-toolbar.toolbar .button.default:insensitive,
-.inline-toolbar.toolbar .button:insensitive {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.trough row {
-	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */
-	border-radius: 4px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused element borders */
-.entry:focus,
-GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .button:focus,
-.button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:active,
-.button.default:checked,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-.button:active:focus,
-.spinbutton.vertical .button:active:focus,
-.button:checked:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
-.inline-toolbar.toolbar.vertical .button:checked:focus { 
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* generic button borders */
-.button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
-	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* focused button borders */
-.button.default,
-.button:focus { 
-	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar button borders */
-.primary-toolbar .button:hover {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	background-color: transparent;
-}
-
-/* tooltip elements borders */
-.tooltip .entry {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.tooltip .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* tooltip focused elements borders */
-.tooltip .entry:focus {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-width: 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
-	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar .button.raised.default:insensitive,
-.primary-toolbar .raised .button.default:insensitive,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkSwitch.trough:active:insensitive,
-.primary-toolbar GtkComboBox .button:insensitive {
-	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused element borders */
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - generic button borders */
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
-	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* primary toolbar - focused button borders */
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 4px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-/* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-	border-style: solid;
-	border-color: transparent;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		@insensitive_bg_color) 0 1 1 0;
-}
-
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
-	border-right-width: 0;
-}
-
-column-header.button:focus,
-column-header .button:focus {
-	border-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
-	border-width: 0 1px 1px 0;
-	border-radius: 0;
-}
-
-/* pushed colored buttons borders */
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 0px 0px 2px 0px;
-	border-style: solid;
-	border-color: transparent;
-
-}
-
-/* suggested action buttons borders */
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
-
-/* destructive action buttons borders */
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
-	/* Zuki note: figure out the heck it does */
-}
diff --git a/Zukitwo-Wise/gtk-3.0/gtk-widgets.css b/Zukitwo-Wise/gtk-3.0/gtk-widgets.css
deleted file mode 100644
index 5c6b9d8..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk-widgets.css
+++ /dev/null
@@ -1,4045 +0,0 @@
-* {
-	padding: 0;
-	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
-	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
-	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
-	-GtkTreeView-expander-size: 11;
-	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
-	-GtkWidget-link-color: @link_color;
-	-GtkWidget-visited-link-color: @link_color;
-	-GtkWidget-focus-padding: 2;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWindow-resize-grip-width: 0;
-	-GtkWindow-resize-grip-height: 0;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
-	-GtkStatusbar-shadow-type: none;
-}
-
-/* Maybe better to have this as a focus since the removal of the adwaita engine */
-*:focus {
-	outline-color: alpha(@theme_text_color, 0.3);
-	outline-style: dashed;
-	outline-offset: -3px;
-	outline-width: 1px;
-	outline-radius: 2px;
-}
-
-/***************
- * Base States *
- ***************/
-
-.background {
-	color: @theme_fg_color;
-	background-color: @theme_bg_color;
-}
-
-.background:backdrop {
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-*:selected,
-*:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-*:selected:backdrop {
-	background-color: @theme_unfocused_selected_bg_color;
-	color: @theme_unfocused_selected_fg_color;
-}
-
-*:insensitive {
-	/*background-color: @insensitive_bg_color;*/
-	color: @insensitive_fg_color;
-	border-color: @insensitive_borders;
-}
-
-/* Apply effects to insensitive and prelit images */
-*:insensitive {
-	-gtk-image-effect: dim;
-}
-
-*:hover {
-	-gtk-image-effect: highlight;
-}
-
-.gtkstyle-fallback {
-	background-color: @theme_bg_color;
-	color: @theme_fg_color;
-}
-
-.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;
-}
-
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
-GtkGrid,
-GtkGrid:insensitive {
-	background-color: transparent;
-}
-
-GtkFlowBox .grid-child {
-	padding: 3px;
-	border-radius: 3px; 
-}
-
-GtkFlowBox .grid-child:selected {
-	outline-offset: -2px; 
-}
-
-GtkTextView {
-	background-color: @theme_base_color; 
-}
-
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
-/************
- * Tooltips *
- ************/
-.tooltip {
-	padding: 4px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
-
-	background-color: @theme_tooltip_bg_color;
-	color: @theme_tooltip_fg_color;
-
-	text-shadow: none;
-}
-
-.tooltip * {
-	background-color: transparent;
-}
-
-/*********************
- * Spinner Animation *
- *********************/
-@keyframes spin {
-	to { -gtk-icon-transform: rotate(1turn); } }
-.spinner {
-	background-image: none;
-	background-color: blue;
-	opacity: 0;
-	-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); }
-.spinner:active {
-	opacity: 1;
-	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
-	opacity: 0.5; }
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-/*****************
- * Miscellaneous *
- *****************/
-.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: 0px;
-}
-
-.overshoot {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-GtkStatusbar {
-	padding: 5px;
-	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
-	box-shadow: inset 0 1px 0 0 @borders;
-	font-size: smaller;
-}
-
-.dnd {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @theme_selected_bg_color;
-	border-radius: 0;
-}
-
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
-	color: @view_separators;
-	background-color: transparent;
-}
-
-.toolbar .separator {
-	/*color: @toolbar_separator;*/
-	color: transparent;
-}
-
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
-/****************
- * Text Entries *
- ****************/
-.entry {
-	border-style: solid;
-	padding: 5px 4px 6px;
-
-	/* border-image defined in the -assets variants */
-
-	color: @entry_text_color;
-	background-color: @theme_base_color;
-	box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15);
-}
-
-.entry.image.left {
-	padding-right: 6px;
-}
-
-.entry.flat, .entry.flat:focus {
-	padding: 2px;
-	background-color: @theme_base_color;
-	border-color: @borders;
-	border: none;
-	border-radius: 0;
-}
-
-.entry:focus {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.entry.progressbar,
-.entry.progressbar:focus {
-	margin-left: 2px;
-	margin-right: 2px;
-	border-image: none;
-	border-style: none;
-	background-color: transparent;
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		shade(@theme_selected_bg_color, 0.9) 3px,
-		shade(@theme_selected_bg_color, 0.9) 5px,
-		transparent 5px);
-	background-size: auto;
-	box-shadow: none;
-}
-
-.entry.progressbar.pulse,
-.entry.progressbar.pulse:focus {
-	background-image: linear-gradient(to top, 
-		transparent 2px,
-		white 2px,
-		white 3px,
-		@borders 3px,
-		@borders 5px,
-		transparent 5px);
-}
-
-.entry:selected {
-	color: @theme_selected_fg_color;
-	background-color: @theme_selected_bg_color;
-}
-
-.entry:insensitive {
-	color: @insensitive_fg_color;
-}
-
-.entry:active {
-	color: @theme_unfocused_selected_fg_color;
-	background-color: @theme_unfocused_selected_bg_color;
-}
-
-.cursor-handle.top,
-.cursor-handle.bottom {
-	background-color: transparent;
-	box-shadow: none;
-	border-style: none;
-	border-image: none;
-	border-radius: 0px;
-	border-width: 0px;
-
-	/* background-image in assets */
-}
-
-/*******************
- * Symbolic images *
- *******************/
-.image {
-	color: @internal_element_color;
-}
-
-.image:hover {
-	color: @internal_element_prelight;
-}
-
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
-}
-
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
-}
-
-/*****************
- * GtkSpinButton *
- *****************/
-.spinbutton .button {
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-}
-
-.spinbutton .button:insensitive {
-	color: @internal_element_color;
-}
-
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
-}
-
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
-}
-
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
-}
-
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:first-child:active {
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-.spinbutton .button:last-child:active {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-
-.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: @button_active_text;
-	icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :insensitive:insensitive to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:insensitive:insensitive {
-	icon-shadow: none;
-}
-
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-.spinbutton.vertical .button:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-}
-
-.spinbutton.vertical .button:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-}
-
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-.spinbutton.vertical.entry:insensitive {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
-}
-
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
-}
-
-/*****************
- * Color Chooser *
- *****************/
-GtkColorSwatch,
-GtkColorSwatch:selected {
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 1px;
-	border-color: alpha(black, 0.3);
-	box-shadow: inset 0 2px alpha(black, 0.07),
-		inset 1px 1px alpha(black, 0.07);
-
-	background-color: transparent;
-	background-clip: border-box;
-}
-
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
-	border-color: alpha(black, 0.45);
-}
-
-GtkColorSwatch.color-dark:hover {
-	background-image: linear-gradient(to bottom,
-		alpha(white, 0) 40%,
-		alpha(white, 0.3)
-		);
-}
-
-GtkColorSwatch.color-light:hover {
-	background-image: linear-gradient(to top,
-		alpha(black, 0) 40%,
-		alpha(black, 0.1)
-		);
-}
-
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
-	background-image: none;
-}
-
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorSwatch:only-child {
-	border-radius: 6px;
-}
-
-GtkColorSwatch.top {
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-
-GtkColorSwatch.bottom {
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-}
-
-GtkColorChooserWidget #add-color-button {
-	background-clip: padding-box;
-	border-color: mix(@borders, @theme_bg_color, 0.3);
-	background-color: mix(@borders, @theme_bg_color, 0.3);
-	color: @theme_base_color;
-	box-shadow: none;
-}
-
-GtkColorChooserWidget #add-color-button:hover {
-	border-color: @borders;
-	background-color: @borders;
-	color: @theme_base_color;
-}
-
-.color-active-badge,
-.color-active-badge:selected {
-	border-style: solid;
-	border-width: 2px;
-	background-color: transparent;
-}
-
-.color-active-badge.color-light,
-.color-active-badge.color-light:hover {
-	border-color: #444444;
-	color: #444444;
-}
-
-.color-active-badge.color-dark,
-.color-active-badge.color-dark:hover {
-	border-color: #cccccc;
-	color: #cccccc;
-}
-
-GtkColorEditor GtkColorSwatch {
-	border-radius: 6px;
-}
-
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
-	background-image: none;
-	border-color: alpha(black, 0.3);
-}
-
-GtkColorButton.button {
-	padding: 1px 20px;
-}
-
-/****************
- * Progress bar *
- ****************/
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
-	padding: 0 0 1px 0;
-	font-size: smaller;
-}
-
-/* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-radius: 0px;
-	padding: 0 0 1px 0;
-	border-width: 1px;
-	border-color: @progressbar_border;
-	border-style: solid;
-	box-shadow: inset 0 0 0 1px alpha(@theme_base_color, 0.2);
-}
-
-.progressbar row:selected,
-.progressbar row:selected:focus {
-	border-color: shade(@progressbar_border, 0.85);
-}
-
-/* for progressbars in cell renderers */
-.trough row {
-	padding: 0;
-}
-
-.trough row:selected,
-.trough row:selected:focus {
-	background-image: linear-gradient(to bottom,
-		mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25),
-		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
-}
-
-/****************
- * Level Bar *
- ****************/
-
-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;
-	border-radius: 2px;
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	background-color: transparent;
-	box-shadow: none;
-}
-
-
-.level-bar.fill-block {
-	border-width: 1px;
-	border-style: solid;
-
-	border-color: @progressbar_border;
-	background-image: linear-gradient(to bottom,
-		@progressbar_background_a,
-		@progressbar_background_b);
-}
-
-.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;
-}
-
-.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_color, 0.80);
-	background-image: linear-gradient(to bottom,
-		shade(@warning_color, 1.3),
-		@warning_color 75%,
-		shade(@warning_color, 0.90));
-}
-
-.level-bar.fill-block.empty-fill-block {
-	background-color: transparent;
-	background-image: none;
-	border-color: alpha(@theme_fg_color, 0.1);
-}
-
-/************
- * GtkScale *
- ************/
-
-.scale {
-	-GtkScale-slider-length: 16;
-	-GtkRange-slider-width: 16;
-	-GtkRange-trough-border: 0;
-}
-
-.scale.slider,
-.scale.slider:hover,
-.scale.slider:insensitive {
-	border-radius: 0;
-	border-style: none;
-
-	background-color: transparent;
-
-	/* background-image in -assets variant */
-}
-
-.scale.slider.fine-tune:active,
-.scale.slider.fine-tune:active:hover,
-.scale.slider.fine-tune.horizontal:active,
-.scale.slider.fine-tune.horizontal:active:hover {
-	background-size: 50%;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-.scale.trough {
-	margin: 6px 0;
-	border-radius: 6px;
-}
-
-.scale.trough.vertical {
-	margin: 0 6px;
-}
-
-.scale.trough,
-.scale.trough.highlight {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 1px;
-}
-
-.scale.trough.vertical,
-.scale.trough.highlight.vertical {
-	border-color: alpha(@theme_base_color, 0.0);
-	border-top: 0;
-	border-left: 0;
-	border-right: 1px;
-	border-bottom: 0;
-}
-
-.scale.trough,
-.scale.trough.vertical {
-	border-color: @borders;
-}
-
-.scale.trough.highlight,
-.scale.trough.highlight.vertical {
-	border-color: @scale_highlight_border;
-}
-
-.scale.trough:insensitive,
-.scale.trough.highlight:insensitive,
-.scale.trough.vertical:insensitive,
-.scale.trough.highlight.vertical:insensitive {
-	background-color: shade(@insensitive_bg_color, 0.96);
-	border-color: shade(@insensitive_scale_borders, 1.0);
-	box-shadow: none;
-	background-image: none;
-}
-
-.scale.trough.highlight,
-.scale.trough.vertical.highlight {
-	background-image: none;
-	background-color: @scale_highlight_bg;
-}
-
-.scale.progressbar {
-	background-color: @scale_progress_fill;
-}
-
-.scale.mark.separator {
-	/* defines the color of the actuall marks on the scale */
-	color: alpha(@theme_fg_color, 0.3);
-}
-
-.scale.trough {
-	box-shadow: inset 0 1px shade(@theme_bg_color, 0.85),
-		inset 0 -1px alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.vertical {
-	box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
-		inset -1px 0 alpha(@theme_base_color, 0.4);
-}
-
-.scale.trough.highlight {
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
-		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
-}
-
-.scale.trough.vertical.highlight {
-	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
-		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
-}
-
-/**********
- * Frames *
- **********/
-.frame {
-	border-width: 1px;
-	border-color: @borders;
-	border-style: solid;
-	padding: 0;
-}
-
-.frame.flat {
-	border-style: none; 
-}
-
-.frame.action-bar {
-	padding: 6px;
-	border-width: 1px 0 0; 
-}
-
-GtkScrolledWindow.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-/* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
-	border-style: none;
-}
-
-/***********
- * Buttons *
- ***********/
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
-	padding: 5px;
-}
-
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
-	padding: 5px;
-}
-
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
-
-	border-style: solid;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.button.default {
-	text-shadow: none;
-	color: @theme_selected_fg_color;
-}
-
-.button.flat {
-	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; 
-}
-
-/* We may want a background for focused buttons, but in the meantime let's remove it too */
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button *:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-/* Remove borders from primary toolbar buttons*/
-.primary-toolbar .button {
-	border-image: none;
-
-	/* setting border-style: none; here would override the border-width values 
-	 * we set in gtk-widget-borders.css to zero.
-	 */
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
-	color: @button_active_text;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.button:insensitive,
-.button:active *:insensitive,
-.button:checked *:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
-	icon-shadow: 0 1px @button_text_shadow;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
-	icon-shadow: 0 1px @button_active_text_shadow;
-	text-shadow: 0 1px @button_active_text_shadow;
-}
-
-.toolbar .button.raised:insensitive,
-.toolbar .raised .button:insensitive,
-.inline-toolbar .button:insensitive {
-	icon-shadow: none;
-	text-shadow: none;
-}
-
-/* linked entries/buttons */
-
-/* Set up shadows and hilights for button visual separation */
-.linked .entry {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .entry:focus {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-.linked .entry:focus:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
-
-}
-
-/* Set up shadows and hilights for button visual separation */
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
-	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
-	box-shadow: inset 1px 0 @inset_light_color;
-}
-
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-/* remove box shadow from last-child and only-child */
-.linked .button:insensitive:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
-	box-shadow: none; 
-}
-
-/* remove inset from first-child and only-child active buttons */
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
-	box-shadow: inset 0 1px 1px alpha(black, 0.1);
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:hover,
-.linked .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child {
-	border-right-width: 0;
-	border-left-width: 2px;
-	border-image-width: 3px 0 4px 4px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child {
-	border-right-width: 2px;
-	border-left-width: 0;
-	border-image-width: 3px 4px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 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:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 3px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	border-image-width: 0 4px;
-	border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-	border-bottom-width: 0;
-	border-image-width: 3px 4px 0 4px;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-	border-top-width: 0;
-	border-image-width: 0 4px 4px 4px;
-	border-radius: 0 0 4px 4px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-	border-top-width: 1px;
-	border-bottom-width: 1px;
-	border-image-width: 3px 4px 4px 4px;
-	border-radius: 4px;
-}
-
-/* Linked button shadows (vertical) */
-.linked.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button {
-	box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button {
-	box-shadow: inset 0 -1px @inset_light_color;
-}
-
-.linked.vertical .button:active,
-.linked.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked {
-	box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	box-shadow: inset 0 -1px @inset_dark_color;
-}
-
-.linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button {
-	box-shadow: none;
-}
-
-/* remove shadows from linked menu buttons */
-.linked GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised.linked:active,
-.toolbar .raised.linked GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkMenuButton.menu-button:active,
-.inline-toolbar.toolbar GtkToolButton > GtkMenuButton.menu-button:active {
-	box-shadow: none;
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:checked,
-.primary-toolbar .linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:checked:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 4px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:checked:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-	box-shadow: none;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:checked: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:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {
-	border-right-width: 2px;
-	border-left-width: 2px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-image-width: 3px 0 4px 0;
-	border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child {
-	border-left-width: 2px;
-	border-right-width: 0;
-	border-image-width: 3px 0 3px 3px;
-	border-bottom-right-radius: 0;
-	border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child {
-	border-left-width: 0;
-	border-right-width: 2px;
-	border-image-width: 3px 3px 4px 0;
-	border-bottom-left-radius: 0;
-	border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
-	border-bottom-width: 0;
-	border-top-width: 0;
-	border-image-width: 0 3px 0 3px;
-	border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:checked:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive {
-	border-width: 1px 1px 0 1px;
-	border-image-width: 3px 3px 0 3px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive {
-	border-width: 0 1px 2px 1px;
-	border-image-width: 0 3px 4px 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive {
-	border-top-width: 1px;
-	border-bottom-width: 2px;
-	border-image-width: 3px 3px 3px 4px;
-	border-radius: 3px;
-}
-
-*:link,
-*:visited {
-  color: @link_color;
-}
-
-GtkLinkButton.button,
-GtkLinkButton.button:active {
-	text-shadow: none;
-}
-
-.button .separator { 
-	color: shade(@internal_element_color, 1.30);
-}
-
-/* Stack switcher */
-.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel,
-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {
-	padding-left: 6px;
-	padding-right: 6px; 
-}
-.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage,
-.titlebar .stack-switcher > .button.titlebutton > GtkImage,
-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	padding-bottom: 3px; 
-}
-.stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
-}
-.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button,
-.titlebar .stack-switcher > .titlebutton.button,
-GtkCalendar.header .stack-switcher > .titlebutton.button {
-	padding: 5px 2px;
-}
-.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage {
-	animation: needs_attention 150ms ease-in;
-	background-color: @theme_bg_color; /* FIXME: ? */
-	background-size: 6px 6px, 6px 6px;
-	background-repeat: no-repeat;
-	background-position: right 3px, right 4px; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop {
-	background-size: 6px 6px, 0 0; 
-}
-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {
-	background-position: left 3px, left 4px; 
-}
-.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage {
-	animation: none;
-	background-image: none; 
-}
-
-/*****************
- * Notebooks and *
- * tabs		  *
- *****************/
-.notebook {
-	padding: 0;
-	border-style: solid;
-	border-color: @borders;
-	border-top: 0px;
-
-	background-color: shade (@theme_bg_color, 1.1);
-	-GtkNotebook-initial-gap: 0;
-	-GtkNotebook-arrow-spacing: 5;
-	-GtkNotebook-tab-curvature: 0;
-	-GtkNotebook-tab-overlap: 0;
-	-GtkNotebook-has-tab-gap: false;
-	-GtkWidget-focus-padding: 0;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.notebook GtkScrolledWindow {
-	background-color: @theme_base_color;
-}
-
-.notebook.frame {
-	border-width: 1px;
-}
-
-.notebook.header {
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	border-width: 0px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
-}
-
-.notebook.header.frame.top {
-	border-top: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.bottom {
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook.header.frame.left {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-left: 1px solid @borders;
-}
-
-.notebook.header.frame.right {
-	border-top: 1px solid @borders;
-	border-bottom: 1px solid @borders;
-	border-right: 1px solid @borders;
-}
-
-.notebook GtkViewport {
-	background-color: @theme_base_color;
-	border-width: 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: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: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.top:active {
-	border-bottom-color: @notebook_active_tab_border;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-	background-image: linear-gradient(to top,
-		shade(@theme_bg_color, 1.18),
-		shade(@theme_bg_color, 1.1));
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 1px 1px 1px;
-	box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-	background-image: linear-gradient(to top,
-		alpha(@theme_base_color, 0.0),
-		alpha(@theme_base_color, 0.3));
-	border-radius: 0;
-	box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-	border-style: none;
-}
-
-.notebook tab.bottom:active {
-	border-top-color: @notebook_active_tab_border;
-}
-
-/* vertical tabs */
-
-.notebook tab.left,
-.notebook tab.right {
-	padding: 5px 20px;
-}
-
-.notebook tab.left:hover,
-.notebook tab.left:active {
-	border-right-width: 2px;
-}
-
-.notebook tab.left:active {
-	border-right-color: @notebook_active_tab_border;
-}
-
-.notebook tab.right:hover,
-.notebook tab.right:active {
-	border-left-width: 2px;
-}
-
-.notebook tab.right:active {
-	border-left-color: @notebook_active_tab_border;
-}
-
-.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);
-}
-
-/**************
- * ComboBoxes *
- **************/
-GtkComboBox {
-	padding: 0;
-
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
-
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-GtkComboBox:insensitive {
-	text-shadow: none;
-	color: @insensitive_fg_color;
-}
-
-GtkComboBox .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 4px 0 4px 4px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 4px 4px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
-}
-
-GtkComboBox.combobox-entry .entry:focus:first-child {
-	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .entry:focus:last-child {
-	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
-		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
-}
-
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-GtkComboBox.combobox-entry .button:insensitive:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:insensitive:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
-}
-
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
-	color: @theme_text_color;
-}
-
-GtkComboBox .button {
-	color: @internal_element_color;
-}
-
-GtkComboBox .button:hover {
-	color: @theme_text_color;
-}
-
-/********************
- * Various choosers *
- ********************/
-
-GtkFontButton .separator,
-GtkFileChooserButton .separator {
-	/* always disable separators */
-	-GtkWidget-wide-separators: true;
-	-GtkWidget-horizontal-separator: 0;
-	-GtkWidget-vertical-separator: 0;
-}
-
-GtkFontButton GtkLabel:last-child {
-	color: mix(@theme_fg_color, @theme_bg_color, 0.35);
-}
-
-GtkFileChooserButton GtkImage:last-child {
-	color: @internal_element_color;
-}
-
-/**************
- * Scrollbars *
- **************/
-
-.scrollbar {
-	background-image: none;
-	border-style: solid;
-	-GtkRange-trough-border: 0;
-	-GtkScrollbar-has-backward-stepper: false;
-	-GtkScrollbar-has-forward-stepper: false;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
-
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;
-}
-
-.scrollbars-junction { /* the small square between scrollbars!!! */
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-	background-image: linear-gradient(to right,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-left-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
-}
-
-.scrollbar.trough.horizontal {
-	background-image: linear-gradient(to bottom,
-		@scrollbar_trough,
-		shade (@scrollbar_trough, 1.08));
-	border-top-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.94);
-	border-radius: 0;
-	border-image: none;
-}
-
-.scrollbar.button,
-.scrollbar.button:active,
-.scrollbar.button:active:hover,
-.scrollbar.button:insensitive {
-	border-style: none;
-	border-image: none;
-	border-radius: 0;
-	background-image: none;
-	background-color: transparent;
-}
-
-.scrollbar.button:active,
-.scrollbar.button:active:hover {
-	background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
-}
-
-.scrollbar.button.top:hover {
-	box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.bottom:hover {
-	box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.right:hover {
-	box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.scrollbar.button.left:hover {
-	box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8);
-}
-
-.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.vertical {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.95),
-		shade(@scrollbar_slider, 0.8));
-	border-radius: 20px;
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
-	background-image: linear-gradient(to bottom,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-.scrollbar.slider:insensitive {
-	background-color: shade(@scrollbar_slider, 0.85);
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.75);
-	border-width: 1px;
-}
-
-.scrollbar.slider.fine-tune:prelight:active {
-	background-image: linear-gradient(to right,
-		shade(@scrollbar_slider, 0.85),
-		shade(@scrollbar_slider, 0.7));
-	border-style: solid;
-	border-image: none;
-	border-color: shade(@scrollbar_slider, 0.65);
-	border-width: 1px;
-}
-
-/*********
- * Menus *
- *********/
-/* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @menu_bg_color;
-}
-
-GtkTreeMenu .menuitem {
-	padding: 2px;
-	border-style: none;
-}
-
-GtkTreeMenu .menuitem {
-	color: @theme_text_color;
-}
-
-GtkTreeMenu .menuitem,
-.button .menuitem,
-.toolbar .button .menuitem {
-	text-shadow: none;
-}
-
-.context-menu {
-	font: initial;
-	text-shadow: none;
-}
-
-.menu {
-	background-color: @menu_bg_color;
-	color: @menu_fg_color;
-	padding: 0;
-	border: 1px solid @borders;
-	margin: 4px;
-}
-
-.menu.button {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @internal_element_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:hover {
-	background-image: none;
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-
-	border-image: none;
-	border-style: none;
-}
-
-.menu.button:insensitive {
-	background-color: @theme_base_color;
-	color: lighter(@internal_element_color);
-
-	border-image: none;
-	border-style: none;
-}
-
-/* this controls the general appearance of the menubar */
-.menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
-}
-
-.menubar .menuitem {
-	border-style: none;
-	padding: 4px 6px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
-}
-
-.menubar .menuitem:hover {
-	color: @menu_fg_color;
-}
-
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.8;
-	padding: 4px;
-}
-
-.menu .menuitem:hover {
-	border-radius: 0;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	text-shadow: none;
-	border: none;
-}
-
-.menu .menuitem:insensitive {
-	background-color: transparent;
-}
-
-.menu .menuitem:active,
-.menu .menuitem:hover {
-	color: @theme_selected_fg_color;
-}
-
-.menu .menuitem *:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
-}
-
-.menu .menuitem .accelerator:insensitive {
-	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
-}
-
-.menuitem .accelerator {
-	color: alpha (@menu_fg_color, 0.4);
-}
-
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
-	color: alpha (@theme_selected_fg_color, 0.7);
-}
-
-GtkModelMenuItem GtkBox GtkImage {
-	padding-right: 6px;
-}
-
-.menuitem.arrow {
-	color: @menu_controls_color;
-}
-
-.menuitem.separator {
-	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0;
-}
-
-.menuitem.check {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.check:active, .menuitem.check:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.check:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.check:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.check:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-.menuitem.radio {
-	-gtk-icon-source: -gtk-icontheme("radio-symbolic");
-	color: @theme_fg_color;
-	icon-shadow: none; 
-}
-.menuitem.radio:active, .menuitem.radio:checked {
-	-gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); 
-}
-.menuitem.radio:inconsistent {
-	-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); 
-}
-.menuitem.radio:hover {
-	color: @theme_selected_fg_color;
-}
-.menuitem.radio:insensitive {
-	color: @insensitive_fg_color; 
-}
-
-/***************
- * Menu Button *
- ***************/
-.toolbar GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.raised:active,
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-/*	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-image: none;
-	border-color: @menu_bg_color;
-	border-radius: 4px 4px 0 0;
-	color: @theme_text_color;*/
-}
-
-GtkMenuButton.menu-button:active,
-.linked GtkMenuButton.menu-button:active,
-.toolbar .linked.raised GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button.linked.raised:active {
-	text-shadow: none;
-	icon-shadow: none;
-	box-shadow: none;
-}
-
-.linked GtkMenuButton.menu-button:active:last-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:last-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:last-child {
-	border-top-left-radius: 0;
-}
-
-.linked GtkMenuButton.menu-button:active:first-child,
-.toolbar .linked.raised GtkMenuButton.menu-button:active:first-child,
-.toolbar GtkMenuButton.menu-button.linked.raised:active:first-child {
-	border-top-right-radius: 0;
-}
-
-.button.menuitem.menubar:active {
-	background-image: none;
-	background-color: @menu_bg_color;
-
-	border-radius: 4px 4px 0 0;
-	border-image: none;
-	border-width: 1px 1px 0 1px;
-	border-color: @menu_bg_color;
-	border-style: solid;
-}
-
-.button.menuitem.menubar:active,
-GtkMenuButton.menu-button:active,
-.toolbar GtkMenuButton.menu-button:active {
-	color: @theme_text_color;
-}
-
-GtkMenuButton .menu {
-	text-shadow: none;
-}
-
-/****************
- * Radiobuttons *
- ****************/
-
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
-	background-color: transparent;
-	border-style: none;
-}
-
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus,
-GtkCheckButton:insensitive {
-	background-color: transparent;
-}
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-	padding: 1px 2px 4px;
-	outline-offset: 0; 
-}
-
-/************
- * Toolbars *
- ************/
-.toolbar {
-	border-style: none;
-	border-color: darker (@theme_bg_color);
-	padding: 6px;
-	background-color: @theme_bg_color;
-}
-
-.toolbar .button {
-	padding: 1px;
-}
-
-.toolbar .button.text-button {
-	padding: 4px 8px;
-}
-
-.toolbar .button.image-button {
-	padding: 5px 4px 4px 5px;
-}
-
-.toolbar:insensitive {
-	color: alpha (@theme_fg_color, 0.6);
-	background-color: @insensitive_bg_color;
-}
-
-/********************
- * Menubar Toolbars *
- ********************/
-.toolbar.menubar {
-	-GtkToolbar-button-relief: normal;
-	
-	padding: 6px 6px 5px 6px; /* weird padding to compensate border-images
-					and eventual top border presence, 
-					see selection mode toolbars */
-
-}
-
-/***************
- * Header bars *
- ***************/
-.titlebar, GtkCalendar.header,
-.header-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
-	background-color: @theme_bg_color;
-
-	padding: 6px;
-}
-
-.header-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.header-bar .button.image-button {
-	padding: 5px;
-}
-
-.titlebar .title, GtkCalendar.header .title,
-.header-bar .title {
-	font: Bold;
-	padding: 0px 12px;
-}
-
-.titlebar .subtitle, GtkCalendar.header .subtitle,
-.header-bar .subtitle {
-	font-size: smaller;
-	padding: 0px 12px;
-}
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-	border-width: 1px 0 0;
-	border-style: solid;
-	border-color: shade(@borders, 0.90);
-
-	box-shadow: inset 0 -1px shade(@borders, 1.30);
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.05),
-		shade(@theme_bg_color, 0.95));
-
-	padding: 6px 6px 5px 6px;
-}
-
-.action-bar .button.text-button {
-	padding: 4px 8px;
-}
-
-.action-bar .button.image-button {
-	padding: 5px 5px 4px 5px;
-}
-
-.action-bar .title {
-	font: Bold 10;
-	padding: 0px 12px 0px 12px;
-}
-
-.action-bar .subtitle {
-	font: 9;
-	padding: 0px 12px 0px 12px;
-}
-
-/***************
- * Dialog	  *
- ***************/
-
-.prompt,
-GtkMessageDialog {
-	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 0;
-	-GtkDialog-button-spacing: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:checked,
-.dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
-}
-
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
-}
-
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
-}
-
-.dialog-action-area.linked .button.suggested-action,
-.dialog-action-area.linked .button.suggested-action:active,
-.dialog-action-area.linked .button.suggested-action:checked,
-.dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
-}
-
-/***************
- * Search bars *
- ***************/
-
-.search-bar {
-	border-width: 0 0 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 0.96),
-		shade(@theme_bg_color, 1.0));
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.search-bar .button.close-button {
-	padding: 5px 4px 5px 5px;
-}
-
-/********************
- * 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 {
-	border-style: solid;
-	border-width: 0 0 1px 0;
-	border-color: alpha(@borders, 0.4);
-	-GtkWidget-window-dragging: true;
-	-GtkToolbar-button-relief: normal;
-	text-shadow: 0 1px @button_text_shadow;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4);
-}
-
-.primary-toolbar .toolbar .separator,
-.primary-toolbar.toolbar .separator {
-	-GtkWidget-window-dragging: true;
-}
-
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
-	background-image: none;
-	background-color: shade (@theme_bg_color, 0.97);
-
-	border-color: shade (@theme_bg_color, 0.91);
-	text-shadow: none;
-}
-
-/* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
-	background-image: linear-gradient(to bottom,
-		@trough_bg_color_a,
-		@trough_bg_color_b);
-	border-width: 1px;
-	border-radius: 2px;
-	border-style: solid;
-	border-color: shade(@internal_element_color, 1.10);
-	border-image: none;
-
-	color: @theme_text_color;
-}
-
-/*******************
- * Inline toolbars *
- *******************/
-
-.inline-toolbar.toolbar {
-	border-width: 1px;
-	border-style: solid;
-	border-color: @borders;
-
-	-GtkToolbar-button-relief: normal;
-	padding: 2px;
-}
-
-.inline-toolbar.toolbar:last-child {
-	border-top-width: 0;
-	border-radius: 0 0 3px 3px;
-}
-
-.inline-toolbar.toolbar.vertical:last-child {
-	border-left-width: 0;
-	border-radius: 0;
-}
-
-/***********
- * Sidebar *
- ***********/
-.sidebar,
-.sidebar .view,
-.sidebar GtkScrolledWindow {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .frame {
-	border-style: none;
-}
-
-.sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.95);
-}
-
-.sidebar .scrollbar.trough {
-	box-shadow: none;
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: @sidebar_scrollbar_trough;
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
-}
-
-.sidebar .scrollbar.slider:hover:active {
-	background-color: @theme_base_color;
-}
-
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
-	background-image: none;
-	background-color: transparent;
-}
-
-/*******
- * OSD *
- *******/
-.background.osd {
-	color: @osd_fg;
-	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:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
-	border-width: 1px;
-	border-style: solid;
-	border-image: none;
-	border-radius: 5px;
-}
-
-.osd .button {
-	border-color: @osd_button_border;
-}
-.osd .button:insensitive {
-	border-color: alpha(@osd_button_border,0.5);
-}
-
-.osd .button:active,
-.osd .button:checked {
-	border-color: @osd_button_border_active;
-}
-
-.osd.button,
-.osd .button {
-	padding: 4px;
-
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_a,
-		@osd_button_bg_b 68%,
-		@osd_button_bg_c
-		);
-
-	color: @osd_button_fg;
-
-	text-shadow: 0 -1px @osd_button_shadow;
-	icon-shadow: 0 -1px @osd_button_shadow;
-}
-
-.osd.button {
-	padding: 8px;
-}
-
-.osd.button,
-.osd.button:active,
-.osd.button:checked {
-	border-color: transparent;
-}
-
-.osd.button,
-.osd.button:prelight,
-.osd.button:active,
-.osd.button:checked {
-	background-color: shade(@osd_bg, 1.10);
-}
-
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
-	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,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
-	background-image: none;
-	background-color: @osd_button_bg_insensitive_active;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	color: @osd_button_fg_hover;
-}
-
-.osd.button:active,
-.osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
-.osd.button:checked,
-.osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
-	color: @osd_button_fg_active;
-}
-
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
-	color: @osd_button_fg_insensitive;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-.osd.button:hover,
-.osd .button:hover {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_hover_a,
-		@osd_button_bg_hover_b 68%,
-		@osd_button_bg_hover_c
-		);
-}
-
-.osd.button:active,
-.osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
-.osd GtkMenuButton.menu-button:active,
-.osd.button:checked,
-.osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
-.osd GtkMenuButton.menu-button:checked {
-	background-image: linear-gradient(to bottom,
-		@osd_button_bg_active_a,
-		@osd_button_bg_active_b 20%,
-		@osd_button_bg_active_c
-		);
-}
-
-.osd GtkMenuButton.menu-button:active {
-	background-color: transparent;
-	border-color: @osd_button_border;
-}
-
-.osd GtkMenuButton.menu-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 bottom,
-		@osd_toolbar_bg_a,
-		@osd_toolbar_bg_b 63%,
-		@osd_toolbar_bg_c
-		);
-	background-color: transparent;
-
-	-GtkToolbar-button-relief: normal;
-}
-
-.osd.toolbar .button {
-	padding: 4px;
-	border-width: 1px 0;
-	border-radius: 0;
-	box-shadow: inset -1px 0 @osd_button_inset;
-}
-
-.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 */
-.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;
-	/* this defines the bg color of the played segment */
-	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;
-}
-
-/****************************
- * Suggested action buttons *
- ****************************/
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_a,
-		@suggested_action_button_b);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button:hover,
-.suggested-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@suggested_action_button_a, 1.10),
-		shade(@suggested_action_button_b, 1.05));
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@suggested_action_button_b,
-		@suggested_action_button_a);
-
-	color: @suggested_action_button_fg;
-}
-
-.toolbar .suggested-action.button,
-.suggested-action.button {
-	text-shadow: 0 1px @suggested_action_button_shadow;
-	icon-shadow: 0 1px @suggested_action_button_shadow;
-}
-
-.toolbar .suggested-action.button:active,
-.toolbar .suggested-action.button:hover:active,
-.suggested-action.button:active,
-.suggested-action.button:hover:active,
-.toolbar .suggested-action.button:checked,
-.toolbar .suggested-action.button:hover:checked,
-.suggested-action.button:checked,
-.suggested-action.button:hover:checked {
-	text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15);
-}
-
-
-.suggested-action.button:insensitive,
-.suggested-action.button:active *:insensitive,
-.suggested-action.button:checked *:insensitive {
-	icon-shadow: none;
-	background-image: none;
-	background-color: @insentitive_bg_color;
-	/*border: 1px solid @insensitive_borders;*/
-}
-
-.suggested-action.button GtkLabel:insensitive {
-	color: @insensitive_fg_color;
-	text-shadow: none;
-}
-
-/******************************
- * Destructive action buttons *
- ******************************/
-.destructive-action.button {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_a,
-		@destructive_action_button_b);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@destructive_action_button_a, 1.10),
-		shade(@destructive_action_button_b, 1.05));
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		@destructive_action_button_b,
-		@destructive_action_button_a);
-
-	color: @destructive_action_button_fg;
-}
-
-.destructive-action.button {
-	text-shadow: 0 1px @destructive_action_button_shadow;
-	icon-shadow: 0 1px @destructive_action_button_shadow;
-}
-
-.destructive-action.button:active,
-.destructive-action.button:hover:active,
-.destructive-action.button:checked,
-.destructive-action.button:hover:checked {
-	text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-	icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15);
-}
-
-/**************************
- * Selection Mode classes *
- **************************/
-.selection-mode.header-bar,
-.selection-mode.toolbar {
-	color: @selection_toolbar_fg;
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_bg_a,
-		@selection_toolbar_bg_b);
-	background-color: transparent;
-
-	border-color: @borders;
-	border-style: solid;
-	border-image: none;
-
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar {
-	border-top-color: @selection_toolbar_bg_a;
-	border-bottom-color: @selection_toolbar_border;
-
-	box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
-}
-
-.selection-mode.toolbar {
-	padding: 6px;
-}
-
-/* regular button */
-.selection-mode.header-bar .button,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar GtkToolButton .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_button_a,
-		@selection_toolbar_button_b);
-
-	border-image: none;
-	border-color: @selection_toolbar_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 1px alpha(white, 0.1);
-
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button:hover,
-.selection-mode.toolbar .button:hover,
-.selection-mode.toolbar GtkToolButton .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_a, 1.05),
-		shade(@selection_toolbar_button_b, 1.02));
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:hover:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:hover:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:hover:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.header-bar .button:hover:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar .button:hover:checked,
-.selection-mode.toolbar GtkToolButton .button:checked,
-.selection-mode.toolbar GtkToolButton .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_button_b, 0.95),
-		shade(@selection_toolbar_button_a, 0.88));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .button:active,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	color: @selection_toolbar_button_fg;
-}
-
-.selection-mode.header-bar .button,
-.selection-mode.header-bar .button:active,
-.selection-mode.header-bar .button:checked,
-.selection-mode.toolbar .button,
-.selection-mode.toolbar .button:active,
-.selection-mode.toolbar .button:checked,
-.selection-mode.toolbar GtkToolButton .button,
-.selection-mode.toolbar GtkToolButton .button:active,
-.selection-mode.toolbar GtkToolButton .button:checked {
-	text-shadow: 0 1px @selection_toolbar_button_shadow;
-	icon-shadow: 0 1px @selection_toolbar_button_shadow;
-}
-
-/* suggested button */
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
-	background-image: linear-gradient(to bottom,
-		@selection_toolbar_suggested_button_a,
-		@selection_toolbar_suggested_button_b 40%,
-		@selection_toolbar_suggested_button_c);
-
-	border-image: none;
-	border-color: @selection_toolbar_suggested_button_border;
-	border-width: 1px;
-
-	box-shadow: inset 0 2px alpha(@selection_toolbar_suggested_button_b, 0.2),
-		inset 0 1px @selection_toolbar_suggested_button_a;
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button:hover,
-.selection-mode.toolbar .suggested-action.button:hover,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_a, 1.15),
-		shade(@selection_toolbar_suggested_button_b, 1.15) 40%,
-		@selection_toolbar_suggested_button_c);
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:hover:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:hover:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.header-bar .suggested-action.button:hover:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:hover:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked {
-	background-image: linear-gradient(to bottom,
-		shade(@selection_toolbar_suggested_button_c, 0.92),
-		@selection_toolbar_suggested_button_b 40%,
-		shade(@selection_toolbar_suggested_button_a, 0.92));
-	box-shadow: none;
-}
-
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	color: @theme_text_color;
-}
-
-.selection-mode.header-bar .suggested-action.button,
-.selection-mode.header-bar .suggested-action.button:active,
-.selection-mode.header-bar .suggested-action.button:checked,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar .suggested-action.button:active,
-.selection-mode.toolbar .suggested-action.button:checked,
-.selection-mode.toolbar GtkToolButton.suggested-action .button,
-.selection-mode.toolbar GtkToolButton.suggested-action:active,
-.selection-mode.toolbar GtkToolButton.suggested-action:checked {
-	text-shadow: 0 1px @button_text_shadow;
-	icon-shadow: 0 1px @button_text_shadow;
-}
-
-/* menu button */
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	background-image: none;
-	border-image: none;
-	border-color: transparent;
-	border: 0px;
-	box-shadow: none;
-
-	color: @selection_menu_fg;
-}
-
-.selection-mode.toolbar .dim-label,
-.selection-mode.toolbar .selection-menu.button .dim-label {
-	color: @selection_menu_fg;
-}
-
-.selection-mode.header-bar .selection-menu.button:hover,
-.selection-mode.toolbar .dim-label:hover,
-.selection-mode.toolbar .selection-menu.button:hover,
-.selection-mode.toolbar .selection-menu.button .dim-label:hover {
-	background-color: transparent;
-	color: @selection_menu_hover;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	border-color: transparent;
-	border-radius: 3px;
-	border-width: 1px;
-
-	background-color: transparent;
-}
-
-.selection-mode.header-bar .selection-menu.button:active,
-.selection-mode.toolbar .selection-menu.button:active,
-.selection-mode.header-bar .selection-menu.button:checked,
-.selection-mode.toolbar .selection-menu.button:checked {
-	color: @selection_menu_active;
-}
-
-.selection-mode.header-bar .selection-menu.button,
-.selection-mode.toolbar .selection-menu.button {
-	text-shadow: 0 1px @selection_toolbar_shadow;
-}
-
-.selection-mode.header-bar .selection-menu.button .menuitem,
-.selection-mode.toolbar .selection-menu.button .menuitem {
-	text-shadow: none;
-}
-
-/****************
- * GtkAssistant *
- ****************/
-GtkAssistant .sidebar .highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font: bold;
-}
-
-GtkAssistant .sidebar {
-	padding: 12px 18px 12px;
-
-	border-width: 0 1px 0 0;
-	border-radius: 0px;
-	border-style: solid;
-	border-color: @inactive_frame_color;
-
-	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-
-	background-color: shade (@theme_bg_color, 0.97);
-	/* shall we make it like sidebars in general? */
-
-}
-
-/*************
- * GtkSwitch *
- *************/
-
-GtkSwitch {
-	border-radius: 8px;
-	padding: 2px;
-	background-color: transparent;
-}
-
-GtkSwitch.trough,
-GtkSwitch.trough:insensitive {
-	border: none;
-	border-image: none;
-	color: transparent;
-	box-shadow: none;
-	background-color: transparent;
-	background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */
-	background-position: center center;
-	background-repeat: no-repeat;
-	text-shadow: none;
-}
-
-GtkSwitch.slider {
-	background-color: transparent;
-	border: none;
-	border-image: none;
-}
-
-/************
- * Pathbars *
- ************/
-.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton,
-.path-bar .titlebar .button.titlebutton,
-.titlebar .path-bar .button.titlebutton,
-.path-bar GtkCalendar.header .button.titlebutton,
-GtkCalendar.header .path-bar .button.titlebutton {
-	padding: 5px 6px 6px;
-}
-.path-bar .button:first-child {
-	padding-left: 8px;
-}
-.path-bar .button:last-child {
-	padding-right: 8px;
-}
-.path-bar .button:only-child {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-.path-bar .button .label:last-child {
-	padding-left: 2px;
-}
-.path-bar .button .label:first-child {
-	padding-right: 2px;
-}
-.path-bar .button .label:only-child {
-	padding-right: 0;
-	padding-left: 0;
-}
-.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage,
-.path-bar .titlebar .button.titlebutton GtkImage,
-.titlebar .path-bar .button.titlebutton GtkImage,
-.path-bar GtkCalendar.header .button.titlebutton GtkImage,
-GtkCalendar.header .path-bar .button.titlebutton GtkImage {
-	padding-top: 1px;
-}
-
-/***********************
- * Tree and Icon views *
- ***********************/
-GtkTreeView {
-	-GtkTreeView-vertical-separator: 0;
-
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
-
-	outline-color: alpha(@theme_text_color, 0.6);
-}
-
-GtkTreeView.dnd {
-	border-color: @internal_element_color;
-	border-radius: 2px;
-	border-width: 1px;
-	border-style: solid;
-}
-
-GtkTreeView:selected:focus {
-	outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30);
-}
-
-GtkIconView.cell:selected,
-GtkIconView.cell:selected:focus {
-	border-radius: 4px;
-
-	/* FIXME: this probably needs to be better;
-	 * see https://bugzilla.gnome.org/show_bug.cgi?id=644157
-	 */
-	outline-color: @treeview_focus_border;
-	outline-style: solid;
-	outline-offset: 3px;
-}
-
-.view {
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-}
-
-.view:insensitive {
-	background-color: @insensitive_bg_color;
-	color: @insensitive_fg_color;
-}
-
-.view:selected {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.view:selected:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-.cell {
-	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
-	padding: 2px;
-	text-shadow: none;
-}
-
-.cell:selected,
-.cell:selected:focus {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-}
-
-.cell:selected:backdrop,
-.cell:selected:focus:backdrop {
-	background-color: shade(@theme_unfocused_bg_color, 0.94);
-	color: @theme_fg_color;
-}
-
-row:selected,
-row:selected:focus {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-}
-
-row:selected:backdrop,
-row:selected:focus:backdrop {
-	border-width: 1px 0 1px 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.85));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-GtkTreeView row:nth-child(even),
-GtkTreeView row:nth-child(odd) {
-	background-color: shade (@theme_base_color, 1.0);
-	box-shadow: inset 0 -1px 0 0 alpha (@theme_bg_color, 0.4);
-}
-
-GtkTreeView row:nth-child(odd):hover,
-GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
-}
-
-GtkTreeView row:nth-child(odd):backdrop:hover,
-GtkTreeView row:nth-child(even):backdrop:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-.sidebar GtkTreeView row:backdrop:selected {
-	background-color: @theme_selected_bg_color;
-	border-style: solid;
-	border-width: 1px 0 1px 0;
-	border-top-color: @borders;
-	border-bottom-color: shade (@theme_base_color, 0.96);
-	box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders;
-}
-
-.sidebar GtkTreeView row:hover {
-	background-color: shade (@theme_base_color, 0.96);
-}
-
-column-header.button,
-column-header .button {
-	color: @theme_fg_color;
-}
-
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover {
-	padding: 0 4px;
-	text-shadow: none;
-	icon-shadow: none;
-}
-
-column-header.button:insensitive,
-column-header .button:insensitive {
-	background-color: @insensitive_bg_color;
-}
-
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover {
-	color: @theme_fg_color;
-	text-shadow: none;
-	icon-shadow: none;
-	border-radius: 0;
-}
-
-column-header .button.dnd {
-	background-color: transparent;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_base_color, 0.97),
-		@theme_base_color);
-	border-width: 0 1px;
-	border-image-slice: 0 1;
-}
-
-/*************
- * 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:checked {
-	-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:checked {
-	-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 {
-	color: @expander_row_selected_color;
-	border-color: @expander_row_selected_color;
-	border-width: 0;
-	background-color: transparent;
-	background-image: none;
-	border-image: none;
-	box-shadow: none;
-}
-
-.expander row:selected:hover,
-.expander row:selected:focus:hover {
-	color: @theme_selected_fg_color;
-	border-color: @theme_selected_fg_color;
-}
-
-/**************
- * List boxes *
- **************/
-
-.list {
-	background-color: @list_box_bg;
-}
-
-.list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
-}
-
-.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-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;
-}
-
-/**************
- * Calendar   *
- **************/
-
-GtkCalendar {
-	padding: 2px;
-}
-
-GtkCalendar.view {
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	padding: 2px;
-}
-
-GtkCalendar.header {
-	border-radius: 0;
-	background-image: linear-gradient(to bottom,
-		shade(@theme_bg_color, 1.04),
-		shade(@theme_bg_color, 0.89));
-	border-width: 0;
-}
-
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
-	background-image: none;
-	background-color: transparent;
-}
-
-.highlight,
-GtkCalendar.highlight {
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
-}
-
-/**************
- * GtkInfoBar *
- **************/
-GtkInfoBar {
-	border-width: 0;
-	border-style: none;
-}
-
-.info,
-.question,
-.warning,
-.error {
-	background-color: @infobar_bg_color;
-	color: @infobar_fg_color;
-	text-shadow: none;
-	border-color: darker(@infobar_bg_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,
-.info .button:checked,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:checked,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:checked,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:checked {
-	color: @theme_fg_color;
-	border-color: darker(@infobar_bg_color);
-	border-style: solid;
-	border-width: 1px;
-}
-
-/**************
- * Dim labels *
- **************/
-.view.dim-label,
-.dim-label {
-	color: alpha(currentColor, 0.55);
-	text-shadow: none;
-}
-
-/*************************
- * Popovers *
- *************************/
-.popover {
-	background-clip: initial;
-	margin: 10px;
-	padding: 2px;
-	border-color: @borders;
-	border-width: 1px;
-	border-style: solid;
-	border-radius: 3px;
-	background-color: @theme_bg_color;
-	box-shadow: 0 1px 5px @wm_shadow;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-.popover > .list, 
-.popover > .view, 
-.popover > .toolbar .popover.osd > .toolbar, 
-.popover > .inline-toolbar .popover.osd > .toolbar, 
-.popover > .search-bar .popover.osd > .toolbar, 
-.popover > .location-bar .popover.osd > .toolbar,
-.popover > .toolbar .popover.osd > .inline-toolbar, 
-.popover > .inline-toolbar .popover.osd > .inline-toolbar, 
-.popover > .search-bar .popover.osd > .inline-toolbar, 
-.popover > .location-bar .popover.osd > .inline-toolbar,
-.popover > .toolbar .popover.osd > .search-bar, 
-.popover > .inline-toolbar .popover.osd > .search-bar, 
-.popover > .search-bar .popover.osd > .search-bar,
-.popover > .location-bar .popover.osd > .search-bar,
-.popover > .toolbar .popover.osd > .location-bar,
-.popover > .inline-toolbar .popover.osd > .location-bar, 
-.popover > .search-bar .popover.osd > .location-bar, 
-.popover > .location-bar .popover.osd > .location-bar {
-	border-style: none;
-	background-color: transparent;
-}
-
-.popover .separator {
-	font-size: 80%;
-	font-weight: bold;
-	color: alpha(@theme_fg_color,0.1);
-	text-shadow: none;
-	background-color: transparent;
-	icon-shadow: none;
-	border: 0;
-}
-.popover.osd {
-	background-image: none;
-	background-color: alpha(shade(#3D3E40, 0.85), 0.75);
-	border: 1px solid black;
-	box-shadow: none;
-	color: @theme_selected_fg_color;
-}
-.popover.osd .toolbar {
-	background-image: none;
-	background-color: transparent;
-	border: none;
-	box-shadow: none;
-}
-.popover.osd .button {
-	text-shadow: 0 -1px @osd_text_shadow;
-	icon-shadow: 0 -1px @osd_text_shadow;
-}
-.popover.osd .button:active,
-.popover.osd .button:checked {
-        box-shadow: none;
-}
-.popover.osd .button:insensitive {
-	color: alpha(@theme_selected_fg_color, 0.4);
-}
-
-.popover .list {
-	background-color: @theme_base_color;
-}
-
-GtkModelButton.button {
-	color: @theme_fg_color;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
-	background-image: none;
-	border-color: transparent;
-	border-image: none;
-	border-style: none;
-	box-shadow: none;
-	border-radius: 0;
-}
-
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
-	background-image: none;
-	background-color: @theme_selected_bg_color;
-	color: @theme_selected_fg_color;
-	text-shadow: none;
-	border-width: 0;
-	border-color: transparent;
-	border-radius: 0;
-}
-
-.entry.cursor-handle,
-.cursor-handle {
-	background-color: transparent;
-	background-image: none;
-	box-shadow: none;
-	border-style: none;
-}
-.entry.cursor-handle.top,
-.cursor-handle.top {
-	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
-}
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
-	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
-}
-
-/*******
- * CSD *
- *******/
-.titlebar {
-	text-shadow: 0 1px @wm_title_shadow;
-
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-radius: 6px 6px 0px 0px;
-	box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
-	border-color: @borders;
-}
-
-.tiled .titlebar {
-	border-radius: 0;
-}
-
-.maximized .titlebar {
-	border-radius: 0;
-}
-
-/* this is the default titlebar that is added by GTK
- * when client-side decorations are in use and the application
- * did not set a custom titlebar.
- */
-.titlebar.default-decoration {
-	border: none;
-	box-shadow: none;
-}
-
-.titlebar .title {
-	font: Bold 10;
-}
-
-.titlebar:backdrop {
-	color: @theme_unfocused_fg_color;
-}
-
-.titlebar .titlebutton {
-	color: @wm_title;
-	padding: 2px 6px 3px 3px;
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:hover {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:active {
-	border: none;
-	border-image: none;
-}
-
-.titlebar .titlebutton:backdrop {
-	color: @wm_unfocused_title;
-	icon-shadow: none;
-}
-
-.window-frame {
-	border-radius: 6px 6px 0 0;
-	border-width: 0px;	
-	box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
-
-	/* this is used for the resize cursor area */
-	margin: 10px;
-}
-
-.window-frame.tiled {
-	border-radius: 0;
-	background-color: @theme_bg_color;
-}
-
-.window-frame:backdrop {
-	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
-}
-
-/* Various hacks and shit */
-/* FIXME - BELOW: Some stuff that can probably be done better or in another way */
-
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
-}
-
-.gedit-search-slider * {
-	color: @theme_fg_color;
-}
-
-.gedit-document-panel {
-	background-color: @theme_bg_color;
-}
-
-/* Floating Bar */
-.floating-bar {
-	background-image: linear-gradient(to bottom, 
-		@theme_base_color 20%, 
-		shade(@theme_base_color, 0.9));
-	background-color: @theme_base_color;
-	border-color: @borders;
-
-	color: @theme_text_color;
-	text-shadow: 0 1px @button_text_shadow;
-
-	border-radius: 0px;
-	border-width: 1px;
-	border-style: solid;
-	box-shadow: inset 1px 1px @inset_light_color, -1px -1px @inset_light_color;
-}
-
-.floating-bar.top {
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-	border-right-width: 0;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-	border-bottom-width: 0;
-	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-	border-left-width: 0;
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
-
-.floating-bar.bottom.right {
-	box-shadow: inset 1px 1px @inset_light_color;
-}
-
-.floating-bar.bottom.left {
-	box-shadow: inset -1px 1px @inset_light_color;
-}
-
-.floating-bar .button {
-	background-color: alpha (@theme_base_color, 0.0);
-	background-image: none;
-
-	border-style: none;
-	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
-}
-
-/* Nautilus desktop */
-.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;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
-}
diff --git a/Zukitwo-Wise/gtk-3.0/gtk.css b/Zukitwo-Wise/gtk-3.0/gtk.css
deleted file mode 100644
index 83706a2..0000000
--- a/Zukitwo-Wise/gtk-3.0/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("gtk-main.css");
diff --git a/Zukitwo-Wise/gtk-3.0/other-applications.css b/Zukitwo-Wise/gtk-3.0/other-applications.css
deleted file mode 100644
index 4a557a4..0000000
--- a/Zukitwo-Wise/gtk-3.0/other-applications.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************
- * NEMO File manager *
- *********************/
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-
-/* For Places Sidebar diskfull indicators */
-
-NemoPlacesTreeView {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-NemoPlacesTreeView-disk-full-bar-width: 2px;
-	-NemoPlacesTreeView-disk-full-bar-radius: 1px;
-	-NemoPlacesTreeView-disk-full-bottom-padding: 1px;
-	-NemoPlacesTreeView-disk-full-max-length: 70px;
-}
-
-NemoPlacesTreeView:selected {
-	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-NemoPlacesTreeView:hover {
-}
-
-NemoPlacesTreeView:selected:hover {
-}
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
-	background-color: @theme_base_color;
-}
-
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* sidebar */
-
-NemoWindow .sidebar .view {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
-}
-
-NemoWindow .sidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
-}
-
-NemoWindow .sidebar row:selected {
-	color: @theme_selected_fg_color;
-}
-
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
-}
-
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
-}
-
-/* desktop mode */
-.nemo-desktop.nemo-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-.nemo-desktop.nemo-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
-}
-
-.nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
-.nemo-desktop.nemo-canvas-item:selected {
-	text-shadow: none;
-}
-
-/* inactive pane */
-
-.nemo-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
-}
-
-/* Toolbar */
-NemoWindow .toolbar .button {
-	border-image: none;
-}
-
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
-}
-
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
-
-.nemo-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
-}
-
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
-}
-
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
-/*****************
- * Ubuntu styles *
- *****************/
-/* overlay scrollbar */
-OsThumb {
-	color: shade (@theme_fg_color, 1.6);
-}
-
-OsThumb:selected,
-OsScrollbar:selected {
-	background-color: @theme_selected_bg_color;
-}
-
-OsThumb:active,
-OsScrollbar:active {
-	background-color: shade (@theme_bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-OsScrollbar:insensitive {
-	background-color: shade (@theme_bg_color, 0.85);
-}
-
-/* scrolled window */
-.ubuntu-online-accounts.frame {
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
-	border-radius: 2px;
-	padding: 0;
-}
-
-.ubuntu-online-accounts.frame {
-	border-top-width: 0;
-}
-
-/****************
- * Mate-Panel *
- ****************/
-
-/* the panel bar itself */
-.mate-panel-menu-bar,
-MatePanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelAppletFrame,
-MatePanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-	text-shadow: none;
-}
-
-MatePanelApplet {
-	border-width: 0;
-}
-
-PanelSeparator {
-	border-width: 0;
-	background-image: none;
-	background-color: transparent;
-	color: transparent;
-	text-shadow: none;
-}
-
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button {
-	background-image: none;
-	background-color: @os_chrome_bg_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		@theme_selected_bg_color);
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		alpha (@theme_base_color, 0.1),
-		alpha (@theme_base_color, 0.1));
-	background-color: @theme_base_color;
-	color: @os_chrome_fg_color;
-
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
diff --git a/Zukitwo-Wise/gtk-3.0/settings.ini b/Zukitwo-Wise/gtk-3.0/settings.ini
deleted file mode 100644
index 9aa01e5..0000000
--- a/Zukitwo-Wise/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-gtk-auto-mnemonics = 1
-gtk-visible-focus = automatic
diff --git a/Zukitwo-Wise/gtk-3.0/unity.css b/Zukitwo-Wise/gtk-3.0/unity.css
deleted file mode 100644
index b038d99..0000000
--- a/Zukitwo-Wise/gtk-3.0/unity.css
+++ /dev/null
@@ -1,67 +0,0 @@
-UnityPanelWidget,
-.unity-panel {
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	border-width: 0;
-	color: @theme_fg_color;
-}
-
-.unity-panel.menubar,
-.unity-panel .menubar {
-	color: @theme_fg_color;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menuitem,
-.unity-panel .menuitem {
-	border-width: 1px 1px 0 1px;
-	text-shadow: 0 1px @button_text_shadow;
-}
-
-.unity-panel.menubar.menuitem:hover,
-.unity-panel.menubar .menuitem *:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.96),
-		shade (@theme_selected_bg_color, 1.15));
-	color: @theme_selected_fg_color;
-}
-
-/* This will theme the top decoration, so the whole space above the window */
-UnityDecoration.top {
-	border: 0px solid shade (@theme_bg_color, 0.5);
-	border-bottom-width: 0;
-	border-radius: 6px 6px 0 0; /* Corner radius, only the top ones should be */
-	padding: 1px 8px 0 8px; /* This padding will be applied to the content of the top layout */
-	background-color: @theme_bg_color; /* Decoration background */
-	background-image: linear-gradient(to bottom,
-		@wm_bg_a,
-		@wm_bg_b);
-	color: @theme_fg_color; /* The foreground color will be used to paint the text */
-	text-shadow: 0 1px @wm_title_shadow;
-	box-shadow: inset 0 1px alpha(@theme_base_color, 0.6);
-}
-
-/* Top decoration for inactive windows */
-UnityDecoration.top:backdrop {
-	border: 0px solid @theme_bg_color;
-	border-bottom-width: 0;
-	background-color: @theme_bg_color;
-	color: @theme_unfocused_fg_color;
-}
-
-/* Left decoration, it themes only the space at the left of the window */
-UnityDecoration.left,
-/* Right decoration, it themes only the space at the right of the window */
-UnityDecoration.right,
-/* Bottom decoration, it themes all the space below the window */
-UnityDecoration.bottom {
-	background-color: @theme_bg_color;
-}
-
-/* Left, right and bottom decorations themes for inactive windows */
-UnityDecoration.left:backdrop,
-UnityDecoration.right:backdrop,
-UnityDecoration.bottom:backdrop {
-	background-color: @theme_bg_color;
-}
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls.css b/Zukitwo-Wise/gtk-3.0/window-controls.css
deleted file mode 100644
index 0549334..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls.css
+++ /dev/null
@@ -1,147 +0,0 @@
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	color: transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: 19px 19px;
-}
-
-/* Set correct layout with 
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
- 	buttons on the right or
-	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
-	for buttons on the left */
-
-/* minimize */
-
-.titlebar .right .titlebutton:nth-last-child(3),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
-.titlebar .left .titlebutton:nth-child(3),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
-	background-image: url('window-controls/minimize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
-.titlebar .left .titlebutton:nth-child(3):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
-	background-image: url('window-controls/minimize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
-.titlebar .left .titlebutton:nth-child(3):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active {
-	background-image: url('window-controls/minimize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
-.titlebar .left .titlebutton:nth-child(3):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
-	background-image: url('window-controls/minimize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
-	background-image: url('window-controls/minimize_unfocused_prelight.png');
-}
-
-/* maximize */
-.titlebar .right .titlebutton:nth-last-child(2),
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
-.titlebar .left .titlebutton:nth-child(2),
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
-	background-image: url('window-controls/maximize_focused_normal.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
-.titlebar .left .titlebutton:nth-child(2):hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
-	background-image: url('window-controls/maximize_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):active,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
-.titlebar .left .titlebutton:nth-child(2):active,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active {
-	background-image: url('window-controls/maximize_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
-.titlebar .left .titlebutton:nth-child(2):backdrop,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
-	background-image: url('window-controls/maximize_unfocused.png');
-}
-
-.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
-	background-image: url('window-controls/maximize_unfocused_prelight.png');
-}
-
-/* close */
-.titlebar .right .titlebutton:last-child,
-.titlebar .right:dir(rtl) .titlebutton:first-child,
-.titlebar .left .titlebutton:first-child,
-.titlebar .left:dir(rtl) .titlebutton:last-child {
-	background-image: url('window-controls/close_focused_normal.png');
-	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
-}
-
-.titlebar .right .titlebutton:last-child:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
-.titlebar .left .titlebutton:first-child:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
-	background-image: url('window-controls/close_focused_prelight.png');
-}
-
-.titlebar .right .titlebutton:last-child:active,
-.titlebar .right:dir(rtl) .titlebutton:first-child:active,
-.titlebar .left .titlebutton:first-child:active,
-.titlebar .left:dir(rtl) .titlebutton:last-child:active {
-	background-image: url('window-controls/close_focused_pressed.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
-.titlebar .left .titlebutton:first-child:backdrop,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
-	background-image: url('window-controls/close_unfocused.png');
-}
-
-.titlebar .right .titlebutton:last-child:backdrop:hover,
-.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
-.titlebar .left .titlebutton:first-child:backdrop:hover,
-.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
-	background-image: url('window-controls/close_unfocused_prelight.png');
-}
-
-/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
-
-.titlebar .button.menu-button.titlebutton {
-	background-image: url('window-controls/menu.png');
-}
-
-.titlebar .button.menu-button.titlebutton:hover {
-	background-image: url('window-controls/menu_prelight.png');
-}
-
-.titlebar .button.menu-button.titlebutton:active {
-	background-image: url('window-controls/menu.png');
-}
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_normal.png b/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_pressed.png b/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/close_unfocused.png b/Zukitwo-Wise/gtk-3.0/window-controls/close_unfocused.png
deleted file mode 100644
index 8f35ba3..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/close_unfocused_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/close_unfocused_prelight.png
deleted file mode 100644
index e6afbd6..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_normal.png b/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_pressed.png b/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_unfocused.png b/Zukitwo-Wise/gtk-3.0/window-controls/maximize_unfocused.png
deleted file mode 100644
index c734f5e..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_unfocused_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/maximize_unfocused_prelight.png
deleted file mode 100644
index 598af3f..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/menu.png b/Zukitwo-Wise/gtk-3.0/window-controls/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/menu.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/menu_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_normal.png b/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_pressed.png b/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_unfocused.png b/Zukitwo-Wise/gtk-3.0/window-controls/minimize_unfocused.png
deleted file mode 100644
index 701996c..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_unfocused_prelight.png b/Zukitwo-Wise/gtk-3.0/window-controls/minimize_unfocused_prelight.png
deleted file mode 100644
index 2f93af0..0000000
--- a/Zukitwo-Wise/gtk-3.0/window-controls/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/index.theme b/Zukitwo-Wise/index.theme
deleted file mode 100644
index 082ee6c..0000000
--- a/Zukitwo-Wise/index.theme
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=X-GNOME-Metatheme
-Name=Zukitwo-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise
-Comment=A simple grey theme
-Encoding=UTF-8
-
-[X-GNOME-Metatheme]
-GtkTheme=Zukitwo-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise
-MetacityTheme=Zukitwo-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise
-ButtonLayout=:minimize,maximize,close
diff --git a/Zukitwo-Wise/metacity-1/close_focused_normal.svg b/Zukitwo-Wise/metacity-1/close_focused_normal.svg
deleted file mode 100644
index 0fedea7..0000000
--- a/Zukitwo-Wise/metacity-1/close_focused_normal.svg
+++ /dev/null
@@ -1,213 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.7860737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4083">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/close_focused_prelight.svg b/Zukitwo-Wise/metacity-1/close_focused_prelight.svg
deleted file mode 100644
index 30aeca5..0000000
--- a/Zukitwo-Wise/metacity-1/close_focused_prelight.svg
+++ /dev/null
@@ -1,242 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767-3"
-       id="linearGradient3797-4"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       id="linearGradient3767-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769-5" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771-1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.999987"
-       x2="13.333333"
-       y1="5.9999866"
-       x1="13.333333"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4168"
-       xlink:href="#linearGradient3767-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-0.8485737"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4197">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765-5"
-         style="fill:url(#linearGradient4168);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087"
-         transform="translate(0,-4.762396e-6)">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/close_focused_pressed.svg b/Zukitwo-Wise/metacity-1/close_focused_pressed.svg
deleted file mode 100644
index 58b773c..0000000
--- a/Zukitwo-Wise/metacity-1/close_focused_pressed.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="1.7785883"
-     inkscape:cy="11.819935"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4399">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4087">
-        <g
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-245.52035)"
-           style="fill:#ffffff"
-           id="g4081">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4083"
-             width="7"
-             height="1"
-             x="-730.66187"
-             y="743.63245"
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
-          <rect
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)"
-             y="726.66187"
-             x="-747.63245"
-             height="1"
-             width="7"
-             id="rect4085"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3960"
-           style="fill:#4d4d4d"
-           transform="matrix(1.2374369,0,0,1.2374369,-3.3492588,-246.52035)">
-          <rect
-             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-             y="743.63245"
-             x="-730.66187"
-             height="1"
-             width="7"
-             id="rect3956"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3958"
-             width="7"
-             height="1"
-             x="-747.63245"
-             y="726.66187"
-             transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/close_unfocused.svg b/Zukitwo-Wise/metacity-1/close_unfocused.svg
deleted file mode 100644
index ec9c30c..0000000
--- a/Zukitwo-Wise/metacity-1/close_unfocused.svg
+++ /dev/null
@@ -1,252 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="8.8760382"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4580"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/close_unfocused_prelight.svg b/Zukitwo-Wise/metacity-1/close_unfocused_prelight.svg
deleted file mode 100644
index 5c3dd26..0000000
--- a/Zukitwo-Wise/metacity-1/close_unfocused_prelight.svg
+++ /dev/null
@@ -1,207 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="14.11663"
-     inkscape:cy="12.713832"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4765"
-       transform="translate(-1.9999997,1.9999733)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-10.599999,1023.0895)" />
-      <g
-         id="g4005"
-         style="fill:#b3b3b3"
-         transform="matrix(1.4024284,0,0,1.4024284,-5.3291594,-418.17133)">
-        <rect
-           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-           y="743.63245"
-           x="-730.66187"
-           height="1"
-           width="7"
-           id="rect4007"
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-           id="rect4009"
-           width="7"
-           height="1"
-           x="-747.63245"
-           y="726.66187"
-           transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-      </g>
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <rect
-         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-         y="743.51373"
-         x="-732.20001"
-         height="1.2374369"
-         width="8.6620579"
-         id="rect3956-1"
-         style="fill:#666666;fill-opacity:1;stroke:none" />
-      <rect
-         style="fill:#666666;fill-opacity:1;stroke:none"
-         id="rect3958-6"
-         width="8.6620579"
-         height="1.2374369"
-         x="-748.4635"
-         y="727.25031"
-         transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,0,0)" />
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/maximize_focused_normal.svg b/Zukitwo-Wise/metacity-1/maximize_focused_normal.svg
deleted file mode 100644
index 227116f..0000000
--- a/Zukitwo-Wise/metacity-1/maximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/maximize_focused_prelight.svg b/Zukitwo-Wise/metacity-1/maximize_focused_prelight.svg
deleted file mode 100644
index 05d36ff..0000000
--- a/Zukitwo-Wise/metacity-1/maximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/maximize_focused_pressed.svg b/Zukitwo-Wise/metacity-1/maximize_focused_pressed.svg
deleted file mode 100644
index 5818320..0000000
--- a/Zukitwo-Wise/metacity-1/maximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/maximize_unfocused.svg b/Zukitwo-Wise/metacity-1/maximize_unfocused.svg
deleted file mode 100644
index 2cc9b55..0000000
--- a/Zukitwo-Wise/metacity-1/maximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/maximize_unfocused_prelight.svg b/Zukitwo-Wise/metacity-1/maximize_unfocused_prelight.svg
deleted file mode 100644
index f056e9b..0000000
--- a/Zukitwo-Wise/metacity-1/maximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/menu.png b/Zukitwo-Wise/metacity-1/menu.png
deleted file mode 100644
index b35c082..0000000
--- a/Zukitwo-Wise/metacity-1/menu.png
+++ /dev/null
diff --git a/Zukitwo-Wise/metacity-1/menu_prelight.png b/Zukitwo-Wise/metacity-1/menu_prelight.png
deleted file mode 100644
index 0713ddc..0000000
--- a/Zukitwo-Wise/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/metacity-1/metacity-theme-2.xml b/Zukitwo-Wise/metacity-1/metacity-theme-2.xml
deleted file mode 100644
index d7ac679..0000000
--- a/Zukitwo-Wise/metacity-1/metacity-theme-2.xml
+++ /dev/null
@@ -1,971 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A metacity window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-<constant name="C_title_focused_hilight" value="gtk:base[NORMAL]" />
-<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="2" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="10"/>
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="1" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="1" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" parent="normal">
-	<distance name="title_vertical_pad" value="0"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 3"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               color="C_title_focused_hilight" />
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title x="(0 `max` ((width - title_width) / 2)) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               color="C_title_unfocused"/>
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused_alt">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.6" />
-		<!-- <color value="gtk:bg[NORMAL]"/> -->
-		<!-- <color value="blend/gtk:bg[NORMAL]/#000000/0.03" /> -->
-		<color value="gtk:bg[NORMAL]"/>
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4" />
-		<color value="gtk:bg[NORMAL]"/>
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_titlebar_unfocused" />
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused_alt" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="borderless">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Wise/metacity-1/metacity-theme-3.xml b/Zukitwo-Wise/metacity-1/metacity-theme-3.xml
deleted file mode 100644
index 3b0ac07..0000000
--- a/Zukitwo-Wise/metacity-1/metacity-theme-3.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0"?>
-<metacity_theme>
-<info>
-	<name>Zukitwo-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise-Wise</name>
-	<author>lassekongo83</author>
-	<copyright>GPL</copyright>
-	<date>2012</date>
-	<description>A GNOME 3 window theme</description>
-</info>
-
-<!-- meaningfull constants -->
-
-<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
-<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
-<constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
-<constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
-<constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
-<constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
-<constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-<!-- color of the button icons -->
-<constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-<!-- geometries -->
-
-<frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="9"/>
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<aspect_ratio name="button" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-</frame_geometry>
-
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="8"/> <!-- 
-							This needs to be 1 less then the
-							title_vertical_pad on normal state
-							or you'll have bigger buttons -->
-	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	<distance name="bottom_height" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="0" />
-</frame_geometry>
-
-<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="left_width" value="1" />
-</frame_geometry>
-
-<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-	<distance name="title_vertical_pad" value="7"/>
-	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-</frame_geometry>
-
-<frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
-</frame_geometry>
-
-<frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
-</frame_geometry>
-
-<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="1" />
-	<distance name="right_width" value="1" />
-	<distance name="bottom_height" value="1" />
-	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<distance name="title_vertical_pad" value="1" />
-</frame_geometry>
-
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
-	<distance name="left_width" value="0" />
-	<distance name="right_width" value="0" />
-	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-	<border name="title_border" left="0" right="0" top="0" bottom="0" />
-</frame_geometry>
-
-<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="5"/>
-</frame_geometry>
-
-<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
-	<distance name="title_vertical_pad" value="9"/>
-	<distance name="bottom_height" value="4"/>
-	<distance name="left_width" value="4"/>
-	<distance name="right_width" value="4"/>
-</frame_geometry>
-
-<!-- drawing operations -->
-
-	<!-- title -->
-
-<draw_ops name="title_focused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_focused" />
-</draw_ops>
-
-<draw_ops name="title_unfocused">
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 2"
-               ellipsize_width="width"
-               color="C_title_focused_hilight" />
-	<title version=">= 3.1"
-               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-               y="(0 `max` ((height - title_height) / 2)) + 1"
-               ellipsize_width="width"
-               color="C_title_unfocused" />
-</draw_ops>
-
-	<!-- window decorations -->
-
-<draw_ops name="entire_background_focused">
-	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
-</draw_ops>
-
-<draw_ops name="entire_background_unfocused">
-	<include name="entire_background_focused" />
-</draw_ops>
-
-<draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-
-<draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="height">
-		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="hilight">
-	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
-	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
-		<color value="C_titlebar_focused_hilight" />
-		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-	</gradient>
-</draw_ops>
-
-<draw_ops name="rounded_hilight">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_hilight_unfocused">
-	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
-</draw_ops>
-
-<draw_ops name="titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_unfocused">
-	<include name="titlebar_fill_unfocused" />
-	<include name="rounded_hilight_unfocused" />
-</draw_ops>
-
-<draw_ops name="rounded_titlebar_focused_alt">
-	<include name="titlebar_fill_focused" />
-	<include name="rounded_hilight" />
-</draw_ops>
-
-<draw_ops name="border_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="border_unfocused">
-	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-</draw_ops>
-
-<draw_ops name="rounded_border_focused">
-	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-<draw_ops name="rounded_border_unfocused">
-	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
-	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
-	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
-	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-
-	<!-- double arcs for darker borders -->
-	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
-	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
-</draw_ops>
-
-
-<!-- <draw_ops name="border_right_focused">
-	<line
-		x1="width-1" y1="0"
-		x2="width-1" y2="height"
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_right_unfocused">
-	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops> -->
-
-<draw_ops name="border_left_focused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_focused" />
-</draw_ops>
-
-<draw_ops name="border_left_unfocused">
-	<line
-		x1="0" y1="0" 
-		x2="0" y2="height" 
-		color="C_border_unfocused" />
-</draw_ops>
-
-<!-- button icons-->
-
-<draw_ops name="close_glyph_focused">
-	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused">
-	<include name="close_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused">
-	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_prelight">
-	<image filename="close_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_prelight">
-	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="close_glyph_unfocused_pressed">
-	<image filename="close_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="close_unfocused_pressed">
-	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_focused">
-	<image filename="maximize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused">
-	<include name="maximize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused">
-	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_prelight">
-	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="maximize_glyph_unfocused_pressed">
-	<image filename="maximize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_unfocused_pressed">
-	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_focused">
-	<image filename="minimize_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused">
-	<include name="minimize_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused">
-	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_prelight">
-	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="minimize_glyph_unfocused_pressed">
-	<image filename="minimize_unfocused.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_unfocused_pressed">
-	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_focused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused">
-	<include name="menu_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="menu_focused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_focused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused">
-	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused">
-	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_prelight">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_prelight">
-	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="menu_glyph_unfocused_pressed">
-	<image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="menu_unfocused_pressed">
-	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_focused"></draw_ops>
-
-<draw_ops name="shade_focused">
-	<include name="shade_glyph_focused" />
-</draw_ops>
-
-<draw_ops name="shade_focused_pressed">
-	<include name="shade_glyph_focused" y="1" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused"></draw_ops>
-
-<draw_ops name="shade_unfocused">
-	<include name="shade_glyph_unfocused" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_prelight"></draw_ops>
-
-<draw_ops name="shade_unfocused_prelight">
-	<include name="shade_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<draw_ops name="shade_glyph_unfocused_pressed"></draw_ops>
-
-<draw_ops name="shade_unfocused_pressed">
-	<include name="shade_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
-</draw_ops>
-
-<!-- frame styles -->
-
-<frame_style name="normal_focused" geometry="normal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_unfocused" geometry="normal_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_focused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="normal_max_shaded_unfocused" geometry="max">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_focused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="rounded_border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="dialog_unfocused" geometry="nobuttons">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="rounded_border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_focused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="modal_dialog_unfocused" geometry="modal">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_focused" geometry="small">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="utility_unfocused" geometry="small_unfocused">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_focused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="border_unfocused" geometry="border">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="borderless" geometry="borderless">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_focused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_focused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="attached_unfocused" geometry="attached">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_unfocused" />
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_focused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_left_unfocused" geometry="tiled_left">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_focused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
-	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_left_focused" />
-	<button function="close" state="normal" draw_ops="close_focused" />
-	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
-	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
-	<button function="maximize" state="normal" draw_ops="maximize_focused" />
-	<button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" />
-	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
-	<button function="minimize" state="normal" draw_ops="minimize_focused" />
-	<button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" />
-	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
-	<button function="menu" state="normal" draw_ops="menu_focused" />
-	<button function="menu" state="prelight" draw_ops="menu_focused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_focused" />
-	<button function="shade" state="pressed" draw_ops="shade_focused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_focused" />
-	<button function="unshade" state="pressed" draw_ops="shade_focused_pressed" />
-
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<frame_style name="tiled_right_unfocused" geometry="tiled_right">
-	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
-	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_left_unfocused" />
-	<button function="close" state="normal" draw_ops="close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
-	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
-	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
-	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
-	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
-	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
-	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
-	<button function="menu" state="normal" draw_ops="menu_unfocused" />
-	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
-	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
-	<button function="shade" state="normal" draw_ops="shade_unfocused" />
-	<button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="unshade" state="normal" draw_ops="shade_unfocused" />
-	<button function="unshade" state="prelight" draw_ops="shade_unfocused_prelight" />
-	<button function="unshade" state="pressed" draw_ops="shade_unfocused_pressed" />
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- placeholder for unimplementated styles-->
-<frame_style name="blank" geometry="normal">
-	<button function="close" state="normal"><draw_ops></draw_ops></button>
-	<button function="close" state="pressed"><draw_ops></draw_ops></button>
-	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
-	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
-	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
-	<button function="menu" state="normal"><draw_ops></draw_ops></button>
-	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
-	<button function="shade" state="normal"><draw_ops></draw_ops></button>
-	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
-	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
-	<button function="above" state="normal"><draw_ops></draw_ops></button>
-	<button function="above" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
-	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
-	<button function="stick" state="normal"><draw_ops></draw_ops></button>
-	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
-	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
-	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
-</frame_style>
-
-<!-- frame style sets -->
-
-<frame_style_set name="normal_style_set">
-	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized" style="normal_max_focused"/>
-	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
-	<frame focus="yes" state="shaded" style="normal_focused"/>
-	<frame focus="no" state="shaded" style="normal_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
-	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
-	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
-</frame_style_set>
-
-<frame_style_set name="dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="dialog_focused"/>
-	<frame focus="no" state="shaded" style="dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="modal_dialog_style_set">
-	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
-	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="modal_dialog_focused"/>
-	<frame focus="no" state="shaded" style="modal_dialog_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="utility_style_set">
-	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
-	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="utility_focused"/>
-	<frame focus="no" state="shaded" style="utility_unfocused"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="border_style_set">
-	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
-	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="borderless"/>
-	<frame focus="no" state="maximized" style="borderless"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-<frame_style_set name="attached_style_set">
-	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
-	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
-	<frame focus="yes" state="shaded" style="blank"/>
-	<frame focus="no" state="shaded" style="blank"/>
-	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
-	<frame focus="no" state="maximized_and_shaded" style="blank"/>
-</frame_style_set>
-
-
-<!-- windows -->
-
-<window type="normal" style_set="normal_style_set"/>
-<window type="dialog" style_set="dialog_style_set"/>
-<window type="modal_dialog" style_set="modal_dialog_style_set"/>
-<window type="menu" style_set="utility_style_set"/>
-<window type="utility" style_set="utility_style_set"/>
-<window type="border" style_set="border_style_set"/>
-<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
-
-</metacity_theme>
diff --git a/Zukitwo-Wise/metacity-1/minimize_focused_normal.svg b/Zukitwo-Wise/metacity-1/minimize_focused_normal.svg
deleted file mode 100644
index 226df06..0000000
--- a/Zukitwo-Wise/metacity-1/minimize_focused_normal.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-5.7556119"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3971">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/minimize_focused_prelight.svg b/Zukitwo-Wise/metacity-1/minimize_focused_prelight.svg
deleted file mode 100644
index 39fc43e..0000000
--- a/Zukitwo-Wise/metacity-1/minimize_focused_prelight.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="-1.7283373"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4041">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/minimize_focused_pressed.svg b/Zukitwo-Wise/metacity-1/minimize_focused_pressed.svg
deleted file mode 100644
index b4e5629..0000000
--- a/Zukitwo-Wise/metacity-1/minimize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3685673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g3905">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g3822">
-        <g
-           transform="translate(-0.83999283,2.2899698)"
-           id="g3816"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect3818"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3820"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="translate(-0.83999283,1.290164)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/minimize_unfocused.svg b/Zukitwo-Wise/metacity-1/minimize_unfocused.svg
deleted file mode 100644
index 90b134e..0000000
--- a/Zukitwo-Wise/metacity-1/minimize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="7.115262"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g3921">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/minimize_unfocused_prelight.svg b/Zukitwo-Wise/metacity-1/minimize_unfocused_prelight.svg
deleted file mode 100644
index d645f34..0000000
--- a/Zukitwo-Wise/metacity-1/minimize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="minimize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4495">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="m 18,11.5 a 5,5.5 0 1 1 -10,0 5,5.5 0 1 1 10,0 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="translate(-2.8399928,3.290164)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/unmaximize_focused_normal.svg b/Zukitwo-Wise/metacity-1/unmaximize_focused_normal.svg
deleted file mode 100644
index 2a41380..0000000
--- a/Zukitwo-Wise/metacity-1/unmaximize_focused_normal.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_normal.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="4.3842433"
-     inkscape:cy="10.751169"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="34"
-     inkscape:window-y="98"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4304">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-0"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-1"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/unmaximize_focused_prelight.svg b/Zukitwo-Wise/metacity-1/unmaximize_focused_prelight.svg
deleted file mode 100644
index 641fc43..0000000
--- a/Zukitwo-Wise/metacity-1/unmaximize_focused_prelight.svg
+++ /dev/null
@@ -1,212 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="9.1833528"
-     inkscape:cy="9.5902743"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="698"
-     inkscape:window-x="64"
-     inkscape:window-y="49"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4215">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3763);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3801);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,1.5454545,-10.6,1023.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3797);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084"
-         transform="translate(0,4.1773256e-5)">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044-3"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040-8"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042-2"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/unmaximize_focused_pressed.svg b/Zukitwo-Wise/metacity-1/unmaximize_focused_pressed.svg
deleted file mode 100644
index cb10080..0000000
--- a/Zukitwo-Wise/metacity-1/unmaximize_focused_pressed.svg
+++ /dev/null
@@ -1,211 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_focused_pressed.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#c8c8c8;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#e8e8e8;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3936"
-       gradientUnits="userSpaceOnUse"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3938"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="2.3060673"
-     inkscape:cy="12.131968"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="697"
-     inkscape:window-x="60"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-1.9999997px"
-       originy="-2.0000327px" />
-  </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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9999997,-1031.3622)">
-    <g
-       id="g4126">
-      <path
-         transform="matrix(1.2666667,0,0,1.2666667,-4.3333338,1026.2955)"
-         d="M 20,11.5 C 20,15.642136 16.642136,19 12.5,19 8.3578644,19 5,15.642136 5,11.5 5,7.3578644 8.3578644,4 12.5,4 16.642136,4 20,7.3578644 20,11.5 z"
-         sodipodi:ry="7.5"
-         sodipodi:rx="7.5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="12.5"
-         id="path2987"
-         style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:url(#linearGradient3938);fill-opacity:1;stroke:none"
-         id="path3775"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.7,0,0,-1.5454545,-10.6,1058.635)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-8,1025.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path3765"
-         style="fill:url(#linearGradient3940);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         id="g4084">
-        <g
-           transform="matrix(1,0,0,-1,-0.83999283,2081.434)"
-           id="g4078"
-           style="fill:#ffffff">
-          <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:none"
-             id="rect4080"
-             width="4.9997449"
-             height="1.2369368"
-             x="-727.92255"
-             y="744.13599"
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-          <rect
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-             y="726.68433"
-             x="-745.37366"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect4082"
-             style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        </g>
-        <g
-           id="g3044"
-           transform="matrix(1,0,0,-1,-0.83999283,2080.4342)">
-          <rect
-             transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)"
-             y="744.13599"
-             x="-727.92255"
-             height="1.2369368"
-             width="4.9997449"
-             id="rect3040"
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
-          <rect
-             style="fill:#4d4d4d;fill-opacity:1;stroke:none"
-             id="rect3042"
-             width="4.9997449"
-             height="1.2369368"
-             x="-745.37366"
-             y="726.68433"
-             transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/unmaximize_unfocused.svg b/Zukitwo-Wise/metacity-1/unmaximize_unfocused.svg
deleted file mode 100644
index 190fa59..0000000
--- a/Zukitwo-Wise/metacity-1/unmaximize_unfocused.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g5101">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/metacity-1/unmaximize_unfocused_prelight.svg b/Zukitwo-Wise/metacity-1/unmaximize_unfocused_prelight.svg
deleted file mode 100644
index 3856a57..0000000
--- a/Zukitwo-Wise/metacity-1/unmaximize_unfocused_prelight.svg
+++ /dev/null
@@ -1,235 +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="19"
-   height="19"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maximize_unfocused_prelight.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3777">
-      <stop
-         id="stop3779"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.22745098;" />
-      <stop
-         id="stop3781"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#d4d4d4;stop-opacity:1;"
-         offset="1"
-         id="stop3771" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3757">
-      <stop
-         style="stop-color:#bebebe;stop-opacity:1;"
-         offset="0"
-         id="stop3759" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3761" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3757"
-       id="linearGradient3763"
-       x1="13"
-       y1="4"
-       x2="13"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3797"
-       gradientUnits="userSpaceOnUse"
-       x1="13.333333"
-       y1="5.9999866"
-       x2="13.333333"
-       y2="16.999987" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="14.470589"
-       y1="16.999983"
-       x2="14.470589"
-       y2="5.9999824" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4525"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4529"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4531"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4533"
-       gradientUnits="userSpaceOnUse"
-       x1="4"
-       y1="1040.8622"
-       x2="19"
-       y2="1040.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4553"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient4571"
-       gradientUnits="userSpaceOnUse"
-       x1="14"
-       y1="5.9999866"
-       x2="14"
-       y2="16.999987" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="21.533758"
-     inkscape:cx="9.5"
-     inkscape:cy="11.22532"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1150"
-     inkscape:window-height="742"
-     inkscape:window-x="65"
-     inkscape:window-y="49"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1033.3622)">
-    <g
-       id="g4526">
-      <path
-         sodipodi:type="arc"
-         style="fill:#b3b3b3;fill-opacity:1;stroke:none"
-         id="path4003"
-         sodipodi:cx="13"
-         sodipodi:cy="11.5"
-         sodipodi:rx="5"
-         sodipodi:ry="5.5"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         transform="matrix(1.6999999,0,0,1.5454545,-12.599999,1025.0895)" />
-      <path
-         transform="matrix(1.5,0,0,1.3636364,-9.9999997,1027.1804)"
-         d="M 18,11.5 C 18,14.537566 15.761424,17 13,17 10.238576,17 8,14.537566 8,11.5 8,8.4624339 10.238576,6 13,6 c 2.761424,0 5,2.4624339 5,5.5 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5"
-         sodipodi:cy="11.5"
-         sodipodi:cx="13"
-         id="path4545"
-         style="fill:#f2f2f2;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         style="fill:#666666"
-         transform="matrix(1,0,0,-1,-2.8399928,2082.4342)"
-         id="g3044">
-        <rect
-           style="fill:#666666;fill-opacity:1;stroke:none"
-           id="rect3040"
-           width="4.9997449"
-           height="1.2369368"
-           x="-727.92255"
-           y="744.13599"
-           transform="matrix(0.70710677,-0.70710679,0.70710677,0.70710679,0,0)" />
-        <rect
-           transform="matrix(-0.70710677,-0.70710679,-0.70710677,0.70710679,0,0)"
-           y="726.68433"
-           x="-745.37366"
-           height="1.2369368"
-           width="4.9997449"
-           id="rect3042"
-           style="fill:#666666;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/Zukitwo-Wise/patches/enable-dark-menubar.patch b/Zukitwo-Wise/patches/enable-dark-menubar.patch
deleted file mode 100755
index dfd57c8..0000000
--- a/Zukitwo-Wise/patches/enable-dark-menubar.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/gtkrc	2014-08-02 14:25:23.286222703 -0400
-+++ Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave-colors-common/patches/enable-dark-menubar.patch	2014-08-02 14:18:26.212871329 -0400
-@@ -249,7 +249,7 @@
- 
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
--	bg[NORMAL]	= @bg_color
-+	bg[NORMAL]	= @menubar_bg_color
- 	fg[NORMAL]	= @fg_color
- 	fg[PRELIGHT]	= @fg_color
- 	fg[SELECTED]	= @fg_color
-
-@@ -250,15 +250,18 @@
- style "murrine-menubar" = "murrine-default" {
- 	ythickness	= 0
- 	bg[NORMAL]	= @menubar_bg_color
--	fg[NORMAL]	= @fg_color
-+	fg[NORMAL]	= @menubar_fg_color
- 	fg[PRELIGHT]	= @fg_color
--	fg[SELECTED]	= @fg_color
-+        fg[SELECTED]    = @fg_color
- }
- 
- style "murrine-menubar-menuitem" = "murrine-wider" {
- 	xthickness	= 6
- 	bg[PRELIGHT]	= @selected_bg_color
--	bg[SELECTED]	= @bg_color
-+	bg[SELECTED]	= @selected_bg_color
-+        fg[NORMAL]	= @menuitem_fg_color
-+        fg[PRELIGHT]	= @menuitem_fg_color
-+        fg[SELECTED]	= @menuitem_fg_color
- 
- 	engine "murrine" {
- 		contrast = .0 
diff --git a/Zukitwo-Wise/patches/panel.rc.patch b/Zukitwo-Wise/patches/panel.rc.patch
deleted file mode 100755
index 373fa1d..0000000
--- a/Zukitwo-Wise/patches/panel.rc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../../../zuki-themes/Zukitwo-Brave-Brave-Brave-Brave-Brave-Brave/gtk-2.0/widgets/panel.rc	2014-08-02 14:00:54.139492486 -0400
-+++ panel.rc.patch	2014-08-02 14:01:22.649493720 -0400
-@@ -3,6 +3,7 @@
- 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
- 	ythickness = 0
- 
-+	bg_pixmap[NORMAL]	= "/widgets/Panel/panel-bg.png"
- 	base[NORMAL]		= @bg_color
- 	base[PRELIGHT]		= shade (1.06, @bg_color)
- 	base[INSENSITIVE]	= @bg_color
diff --git a/Zukitwo-Wise/unity/close.png b/Zukitwo-Wise/unity/close.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Wise/unity/close.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/close_focused_normal.png b/Zukitwo-Wise/unity/close_focused_normal.png
deleted file mode 100644
index 1e75607..0000000
--- a/Zukitwo-Wise/unity/close_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/close_focused_prelight.png b/Zukitwo-Wise/unity/close_focused_prelight.png
deleted file mode 100644
index 1f3a813..0000000
--- a/Zukitwo-Wise/unity/close_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/close_focused_pressed.png b/Zukitwo-Wise/unity/close_focused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Wise/unity/close_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/close_unfocused.png b/Zukitwo-Wise/unity/close_unfocused.png
deleted file mode 100644
index 6067365..0000000
--- a/Zukitwo-Wise/unity/close_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/close_unfocused_prelight.png b/Zukitwo-Wise/unity/close_unfocused_prelight.png
deleted file mode 100644
index 7a5b962..0000000
--- a/Zukitwo-Wise/unity/close_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/close_unfocused_pressed.png b/Zukitwo-Wise/unity/close_unfocused_pressed.png
deleted file mode 100644
index 53173dc..0000000
--- a/Zukitwo-Wise/unity/close_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize.png b/Zukitwo-Wise/unity/maximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wise/unity/maximize.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize_focused_normal.png b/Zukitwo-Wise/unity/maximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wise/unity/maximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize_focused_prelight.png b/Zukitwo-Wise/unity/maximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Wise/unity/maximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize_focused_pressed.png b/Zukitwo-Wise/unity/maximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wise/unity/maximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize_unfocused.png b/Zukitwo-Wise/unity/maximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Wise/unity/maximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize_unfocused_prelight.png b/Zukitwo-Wise/unity/maximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Wise/unity/maximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/maximize_unfocused_pressed.png b/Zukitwo-Wise/unity/maximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wise/unity/maximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize.png b/Zukitwo-Wise/unity/minimize.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Wise/unity/minimize.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize_focused_normal.png b/Zukitwo-Wise/unity/minimize_focused_normal.png
deleted file mode 100644
index dd8834d..0000000
--- a/Zukitwo-Wise/unity/minimize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize_focused_prelight.png b/Zukitwo-Wise/unity/minimize_focused_prelight.png
deleted file mode 100644
index c8b10e7..0000000
--- a/Zukitwo-Wise/unity/minimize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize_focused_pressed.png b/Zukitwo-Wise/unity/minimize_focused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Wise/unity/minimize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize_unfocused.png b/Zukitwo-Wise/unity/minimize_unfocused.png
deleted file mode 100644
index de7d96b..0000000
--- a/Zukitwo-Wise/unity/minimize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize_unfocused_prelight.png b/Zukitwo-Wise/unity/minimize_unfocused_prelight.png
deleted file mode 100644
index 33ef427..0000000
--- a/Zukitwo-Wise/unity/minimize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/minimize_unfocused_pressed.png b/Zukitwo-Wise/unity/minimize_unfocused_pressed.png
deleted file mode 100644
index a558157..0000000
--- a/Zukitwo-Wise/unity/minimize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize.png b/Zukitwo-Wise/unity/unmaximize.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wise/unity/unmaximize.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize_focused_normal.png b/Zukitwo-Wise/unity/unmaximize_focused_normal.png
deleted file mode 100644
index 604db70..0000000
--- a/Zukitwo-Wise/unity/unmaximize_focused_normal.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize_focused_prelight.png b/Zukitwo-Wise/unity/unmaximize_focused_prelight.png
deleted file mode 100644
index 25b8f06..0000000
--- a/Zukitwo-Wise/unity/unmaximize_focused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize_focused_pressed.png b/Zukitwo-Wise/unity/unmaximize_focused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wise/unity/unmaximize_focused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize_unfocused.png b/Zukitwo-Wise/unity/unmaximize_unfocused.png
deleted file mode 100644
index cfebc49..0000000
--- a/Zukitwo-Wise/unity/unmaximize_unfocused.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize_unfocused_prelight.png b/Zukitwo-Wise/unity/unmaximize_unfocused_prelight.png
deleted file mode 100644
index 5aeadfb..0000000
--- a/Zukitwo-Wise/unity/unmaximize_unfocused_prelight.png
+++ /dev/null
diff --git a/Zukitwo-Wise/unity/unmaximize_unfocused_pressed.png b/Zukitwo-Wise/unity/unmaximize_unfocused_pressed.png
deleted file mode 100644
index 892efce..0000000
--- a/Zukitwo-Wise/unity/unmaximize_unfocused_pressed.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-active.png b/Zukitwo-Wise/xfwm4/bottom-active.png
deleted file mode 100644
index 7bf5fb0..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-active.xpm b/Zukitwo-Wise/xfwm4/bottom-active.xpm
deleted file mode 100644
index 54ba75d..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Wise/xfwm4/bottom-inactive.png b/Zukitwo-Wise/xfwm4/bottom-inactive.png
deleted file mode 100644
index 5acff07..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-inactive.xpm b/Zukitwo-Wise/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index 0345f15..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 1 2 1",
-" 	c None",
-".	c #6A6A6A",
-"........................"};
diff --git a/Zukitwo-Wise/xfwm4/bottom-left-active.png b/Zukitwo-Wise/xfwm4/bottom-left-active.png
deleted file mode 100644
index 4513196..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-left-active.xpm b/Zukitwo-Wise/xfwm4/bottom-left-active.xpm
deleted file mode 100644
index 33fd441..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Wise/xfwm4/bottom-left-inactive.png b/Zukitwo-Wise/xfwm4/bottom-left-inactive.png
deleted file mode 100644
index 9c3fcc5..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-left-inactive.xpm b/Zukitwo-Wise/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index 6d14f98..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".."};
diff --git a/Zukitwo-Wise/xfwm4/bottom-right-active.png b/Zukitwo-Wise/xfwm4/bottom-right-active.png
deleted file mode 100644
index 08acf62..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-right-active.xpm b/Zukitwo-Wise/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index 048b383..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Wise/xfwm4/bottom-right-inactive.png b/Zukitwo-Wise/xfwm4/bottom-right-inactive.png
deleted file mode 100644
index 579853c..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/bottom-right-inactive.xpm b/Zukitwo-Wise/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index 2c2d42b..0000000
--- a/Zukitwo-Wise/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-"++"};
diff --git a/Zukitwo-Wise/xfwm4/close-active.xpm b/Zukitwo-Wise/xfwm4/close-active.xpm
deleted file mode 100644
index 27ef1c7..0000000
--- a/Zukitwo-Wise/xfwm4/close-active.xpm
+++ /dev/null
@@ -1,187 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"25 26 158 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #919191",
-"F 	c #B4B4B4",
-"G 	c #929292",
-"H 	c #CECECE",
-"I 	c #D6D6D6",
-"J 	c #DFDFDF",
-"K 	c #ECECEC",
-"L 	c #B7B7B7",
-"M 	c #4F4F4F",
-"N 	c #AAAAAA",
-"O 	c #B8B8B8",
-"P 	c #DDDDDD",
-"Q 	c #E0DFE0",
-"R 	c #DEDFDE",
-"S 	c #BCBCBC",
-"T 	c #E9E9E9",
-"U 	c #818181",
-"V 	c #BDBDBD",
-"W 	c #D0D0D0",
-"X 	c #DEDFDF",
-"Y 	c #DDDEDD",
-"Z 	c #DDDEDE",
-"` 	c #BBBBBB",
-" .	c #F0F0F0",
-"..	c #8D8D8D",
-"+.	c #4D4D4D",
-"@.	c #DCDDDC",
-"#.	c #DCDDDD",
-"$.	c #DCDCDD",
-"%.	c #D4D4D4",
-"&.	c #A3A3A3",
-"*.	c #DDDDDC",
-"=.	c #DDDCDC",
-"-.	c #DBDBDC",
-";.	c #DCDBDB",
-">.	c #A1A1A1",
-",.	c #D7D7D7",
-"'.	c #DCDBDC",
-").	c #DCDCDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #8B8B8B",
-"^.	c #B6B6B6",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #BABABA",
-"3.	c #B9B9B9",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #BEBEBE",
-"0.	c #D8D8D7",
-"a.	c #D7D8D7",
-"b.	c #D6D7D6",
-"c.	c #D7D6D6",
-"d.	c #D6D6D7",
-"e.	c #D7D6D7",
-"f.	c #B0B0B0",
-"g.	c #D6D7D7",
-"h.	c #D6D5D5",
-"i.	c #D5D5D6",
-"j.	c #D6D5D6",
-"k.	c #D6D6D5",
-"l.	c #E0E1E1",
-"m.	c #E2E3E2",
-"n.	c #E0E1E0",
-"o.	c #D5D6D5",
-"p.	c #D4D5D4",
-"q.	c #D5D4D5",
-"r.	c #D4D5D5",
-"s.	c #D5D5D4",
-"t.	c #D4D4D5",
-"u.	c #D4D3D3",
-"v.	c #D3D4D4",
-"w.	c #D4D3D4",
-"x.	c #D4D4D3",
-"y.	c #D3D3D4",
-"z.	c #D3D2D3",
-"A.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D E F D D D F G D D D H t I A A A ",
-"J J J 2 / z K K K L M N K N M O K K K P / 2 a Q A ",
-"R z z 2 S ! T T T c S M U M S c T T T [ V W X R z ",
-"z Y Z { ` = # # # #  ...+... .# # # # = ` { Y w w ",
-"@.#.$.%.S A [ [ [ [ &.M G M &.[ [ [ [ A S %.*.*.=.",
-"-.-.;.I y B f f f >.M S v ` M >.f f f B / ,.'.).).",
-"!.~.!.{.e ] J J J ].^.j J j /.].J J J t e {.!.(._.",
-":.:.<.[.}.` B ).).c l ).).).j c ).).B ` {.{.:.|.:.",
-"{.1.{.{._.C 2.,.:.:.:.:.:.:.:.:.:.,.3.C :.{.{.[.{.",
-"4.5.}.}.,.).e O W ,.,.,.,.,.,.,.C O e ).6.}.}.7.}.",
-",.8.,.6.,.,.z C L 9.e 2 B 2 e 9.L W z 6.0.,.}.a.,.",
-"I b.b.c.d.e.I ).J C 9./.f./.9.C J ).b.g.,.g.I b.b.",
-"h.h.i.B j.B i.k.I -.l.m.[ q n.;.d.j.k.o.h.j.h.I I ",
-"p.B q.r.%.s.r.t.B t.t.B t.s.B B r.B s.%.B s.r.B B ",
-"u.v.%.w.%.%.v.%.x.w.%.%.y.v.w.%.u.%.%.%.x.%.%.%.%.",
-"_ _ r _ z.r r _ z._ _ z._ A.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/close-inactive.xpm b/Zukitwo-Wise/xfwm4/close-inactive.xpm
deleted file mode 100644
index 8162877..0000000
--- a/Zukitwo-Wise/xfwm4/close-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #9C9C9C",
-"x 	c #C4C4C4",
-"y 	c #DFDFDF",
-"z 	c #BEBEBE",
-"A 	c #B5B5B5",
-"B 	c #686868",
-"C 	c #B0B0B0",
-"D 	c #E0DFDF",
-"E 	c #E0DFE0",
-"F 	c #DEDFDE",
-"G 	c #919191",
-"H 	c #DEDFDF",
-"I 	c #DDDEDD",
-"J 	c #DDDEDE",
-"K 	c #DEDDDD",
-"L 	c #B3B3B4",
-"M 	c #949494",
-"N 	c #666666",
-"O 	c #939393",
-"P 	c #B4B4B4",
-"Q 	c #DEDEDD",
-"R 	c #DCDDDC",
-"S 	c #DCDDDD",
-"T 	c #DCDCDD",
-"U 	c #AFAFAF",
-"V 	c #979797",
-"W 	c #DDDCDD",
-"X 	c #DDDDDC",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #BDBDBD",
-"+.	c #AEAEAE",
-"@.	c #DCDBDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #C9C9C9",
-"*.	c #B1B1B1",
-"=.	c #CACACA",
-"-.	c #DADADA",
-";.	c #D9DADA",
-">.	c #DAD9DA",
-",.	c #D7D6D7",
-"'.	c #D8D8D8",
-").	c #DADAD9",
-"!.	c #D9D9D9",
-"~.	c #D9D9D8",
-"{.	c #D8D9D8",
-"].	c #D8D8D9",
-"^.	c #C6C7C7",
-"/.	c #D9D8D8",
-"(.	c #D7D8D8",
-"_.	c #D8D7D7",
-":.	c #D7D8D7",
-"<.	c #D8D8D7",
-"[.	c #D6D6D6",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D4D4D4",
-"3.	c #C8C8C8",
-"4.	c #BCBCBC",
-"5.	c #B3B3B3",
-"6.	c #D6D7D7",
-"7.	c #D6D5D5",
-"8.	c #D5D5D6",
-"9.	c #D5D5D5",
-"0.	c #D6D5D6",
-"a.	c #D6D6D5",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D5D4D5",
-"f.	c #D4D5D5",
-"g.	c #D5D5D4",
-"h.	c #D4D4D5",
-"i.	c #D4D3D3",
-"j.	c #D3D4D4",
-"k.	c #D4D3D4",
-"l.	c #D4D4D3",
-"m.	c #D3D3D4",
-"n.	c #D3D3D3",
-"o.	c #D2D3D3",
-"p.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = w } = = = } w = = = x < c c c c ",
-"y y y y z b = = = A B C = C B | = = = b z y D E c ",
-"F t t t | s = = = = A B G B A = = = = s 0 t H F t ",
-"t I J K L ! = = = = = M N O = = = = = ! P K I Q Q ",
-"R S T u 0 s = = = = U B V B U = = = = s 0 W X X Y ",
-"Z Z `  ...b = = = +.B A = | B +.= = = b ..v @.v v ",
-"#.$.#.%.&.d = = = V *.= = = C V = = = x =.j #.%.j ",
-"-.-.;.>.,.0 u = = = = = = = = = = = v } '.-.-.).-.",
-"!.~.!.!.!.l k p = = = = = = = = = p i < !.!.!.>.!.",
-"{.].'.'.'.'.a i j = = = = = = = j k ^.'./.'.'./.'.",
-"b (.b _.b b _.=.0 a b s = s b d 0 =.:._.<.b '.:.b ",
-"[.}.}.|.1.,.[.[.2.3.4.| 5.| 4.3.2.}.}.6.b 6.[.}.}.",
-"7.7.8.9.0.9.8.a.9.8.b.c.[.0.c.7.8.0.a.c.7.0.7.[.[.",
-"d.9.e.f.2.g.f.h.9.h.h.9.h.g.9.9.f.9.g.2.9.g.f.9.9.",
-"i.j.2.k.2.2.j.2.l.k.2.2.m.j.k.2.i.2.2.2.l.2.2.2.2.",
-"n.n.o.n.p.o.o.n.p.n.n.p.n.r o.n.n.n.n.n.n.n.n.n.n."};
diff --git a/Zukitwo-Wise/xfwm4/close-prelight.xpm b/Zukitwo-Wise/xfwm4/close-prelight.xpm
deleted file mode 100644
index d3dba84..0000000
--- a/Zukitwo-Wise/xfwm4/close-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #959595",
-"H 	c #BABABA",
-"I 	c #BBBBBB",
-"J 	c #969696",
-"K 	c #DFDFDF",
-"L 	c #4F4F4F",
-"M 	c #B0B0B0",
-"N 	c #E0DFE0",
-"O 	c #DEDFDE",
-"P 	c #BCBCBC",
-"Q 	c #F5F5F5",
-"R 	c #858585",
-"S 	c #BDBDBD",
-"T 	c #D0D0D0",
-"U 	c #DEDFDF",
-"V 	c #DDDEDD",
-"W 	c #DDDEDE",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #4D4D4D",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #AAAAAA",
-"%.	c #929292",
-"&.	c #DDDDDC",
-"*.	c #DDDCDC",
-"=.	c #DBDBDC",
-"-.	c #DCDBDB",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #CBCBCB",
-"{.	c #8E8E8E",
-"].	c #B6B6B6",
-"^.	c #F4F4F4",
-"/.	c #B5B5B5",
-"(.	c #DBDADA",
-"_.	c #DBDBDB",
-":.	c #DADADA",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #D8D8D8",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #CFCFCF",
-"3.	c #D8D9D8",
-"4.	c #D8D8D9",
-"5.	c #D8D7D7",
-"6.	c #D9D8D8",
-"7.	c #D7D8D8",
-"8.	c #B7B7B7",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #BEBEBE",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F G H F F F I J F F F { E c C C C ",
-"K K K 2 / ! e e e H L M e M L H e e e [ / 2 a N C ",
-"O B B 2 P l Q Q Q z P L R L P z Q Q Q n S T U O B ",
-"B V W { I X Y Y Y Y F Z ` Z F Y Y Y Y X I { V w w ",
-" ...+.@.P #.X X X X $.L %.L $.X X X X #.P @.&.&.*.",
-"=.=.-.c x K l l l $.L P z I L $.l l l C / ;.>.,.,.",
-"'.).'.!.g ~.y y y {.].^.y ^./.{.y y y g g !.'.(._.",
-":.:.<.[.}.I 8 A A F ^.A A A ^.F A A 8 I !.!.:.|.:.",
-"!.1.!.!._.2.P = #.#.#.#.#.#.#.#.#.= I 2.:.!.!.[.!.",
-"3.4.}.}.;.,.g H K d d d d d d d B H g ,.5.}.}.6.}.",
-";.7.;.5.;.;.B 2.8.E ;.s + s ;.E 8.T B 5.9.;.}.0.;.",
-"c a.a.b.c.d.c ,.K 2.e./.M /.e.2.K ,.a.f.;.f.c a.a.",
-"g.g.h.D i.D h.j.c =.k.l.[ s m.-.c.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/close-pressed.xpm b/Zukitwo-Wise/xfwm4/close-pressed.xpm
deleted file mode 100644
index 916fd7b..0000000
--- a/Zukitwo-Wise/xfwm4/close-pressed.xpm
+++ /dev/null
@@ -1,192 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"25 26 163 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #858585",
-"M 	c #A2A2A2",
-"N 	c #B9B9B9",
-"O 	c #D6D6D6",
-"P 	c #DFDFDF",
-"Q 	c #B7B7B7",
-"R 	c #C9C9C9",
-"S 	c #B0B0B0",
-"T 	c #4F4F4F",
-"U 	c #B1B1B1",
-"V 	c #B8B8B8",
-"W 	c #E0DFE0",
-"X 	c #DEDFDE",
-"Y 	c #BCBCBC",
-"Z 	c #7B7B7B",
-"` 	c #D0D0D0",
-" .	c #DEDFDF",
-"..	c #DDDEDD",
-"+.	c #DDDEDE",
-"@.	c #D7D7D7",
-"#.	c #D8D8D8",
-"$.	c #8D8D8D",
-"%.	c #4D4D4D",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #D4D4D4",
-";.	c #C1C1C1",
-">.	c #DADADA",
-",.	c #9D9D9D",
-"'.	c #929292",
-").	c #DDDDDC",
-"!.	c #DDDCDC",
-"~.	c #DBDBDC",
-"{.	c #DCDBDB",
-"].	c #DCDCDC",
-"^.	c #9E9E9E",
-"/.	c #F1F1F1",
-"(.	c #DCDBDC",
-"_.	c #DBDBDA",
-":.	c #DADBDA",
-"<.	c #D9D9D9",
-"[.	c #8B8B8B",
-"}.	c #B6B6B6",
-"|.	c #EAEAEA",
-"1.	c #EBEBEB",
-"2.	c #DBDADA",
-"3.	c #DBDBDB",
-"4.	c #D9DADA",
-"5.	c #DAD9DA",
-"6.	c #DDDDDD",
-"7.	c #F3F3F3",
-"8.	c #EDEDED",
-"9.	c #DADAD9",
-"0.	c #D9D9D8",
-"a.	c #D8D9D8",
-"b.	c #D8D8D9",
-"c.	c #D8D7D7",
-"d.	c #D9D8D8",
-"e.	c #D7D8D8",
-"f.	c #D8D8D7",
-"g.	c #D7D8D7",
-"h.	c #D6D7D6",
-"i.	c #D7D6D6",
-"j.	c #D6D6D7",
-"k.	c #D7D6D7",
-"l.	c #D6D7D7",
-"m.	c #D6D5D5",
-"n.	c #D5D5D6",
-"o.	c #D6D5D6",
-"p.	c #D6D6D5",
-"q.	c #E0E1E1",
-"r.	c #E2E3E2",
-"s.	c #E0E1E0",
-"t.	c #D5D6D5",
-"u.	c #D4D5D4",
-"v.	c #D5D4D5",
-"w.	c #D4D5D5",
-"x.	c #D5D5D4",
-"y.	c #D4D4D5",
-"z.	c #D4D3D3",
-"A.	c #D3D4D4",
-"B.	c #D4D3D4",
-"C.	c #D4D4D3",
-"D.	c #D3D3D4",
-"E.	c #D3D2D3",
-"F.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 L 5 2 2 2 M L 2 2 2 N J O H H H ",
-"P P P 2 Q R _ _ _ S T 6 _ 6 T U _ _ _ E V 2 d W H ",
-"X G G 2 Q { I I I ! Y T Z T Y ! I I I 2 Q `  .X G ",
-"G ..+.{ i @.#.#.#.#.# $.%.$.# #.#.#.#.@.i { ..B B ",
-"&.*.=.-.;.#.>.>.>.>.,.T '.T ,.>.>.>.>.@.r -.).).!.",
-"~.~.{.O R I ].].].^.T Y /.i T ^.].].].I R @.(.].].",
-"_.:._.<.2 ` G G G [.}.|.G 1.k [.G G G 2 2 <._.2.3.",
-">.>.4.5.<.F 6.H H 7.8.H H H 8.7.H H ].F <.<.>.9.>.",
-"<.0.<.<.3.<.I m x x x x x x x x x m -.<.>.<.<.5.<.",
-"a.b.#.#.@.].3.#.x [ [ [ [ [ [ [ x #.3.].c.#.#.d.#.",
-"@.e.@.c.@.@.G G ].H a ! = ! a H ].G G c.f.@.#.g.@.",
-"O h.h.i.j.k.O ].m x m m m m m x m ].h.l.@.l.O h.h.",
-"m.m.n.I o.I n.p.O ~.q.r.[ x s.{.j.o.p.t.m.o.m.O O ",
-"u.I v.w.-.x.w.y.I y.y.I y.x.I I w.I x.-.I x.w.I I ",
-"z.A.-.B.-.-.A.-.C.B.-.-.D.A.B.-.z.-.-.-.C.-.-.-.-.",
-"_ _ y _ E.y y _ E._ _ E._ F.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/hide-active.xpm b/Zukitwo-Wise/xfwm4/hide-active.xpm
deleted file mode 100644
index 5a2d710..0000000
--- a/Zukitwo-Wise/xfwm4/hide-active.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #B6B6B6",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #828282",
-"P 	c #5E5E5E",
-"Q 	c #838383",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F5F5F5",
-"Y 	c #8C8C8C",
-"Z 	c #5A5A5A",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #F2F2F2",
-"#.	c #7E7E7E",
-"$.	c #4F4F4F",
-"%.	c #DDDDDC",
-"&.	c #DDDCDC",
-"*.	c #DBDBDC",
-"=.	c #DCDBDB",
-"-.	c #F0F0F0",
-";.	c #D7D7D7",
-">.	c #DCDBDC",
-",.	c #DCDCDC",
-"'.	c #DBDBDA",
-").	c #DADBDA",
-"!.	c #D9D9D9",
-"~.	c #DBDADA",
-"{.	c #DBDBDB",
-"].	c #DADADA",
-"^.	c #D9DADA",
-"/.	c #DAD9DA",
-"(.	c #D8D8D8",
-"_.	c #DADAD9",
-":.	c #D9D9D8",
-"<.	c #BABABA",
-"[.	c #B9B9B9",
-"}.	c #D8D9D8",
-"|.	c #D8D8D9",
-"1.	c #B8B8B8",
-"2.	c #D8D7D7",
-"3.	c #D9D8D8",
-"4.	c #D7D8D8",
-"5.	c #B7B7B7",
-"6.	c #BEBEBE",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #B5B5B5",
-"d.	c #B0B0B0",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H I B H H H B I H H H J / 2 a K A ",
-"L z z 2 M ! N N + O P { N { P Q + N N [ R S T L z ",
-"z U V { W = # # # X Y Z I Z Y X # # # = W { U w w ",
-"`  ...+.M A [ [ [ [ @.#.$.#.@.[ [ [ [ A M +.%.%.&.",
-"*.*.=.F y B f f f f q -.Q -.q f f f f B / ;.>.,.,.",
-"'.).'.!.e ] G G G G G f X f G G G G G t e !.'.~.{.",
-"].].^./.(.W B ,.,.,.,.,.,.,.,.,.,.,.B W !.!.]._.].",
-"!.:.!.!.{.C <.;.].].].].].].].].].;.[.C ].!.!./.!.",
-"}.|.(.(.;.,.e 1.S ;.;.;.;.;.;.;.C 1.e ,.2.(.(.3.(.",
-";.4.;.2.;.;.z C 5.6.e 2 B 2 e 6.5.S z 2.7.;.(.8.;.",
-"F 9.9.0.a.b.F ,.G C 6.c.d.c.6.C G ,.9.e.;.e.F 9.9.",
-"f.f.g.B h.B g.i.F *.j.k.[ q l.=.a.h.i.m.f.h.f.F F ",
-"n.B o.p.+.q.p.r.B r.r.B r.q.B B p.B q.+.B q.p.B B ",
-"s.t.+.u.+.+.t.+.v.u.+.+.w.t.u.+.s.+.+.+.v.+.+.+.+.",
-"_ _ r _ x.r r _ x._ _ x._ y.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/hide-inactive.xpm b/Zukitwo-Wise/xfwm4/hide-inactive.xpm
deleted file mode 100644
index 26497c8..0000000
--- a/Zukitwo-Wise/xfwm4/hide-inactive.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #D4D4D4",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #909090",
-"E 	c #737373",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #949494",
-"L 	c #717171",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #8A8A8A",
-"S 	c #676767",
-"T 	c #DDDCDD",
-"U 	c #DDDDDC",
-"V 	c #DDDCDC",
-"W 	c #DBDBDC",
-"X 	c #DCDBDB",
-"Y 	c #DCDCDB",
-"Z 	c #BDBDBD",
-"` 	c #8C8C8C",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #CACACA",
-"%.	c #DADADA",
-"&.	c #D9DADA",
-"*.	c #DAD9DA",
-"=.	c #D7D6D7",
-"-.	c #D8D8D8",
-";.	c #DADAD9",
-">.	c #D9D9D9",
-",.	c #D9D9D8",
-"'.	c #D8D9D8",
-").	c #D8D8D9",
-"!.	c #C6C7C7",
-"~.	c #D9D8D8",
-"{.	c #D7D8D8",
-"].	c #D8D7D7",
-"^.	c #D7D8D7",
-"/.	c #D8D8D7",
-"(.	c #D6D6D6",
-"_.	c #D6D7D6",
-":.	c #D7D6D6",
-"<.	c #D6D6D7",
-"[.	c #C8C8C8",
-"}.	c #BCBCBC",
-"|.	c #B3B3B3",
-"1.	c #D6D7D7",
-"2.	c #D6D5D5",
-"3.	c #D5D5D6",
-"4.	c #D5D5D5",
-"5.	c #D6D5D6",
-"6.	c #D6D6D5",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D5D4D5",
-"a.	c #D4D5D5",
-"b.	c #D5D5D4",
-"c.	c #D4D4D5",
-"d.	c #D4D3D3",
-"e.	c #D3D4D4",
-"f.	c #D4D3D4",
-"g.	c #D4D4D3",
-"h.	c #D3D3D4",
-"i.	c #D3D3D3",
-"j.	c #D2D3D3",
-"k.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = k z = = = z k = = = b y x A B c ",
-"C t t t | s = = ! D E z = z E D ! = = s 0 t F C t ",
-"t G H I J ! = = = ^ K L y L K ^ = = = ! M I G N N ",
-"O P Q u 0 s = = = = 5 R S R 5 = = = = s 0 T U U V ",
-"W W X Y Z b = = = = = s ` s = = = = = b Z v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w $.j ..@.j ",
-"%.%.&.*.=.0 u = = = = = = = = = = = v } -.%.%.;.%.",
-">.,.>.>.>.l k p = = = = = = = = = p i < >.>.>.*.>.",
-"'.).-.-.-.-.a i j = = = = = = = j k !.-.~.-.-.~.-.",
-"b {.b ].b b ].$.0 a b s = s b d 0 $.^.]./.b -.^.b ",
-"(._._.:.<.=.(.(.z [.}.| |.| }.[.z _._.1.b 1.(._._.",
-"2.2.3.4.5.4.3.6.4.3.7.8.(.5.8.2.3.5.6.8.2.5.2.(.(.",
-"9.4.0.a.z b.a.c.4.c.c.4.c.b.4.4.a.4.b.z 4.b.a.4.4.",
-"d.e.z f.z z e.z g.f.z z h.e.f.z d.z z z g.z z z z ",
-"i.i.j.i.k.j.j.i.k.i.i.k.i.r j.i.i.i.i.i.i.i.i.i.i."};
diff --git a/Zukitwo-Wise/xfwm4/hide-prelight.xpm b/Zukitwo-Wise/xfwm4/hide-prelight.xpm
deleted file mode 100644
index 9005b12..0000000
--- a/Zukitwo-Wise/xfwm4/hide-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #BCBCBC",
-"I 	c #DDDDDD",
-"J 	c #E0DFE0",
-"K 	c #DEDFDE",
-"L 	c #F5F5F5",
-"M 	c #F4F4F4",
-"N 	c #858585",
-"O 	c #5F5F5F",
-"P 	c #DCDCDC",
-"Q 	c #868686",
-"R 	c #BDBDBD",
-"S 	c #D0D0D0",
-"T 	c #DEDFDF",
-"U 	c #DDDEDD",
-"V 	c #DDDEDE",
-"W 	c #BBBBBB",
-"X 	c #F1F1F1",
-"Y 	c #F3F3F3",
-"Z 	c #8D8D8D",
-"` 	c #5B5B5B",
-" .	c #BEBEBE",
-"..	c #DCDDDC",
-"+.	c #DCDDDD",
-"@.	c #DCDCDD",
-"#.	c #D4D4D4",
-"$.	c #EBEBEB",
-"%.	c #F7F7F7",
-"&.	c #7F7F7F",
-"*.	c #4F4F4F",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #838383",
-"'.	c #D7D7D7",
-").	c #DCDBDC",
-"!.	c #DBDBDA",
-"~.	c #DADBDA",
-"{.	c #D9D9D9",
-"].	c #CBCBCB",
-"^.	c #DBDADA",
-"/.	c #DBDBDB",
-"(.	c #DADADA",
-"_.	c #D9DADA",
-":.	c #DAD9DA",
-"<.	c #D8D8D8",
-"[.	c #DADAD9",
-"}.	c #D9D9D8",
-"|.	c #CFCFCF",
-"1.	c #D8D9D8",
-"2.	c #D8D8D9",
-"3.	c #BABABA",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #B7B7B7",
-"8.	c #D8D8D7",
-"9.	c #D7D8D7",
-"0.	c #D6D7D6",
-"a.	c #D7D6D6",
-"b.	c #D6D6D7",
-"c.	c #D7D6D7",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e H I e e e I H e e e [ / 2 a J C ",
-"K B B 2 H l L L M N O P L P O Q M L L n R S T K B ",
-"B U V { W X Y Y Y z Z `  .` Z z Y Y Y X W { U w w ",
-"..+.@.#.H $.X X X X %.&.*.&.%.X X X X $.H #.=.=.-.",
-";.;.>.c x G l l l l l M ,.L l l l l l C / '.).P P ",
-"!.~.!.{.g ].y y y y y y f y y y y y y g g {.!.^./.",
-"(.(._.:.<.W 8 A A A A A A A A A A A 8 W {.{.(.[.(.",
-"{.}.{.{./.|.H = $.$.$.$.$.$.$.$.$.= W |.(.{.{.:.{.",
-"1.2.<.<.'.P g 3.G d d d d d d d B 3.g P 4.<.<.5.<.",
-"'.6.'.4.'.'.B |.7.E '.s + s '.E 7.S B 4.8.'.<.9.'.",
-"c 0.0.a.b.c.c P G |. .d.e.d. .|.G P 0.f.'.f.c 0.0.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.b.i.j.n.g.i.g.c c ",
-"o.D p.q.#.r.q.s.D s.s.D s.r.D D q.D r.#.D r.q.D D ",
-"t.u.#.v.#.#.u.#.w.v.#.#.x.u.v.#.t.#.#.#.w.#.#.#.#.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/hide-pressed.xpm b/Zukitwo-Wise/xfwm4/hide-pressed.xpm
deleted file mode 100644
index dfa85c7..0000000
--- a/Zukitwo-Wise/xfwm4/hide-pressed.xpm
+++ /dev/null
@@ -1,185 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"25 26 156 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #B8B8B8",
-"R 	c #E0DFE0",
-"S 	c #DEDFDE",
-"T 	c #D4D4D4",
-"U 	c #7E7E7E",
-"V 	c #5C5C5C",
-"W 	c #C1C1C1",
-"X 	c #7F7F7F",
-"Y 	c #D0D0D0",
-"Z 	c #DEDFDF",
-"` 	c #DDDEDD",
-" .	c #DDDEDE",
-"..	c #D7D7D7",
-"+.	c #D8D8D8",
-"@.	c #F0F0F0",
-"#.	c #8C8C8C",
-"$.	c #595959",
-"%.	c #ACACAC",
-"&.	c #DCDDDC",
-"*.	c #DCDDDD",
-"=.	c #DCDCDD",
-"-.	c #DADADA",
-";.	c #EFEFEF",
-">.	c #4F4F4F",
-",.	c #DDDDDC",
-"'.	c #DDDCDC",
-").	c #DBDBDC",
-"!.	c #DCDBDB",
-"~.	c #DCDCDC",
-"{.	c #DDDDDD",
-"].	c #EEEEEE",
-"^.	c #838383",
-"/.	c #DCDBDC",
-"(.	c #DBDBDA",
-"_.	c #DADBDA",
-":.	c #D9D9D9",
-"<.	c #F5F5F5",
-"[.	c #DBDADA",
-"}.	c #DBDBDB",
-"|.	c #D9DADA",
-"1.	c #DAD9DA",
-"2.	c #DADAD9",
-"3.	c #D9D9D8",
-"4.	c #D8D9D8",
-"5.	c #D8D8D9",
-"6.	c #D8D7D7",
-"7.	c #D9D8D8",
-"8.	c #D7D8D8",
-"9.	c #D8D8D7",
-"0.	c #D7D8D7",
-"a.	c #D6D7D6",
-"b.	c #D7D6D6",
-"c.	c #D6D6D7",
-"d.	c #D7D6D7",
-"e.	c #D6D7D7",
-"f.	c #D6D5D5",
-"g.	c #D5D5D6",
-"h.	c #D6D5D6",
-"i.	c #D6D6D5",
-"j.	c #E0E1E1",
-"k.	c #E2E3E2",
-"l.	c #E0E1E0",
-"m.	c #D5D6D5",
-"n.	c #D4D5D4",
-"o.	c #D5D4D5",
-"p.	c #D4D5D5",
-"q.	c #D5D5D4",
-"r.	c #D4D4D5",
-"s.	c #D4D3D3",
-"t.	c #D3D4D4",
-"u.	c #D4D3D4",
-"v.	c #D4D4D3",
-"w.	c #D3D3D4",
-"x.	c #D3D2D3",
-"y.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ q 3 _ _ _ 3 q _ _ _ E Q 2 d R H ",
-"S G G 2 O { I I T U V W I W V X T I I 2 O Y Z S G ",
-"G `  .{ i ..+.+.+.@.#.$.%.$.#.@.+.+.+...i { ` B B ",
-"&.*.=.T W +.-.-.-.-.;.U >.U ;.-.-.-.-...r T ,.,.'.",
-").).!.M P I ~.~.~.~.{.].^.;.{.~.~.~.~.I P ../.~.~.",
-"(._.(.:.2 Y G G G G G H <.H G G G G G 2 2 :.(.[.}.",
-"-.-.|.1.:.F {.H H H H H H H H H H H ~.F :.:.-.2.-.",
-":.3.:.:.}.:.I m x x x x x x x x x m T :.-.:.:.1.:.",
-"4.5.+.+...~.}.+.x [ [ [ [ [ [ [ x +.}.~.6.+.+.7.+.",
-"..8...6.....G G ~.H a ! = ! a H ~.G G 6.9...+.0...",
-"M a.a.b.c.d.M ~.m x m m m m m x m ~.a.e...e.M a.a.",
-"f.f.g.I h.I g.i.M ).j.k.[ x l.!.c.h.i.m.f.h.f.M M ",
-"n.I o.p.T q.p.r.I r.r.I r.q.I I p.I q.T I q.p.I I ",
-"s.t.T u.T T t.T v.u.T T w.t.u.T s.T T T v.T T T T ",
-"_ _ y _ x.y y _ x._ _ x._ y.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/left-active.png b/Zukitwo-Wise/xfwm4/left-active.png
deleted file mode 100644
index 359e638..0000000
--- a/Zukitwo-Wise/xfwm4/left-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/left-active.xpm b/Zukitwo-Wise/xfwm4/left-active.xpm
deleted file mode 100644
index 25adb73..0000000
--- a/Zukitwo-Wise/xfwm4/left-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wise/xfwm4/left-inactive.png b/Zukitwo-Wise/xfwm4/left-inactive.png
deleted file mode 100644
index 7c05110..0000000
--- a/Zukitwo-Wise/xfwm4/left-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/left-inactive.xpm b/Zukitwo-Wise/xfwm4/left-inactive.xpm
deleted file mode 100644
index 77a59e9..0000000
--- a/Zukitwo-Wise/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #D2D2D2",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wise/xfwm4/maximize-active.xpm b/Zukitwo-Wise/xfwm4/maximize-active.xpm
deleted file mode 100644
index 7edaa3f..0000000
--- a/Zukitwo-Wise/xfwm4/maximize-active.xpm
+++ /dev/null
@@ -1,182 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"25 26 153 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #F1F1F1",
-"d 	c #F4F4F4",
-"e 	c #CACACA",
-"f 	c #E1E1E1",
-"g 	c #E4E3E3",
-"h 	c #E3E3E2",
-"i 	c #C7C7C7",
-"j 	c #EBEBEB",
-"k 	c #F6F6F6",
-"l 	c #EAEAEA",
-"m 	c #E2E3E3",
-"n 	c #E3E2E3",
-"o 	c #E2E2E1",
-"p 	c #E2E1E2",
-"q 	c #E2E2E2",
-"r 	c #D2D3D3",
-"s 	c #C4C4C4",
-"t 	c #C5C5C5",
-"u 	c #EFEFEF",
-"v 	c #F3F3F3",
-"w 	c #DEDEDD",
-"x 	c #C8C8C8",
-"y 	c #BFBFBF",
-"z 	c #DEDEDE",
-"A 	c #E0E0E0",
-"B 	c #D5D5D5",
-"C 	c #CFCFCF",
-"D 	c #EEEEEE",
-"E 	c #CECECE",
-"F 	c #D6D6D6",
-"G 	c #DFDFDF",
-"H 	c #ECECEC",
-"I 	c #7E7E7E",
-"J 	c #DDDDDD",
-"K 	c #E0DFE0",
-"L 	c #DEDFDE",
-"M 	c #BCBCBC",
-"N 	c #E9E9E9",
-"O 	c #797979",
-"P 	c #4F4F4F",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #787878",
-"X 	c #646464",
-"Y 	c #D7D7D7",
-"Z 	c #636363",
-"` 	c #DCDDDC",
-" .	c #DCDDDD",
-"..	c #DCDCDD",
-"+.	c #D4D4D4",
-"@.	c #7F7F7F",
-"#.	c #5F5F5F",
-"$.	c #DDDDDC",
-"%.	c #DDDCDC",
-"&.	c #DBDBDC",
-"*.	c #DCDBDB",
-"=.	c #DCDBDC",
-"-.	c #DCDCDC",
-";.	c #DBDBDA",
-">.	c #DADBDA",
-",.	c #D9D9D9",
-"'.	c #DBDADA",
-").	c #DBDBDB",
-"!.	c #DADADA",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #D8D8D8",
-"^.	c #DADAD9",
-"/.	c #D9D9D8",
-"(.	c #BABABA",
-"_.	c #B9B9B9",
-":.	c #D8D9D8",
-"<.	c #D8D8D9",
-"[.	c #B8B8B8",
-"}.	c #D8D7D7",
-"|.	c #D9D8D8",
-"1.	c #D7D8D8",
-"2.	c #B7B7B7",
-"3.	c #BEBEBE",
-"4.	c #D8D8D7",
-"5.	c #D7D8D7",
-"6.	c #D6D7D6",
-"7.	c #D7D6D6",
-"8.	c #D6D6D7",
-"9.	c #D7D6D7",
-"0.	c #B5B5B5",
-"a.	c #B0B0B0",
-"b.	c #D6D7D7",
-"c.	c #D6D5D5",
-"d.	c #D5D5D6",
-"e.	c #D6D5D6",
-"f.	c #D6D6D5",
-"g.	c #E0E1E1",
-"h.	c #E2E3E2",
-"i.	c #E0E1E0",
-"j.	c #D5D6D5",
-"k.	c #D4D5D4",
-"l.	c #D5D4D5",
-"m.	c #D4D5D5",
-"n.	c #D5D5D4",
-"o.	c #D4D4D5",
-"p.	c #D4D3D3",
-"q.	c #D3D4D4",
-"r.	c #D4D3D4",
-"s.	c #D4D4D3",
-"t.	c #D3D3D4",
-"u.	c #D3D2D3",
-"v.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / _ = c d c = _ / 4 e f g 0 9 [ [ ",
-"8 h h h f e 3 i j k k k k k k k l i 3 e ~ 8 m n h ",
-"o p p q r s t u v v v v v v v v v u t s _ o q q q ",
-"f f f w x y + c c c c c c c c c c c # y x z f f f ",
-"A A A B t C D D D D D D D D D D D D D E t F A A A ",
-"G G G 2 / z H H H H H ! I = H H H H H J / 2 a K A ",
-"L z z 2 M ! N N N N = O P O = N N N N [ Q R S L z ",
-"z T U { V = # # # q W X Y Z W q # # # = V { T w w ",
-"`  ...+.M A [ [ 8 @.#.q l q #.@.8 [ [ A M +.$.$.%.",
-"&.&.*.F y B f f f V q ! f ! q V f f f B / Y =.-.-.",
-";.>.;.,.e ] G G G l [ G G G [ l G G G t e ,.;.'.).",
-"!.!.~.{.].V B -.-.-.-.-.-.-.-.-.-.-.B V ,.,.!.^.!.",
-",./.,.,.).C (.Y !.!.!.!.!.!.!.!.!.Y _.C !.,.,.{.,.",
-":.<.].].Y -.e [.R Y Y Y Y Y Y Y C [.e -.}.].].|.].",
-"Y 1.Y }.Y Y z C 2.3.e 2 B 2 e 3.2.R z }.4.Y ].5.Y ",
-"F 6.6.7.8.9.F -.G C 3.0.a.0.3.C G -.6.b.Y b.F 6.6.",
-"c.c.d.B e.B d.f.F &.g.h.[ q i.*.8.e.f.j.c.e.c.F F ",
-"k.B l.m.+.n.m.o.B o.o.B o.n.B B m.B n.+.B n.m.B B ",
-"p.q.+.r.+.+.q.+.s.r.+.+.t.q.r.+.p.+.+.+.s.+.+.+.+.",
-"_ _ r _ u.r r _ u._ _ u._ v.r _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/maximize-inactive.xpm b/Zukitwo-Wise/xfwm4/maximize-inactive.xpm
deleted file mode 100644
index 7d1e9b3..0000000
--- a/Zukitwo-Wise/xfwm4/maximize-inactive.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"25 26 141 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E1E1E0",
-"< 	c #CDCDCD",
-"[ 	c #BFBFBF",
-"} 	c #B8B8B8",
-"| 	c #B6B6B6",
-"1 	c #CECECE",
-"2 	c #E2E2E1",
-"3 	c #E4E4E5",
-"4 	c #E5E5E4",
-"5 	c #E3E3E3",
-"6 	c #E3E4E4",
-"7 	c #E4E4E3",
-"8 	c #E4E3E3",
-"9 	c #D2D2D2",
-"0 	c #B7B7B7",
-"a 	c #C6C6C6",
-"b 	c #D7D7D7",
-"c 	c #E0E0E0",
-"d 	c #C5C5C5",
-"e 	c #D3D2D2",
-"f 	c #E3E3E4",
-"g 	c #E3E3E2",
-"h 	c #CBCCCC",
-"i 	c #BBBBBB",
-"j 	c #DBDBDB",
-"k 	c #BABABA",
-"l 	c #CCCCCC",
-"m 	c #E3E2E3",
-"n 	c #E2E3E3",
-"o 	c #E2E1E2",
-"p 	c #E2E2E2",
-"q 	c #E1E2E2",
-"r 	c #D3D3D2",
-"s 	c #E1E1E1",
-"t 	c #DEDEDE",
-"u 	c #DDDDDD",
-"v 	c #DCDCDC",
-"w 	c #C4C4C4",
-"x 	c #DFDFDF",
-"y 	c #BEBEBE",
-"z 	c #8C8C8C",
-"A 	c #E0DFDF",
-"B 	c #E0DFE0",
-"C 	c #DEDFDE",
-"D 	c #8A8A8A",
-"E 	c #676767",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #B3B3B4",
-"K 	c #777777",
-"L 	c #CACACA",
-"M 	c #B4B4B4",
-"N 	c #DEDEDD",
-"O 	c #DCDDDC",
-"P 	c #DCDDDD",
-"Q 	c #DCDCDD",
-"R 	c #909090",
-"S 	c #737373",
-"T 	c #D4D4D4",
-"U 	c #DDDCDD",
-"V 	c #DDDDDC",
-"W 	c #DDDCDC",
-"X 	c #DBDBDC",
-"Y 	c #DCDBDB",
-"Z 	c #DCDCDB",
-"` 	c #BDBDBD",
-" .	c #DCDBDC",
-"..	c #DBDBDA",
-"+.	c #DADBDA",
-"@.	c #DBDADA",
-"#.	c #C9C9C9",
-"$.	c #DADADA",
-"%.	c #D9DADA",
-"&.	c #DAD9DA",
-"*.	c #D7D6D7",
-"=.	c #D8D8D8",
-"-.	c #DADAD9",
-";.	c #D9D9D9",
-">.	c #D9D9D8",
-",.	c #D8D9D8",
-"'.	c #D8D8D9",
-").	c #C6C7C7",
-"!.	c #D9D8D8",
-"~.	c #D7D8D8",
-"{.	c #D8D7D7",
-"].	c #D7D8D7",
-"^.	c #D8D8D7",
-"/.	c #D6D6D6",
-"(.	c #D6D7D6",
-"_.	c #D7D6D6",
-":.	c #D6D6D7",
-"<.	c #C8C8C8",
-"[.	c #BCBCBC",
-"}.	c #B3B3B3",
-"|.	c #D6D7D7",
-"1.	c #D6D5D5",
-"2.	c #D5D5D6",
-"3.	c #D5D5D5",
-"4.	c #D6D5D6",
-"5.	c #D6D6D5",
-"6.	c #D5D6D6",
-"7.	c #D5D6D5",
-"8.	c #D4D5D4",
-"9.	c #D5D4D5",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : < [ } | } [ 1 2 _ _ _ 3 _ 3 ( 4 ",
-"5 ^ 6 7 7 8 6 9 0 a b c 5 c b d 0 e f ^ 8 7 6 ^ ^ ",
-"5 g g g 5 5 h i j = = = = = = = j k l 5 m 5 n m g ",
-"2 o o p q 9 k p = = = = = = = = = p i r p 2 p p p ",
-"s s s : t 0 u = = = = = = = = = = = v 0 t s s s s ",
-"c c c c l d = = = = = = = = = = = = = w < c c c c ",
-"x x x x y b = = = = = s z s = = = = = b y x A B c ",
-"C t t t | s = = = = 5 D E D 5 = = = = s 0 t F C t ",
-"t G H I J ! = = = p D K L K D p = = = ! M I G N N ",
-"O P Q u 0 s = = ! R S T = T S R ! = = s 0 U V V W ",
-"X X Y Z ` b = = = k T = = = T k = = = b ` v  .v v ",
-"..+...@.#.d = = = = = = = = = = = = = w L j ..@.j ",
-"$.$.%.&.*.0 u = = = = = = = = = = = v } =.$.$.-.$.",
-";.>.;.;.;.l k p = = = = = = = = = p i < ;.;.;.&.;.",
-",.'.=.=.=.=.a i j = = = = = = = j k ).=.!.=.=.!.=.",
-"b ~.b {.b b {.L 0 a b s = s b d 0 L ].{.^.b =.].b ",
-"/.(.(._.:.*././.T <.[.| }.| [.<.T (.(.|.b |./.(.(.",
-"1.1.2.3.4.3.2.5.3.2.6.7./.4.7.1.2.4.5.7.1.4.1././.",
-"8.3.9.0.T a.0.b.3.b.b.3.b.a.3.3.0.3.a.T 3.a.0.3.3.",
-"c.d.T e.T T d.T f.e.T T g.d.e.T c.T T T f.T T T T ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.r i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Wise/xfwm4/maximize-prelight.xpm b/Zukitwo-Wise/xfwm4/maximize-prelight.xpm
deleted file mode 100644
index 8e7f163..0000000
--- a/Zukitwo-Wise/xfwm4/maximize-prelight.xpm
+++ /dev/null
@@ -1,186 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"25 26 157 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #C2C2C2",
-"4 	c #C1C1C1",
-"5 	c #E5E4E4",
-"6 	c #E4E4E5",
-"7 	c #E5E5E4",
-"8 	c #E3E3E3",
-"9 	c #E3E4E4",
-"0 	c #E4E4E3",
-"a 	c #E0DFDF",
-"b 	c #C9CACA",
-"c 	c #D6D6D6",
-"d 	c #EAEAEA",
-"e 	c #F6F6F6",
-"f 	c #FAFAFA",
-"g 	c #CACACA",
-"h 	c #E1E1E1",
-"i 	c #E4E3E3",
-"j 	c #E3E3E2",
-"k 	c #C8C8C8",
-"l 	c #F0F0F0",
-"m 	c #FCFCFC",
-"n 	c #EFEFEF",
-"o 	c #E2E3E3",
-"p 	c #E3E2E3",
-"q 	c #E2E2E1",
-"r 	c #E2E1E2",
-"s 	c #E2E2E2",
-"t 	c #D2D3D3",
-"u 	c #C4C4C4",
-"v 	c #FBFBFB",
-"w 	c #DEDEDD",
-"x 	c #BFBFBF",
-"y 	c #EEEEEE",
-"z 	c #F9F9F9",
-"A 	c #EDEDED",
-"B 	c #DEDEDE",
-"C 	c #E0E0E0",
-"D 	c #D5D5D5",
-"E 	c #C5C5C5",
-"F 	c #F8F8F8",
-"G 	c #DFDFDF",
-"H 	c #808080",
-"I 	c #E0DFE0",
-"J 	c #DEDFDE",
-"K 	c #BCBCBC",
-"L 	c #F5F5F5",
-"M 	c #F2F2F2",
-"N 	c #7C7C7C",
-"O 	c #4F4F4F",
-"P 	c #7D7D7D",
-"Q 	c #BDBDBD",
-"R 	c #D0D0D0",
-"S 	c #DEDFDF",
-"T 	c #DDDEDD",
-"U 	c #DDDEDE",
-"V 	c #BBBBBB",
-"W 	c #F1F1F1",
-"X 	c #F3F3F3",
-"Y 	c #656565",
-"Z 	c #D7D7D7",
-"` 	c #636363",
-" .	c #DCDDDC",
-"..	c #DCDDDD",
-"+.	c #DCDCDD",
-"@.	c #D4D4D4",
-"#.	c #EBEBEB",
-"$.	c #828282",
-"%.	c #606060",
-"&.	c #F4F4F4",
-"*.	c #838383",
-"=.	c #DDDDDC",
-"-.	c #DDDCDC",
-";.	c #DBDBDC",
-">.	c #DCDBDB",
-",.	c #DCDBDC",
-"'.	c #DCDCDC",
-").	c #DBDBDA",
-"!.	c #DADBDA",
-"~.	c #D9D9D9",
-"{.	c #CBCBCB",
-"].	c #DBDADA",
-"^.	c #DBDBDB",
-"/.	c #DADADA",
-"(.	c #D9DADA",
-"_.	c #DAD9DA",
-":.	c #D8D8D8",
-"<.	c #DADAD9",
-"[.	c #D9D9D8",
-"}.	c #CFCFCF",
-"|.	c #D8D9D8",
-"1.	c #D8D8D9",
-"2.	c #BABABA",
-"3.	c #D8D7D7",
-"4.	c #D9D8D8",
-"5.	c #D7D8D8",
-"6.	c #B7B7B7",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #BEBEBE",
-"d.	c #B5B5B5",
-"e.	c #B0B0B0",
-"f.	c #D6D7D7",
-"g.	c #D6D5D5",
-"h.	c #D5D5D6",
-"i.	c #D6D5D6",
-"j.	c #D6D6D5",
-"k.	c #E0E1E1",
-"l.	c #E2E3E2",
-"m.	c #E0E1E0",
-"n.	c #D5D6D5",
-"o.	c #D4D5D4",
-"p.	c #D5D4D5",
-"q.	c #D4D5D5",
-"r.	c #D5D5D4",
-"s.	c #D4D4D5",
-"t.	c #D4D3D3",
-"u.	c #D3D4D4",
-"v.	c #D4D3D4",
-"w.	c #D4D4D3",
-"x.	c #D3D3D4",
-"y.	c #D3D2D3",
-"z.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 / / / / / 4 3 2 1 5 6 5 6 | 7 ",
-"8 [ 9 0 0 a b 4 / c d e f e d c / 4 g h i 0 9 [ [ ",
-"8 j j j h g 3 k l m m m m m m m n k 3 g ~ 8 o p j ",
-"q r r s t u ] e v v v v v v v v v e ] u _ q s s s ",
-"h h h w k x y z z z z z z z z z z z A x k B h h h ",
-"C C C D E _ F F F F F F F F F F F F F { E c C C C ",
-"G G G 2 / ! e e e e e n H l e e e e e [ / 2 a I C ",
-"J B B 2 K l L L L L M N O P M L L L L n Q R S J B ",
-"B T U { V W X X X A N Y Z ` N A X X X W V { T w w ",
-" ...+.@.K #.W W l $.%.8 &.8 %.*.l W W #.K @.=.=.-.",
-";.;.>.c x G l l l x 8 M l M 8 x l l l C / Z ,.'.'.",
-").!.).~.g {.y y y &.l y y y l &.y y y g g ~.).].^.",
-"/./.(._.:.V 8 A A A A A A A A A A A 8 V ~.~./.<./.",
-"~.[.~.~.^.}.K = #.#.#.#.#.#.#.#.#.= V }./.~.~._.~.",
-"|.1.:.:.Z '.g 2.G d d d d d d d B 2.g '.3.:.:.4.:.",
-"Z 5.Z 3.Z Z B }.6.E Z s + s Z E 6.R B 3.7.Z :.8.Z ",
-"c 9.9.0.a.b.c '.G }.c.d.e.d.c.}.G '.9.f.Z f.c 9.9.",
-"g.g.h.D i.D h.j.c ;.k.l.[ s m.>.a.i.j.n.g.i.g.c c ",
-"o.D p.q.@.r.q.s.D s.s.D s.r.D D q.D r.@.D r.q.D D ",
-"t.u.@.v.@.@.u.@.w.v.@.@.x.u.v.@.t.@.@.@.w.@.@.@.@.",
-"_ _ t _ y.t t _ y._ _ y._ z.t _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/maximize-pressed.xpm b/Zukitwo-Wise/xfwm4/maximize-pressed.xpm
deleted file mode 100644
index 762ac9c..0000000
--- a/Zukitwo-Wise/xfwm4/maximize-pressed.xpm
+++ /dev/null
@@ -1,183 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"25 26 154 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E1E0E1",
-"{ 	c #D2D2D2",
-"] 	c #C6C6C6",
-"^ 	c #C1C2C1",
-"/ 	c #C0C0C0",
-"( 	c #C2C2C1",
-"_ 	c #D3D3D3",
-": 	c #E0E0E1",
-"< 	c #E5E6E6",
-"[ 	c #E4E4E4",
-"} 	c #E4E5E4",
-"| 	c #E4E5E5",
-"1 	c #E3E2E2",
-"2 	c #D1D1D1",
-"3 	c #BFBFBF",
-"4 	c #AEAEAE",
-"5 	c #A1A1A1",
-"6 	c #9B9B9B",
-"7 	c #9A9A9A",
-"8 	c #E5E4E4",
-"9 	c #E4E4E5",
-"0 	c #E5E5E4",
-"a 	c #E3E3E3",
-"b 	c #E3E4E4",
-"c 	c #E4E4E3",
-"d 	c #E0DFDF",
-"e 	c #C9CACA",
-"f 	c #B4B4B4",
-"g 	c #9F9F9F",
-"h 	c #ABABAB",
-"i 	c #BBBBBB",
-"j 	c #C3C3C3",
-"k 	c #B5B5B5",
-"l 	c #CACACA",
-"m 	c #E1E1E1",
-"n 	c #E4E3E3",
-"o 	c #E3E3E2",
-"p 	c #B3B3B3",
-"q 	c #A5A5A5",
-"r 	c #C2C2C2",
-"s 	c #CBCBCB",
-"t 	c #E2E3E3",
-"u 	c #E3E2E3",
-"v 	c #E2E2E1",
-"w 	c #E2E1E2",
-"x 	c #E2E2E2",
-"y 	c #D2D3D3",
-"z 	c #A9A9A9",
-"A 	c #CDCDCD",
-"B 	c #DEDEDD",
-"C 	c #C7C7C7",
-"D 	c #AAAAAA",
-"E 	c #C8C8C8",
-"F 	c #CFCFCF",
-"G 	c #DEDEDE",
-"H 	c #E0E0E0",
-"I 	c #D5D5D5",
-"J 	c #BDBDBD",
-"K 	c #BABABA",
-"L 	c #B9B9B9",
-"M 	c #D6D6D6",
-"N 	c #DFDFDF",
-"O 	c #B7B7B7",
-"P 	c #C9C9C9",
-"Q 	c #CECECE",
-"R 	c #767676",
-"S 	c #B8B8B8",
-"T 	c #E0DFE0",
-"U 	c #DEDFDE",
-"V 	c #747474",
-"W 	c #4F4F4F",
-"X 	c #D0D0D0",
-"Y 	c #DEDFDF",
-"Z 	c #DDDEDD",
-"` 	c #DDDEDE",
-" .	c #D7D7D7",
-"..	c #D8D8D8",
-"+.	c #646464",
-"@.	c #636363",
-"#.	c #DCDDDC",
-"$.	c #DCDDDD",
-"%.	c #DCDCDD",
-"&.	c #D4D4D4",
-"*.	c #C1C1C1",
-"=.	c #DADADA",
-"-.	c #D9D9D9",
-";.	c #7B7B7B",
-">.	c #5F5F5F",
-",.	c #7C7C7C",
-"'.	c #DDDDDC",
-").	c #DDDCDC",
-"!.	c #DBDBDC",
-"~.	c #DCDBDB",
-"{.	c #DCDCDC",
-"].	c #DCDBDC",
-"^.	c #DBDBDA",
-"/.	c #DADBDA",
-"(.	c #E9E9E9",
-"_.	c #DBDADA",
-":.	c #DBDBDB",
-"<.	c #D9DADA",
-"[.	c #DAD9DA",
-"}.	c #DDDDDD",
-"|.	c #DADAD9",
-"1.	c #D9D9D8",
-"2.	c #D8D9D8",
-"3.	c #D8D8D9",
-"4.	c #D8D7D7",
-"5.	c #D9D8D8",
-"6.	c #D7D8D8",
-"7.	c #D8D8D7",
-"8.	c #D7D8D7",
-"9.	c #D6D7D6",
-"0.	c #D7D6D6",
-"a.	c #D6D6D7",
-"b.	c #D7D6D7",
-"c.	c #D6D7D7",
-"d.	c #D6D5D5",
-"e.	c #D5D5D6",
-"f.	c #D6D5D6",
-"g.	c #D6D6D5",
-"h.	c #E0E1E1",
-"i.	c #E2E3E2",
-"j.	c #E0E1E0",
-"k.	c #D5D6D5",
-"l.	c #D4D5D4",
-"m.	c #D5D4D5",
-"n.	c #D4D5D5",
-"o.	c #D5D5D4",
-"p.	c #D4D4D5",
-"q.	c #D4D3D3",
-"r.	c #D3D4D4",
-"s.	c #D4D3D4",
-"t.	c #D4D4D3",
-"u.	c #D3D3D4",
-"v.	c #D3D2D3",
-"w.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ { ] ^ / ( ] _ : ! < , ) ! < ' ) ",
-"[ [ } ! | [ 1 2 3 4 5 6 7 6 5 4 3 2 1 8 9 8 9 | 0 ",
-"a [ b c c d e f g h i j ] j i h g k l m n c b [ [ ",
-"a o o o m l p q r s s s s s s s r q p l ~ a t u o ",
-"v w w x y i z l A A A A A A A A A l z i _ v x x x ",
-"m m m B C D E F F F F F F F F F F F C h C G m m m ",
-"H H H I J K 2 2 2 2 2 2 2 2 2 2 2 2 2 L J M H H H ",
-"N N N 2 O P _ _ _ _ _ Q R F _ _ _ _ _ E S 2 d T H ",
-"U G G 2 O { I I I I _ V W V _ I I I I 2 O X Y U G ",
-"G Z ` { i  ......._ V +. .@.V _ ...... .i { Z B B ",
-"#.$.%.&.*...=.=.-.;.>.m x m >.,.-.=.=. .r &.'.'.).",
-"!.!.~.M P I {.{.{.i x m {.m x K {.{.{.I P  .].{.{.",
-"^./.^.-.2 X G G G (.a G G G a (.G G G 2 2 -.^._.:.",
-"=.=.<.[.-.F }.H H H H H H H H H H H {.F -.-.=.|.=.",
-"-.1.-.-.:.-.I m x x x x x x x x x m &.-.=.-.-.[.-.",
-"2.3..... .{.:...x [ [ [ [ [ [ [ x ..:.{.4.....5...",
-" .6. .4. . .G G {.H a ! = ! a H {.G G 4.7. ...8. .",
-"M 9.9.0.a.b.M {.m x m m m m m x m {.9.c. .c.M 9.9.",
-"d.d.e.I f.I e.g.M !.h.i.[ x j.~.a.f.g.k.d.f.d.M M ",
-"l.I m.n.&.o.n.p.I p.p.I p.o.I I n.I o.&.I o.n.I I ",
-"q.r.&.s.&.&.r.&.t.s.&.&.u.r.s.&.q.&.&.&.t.&.&.&.&.",
-"_ _ y _ v.y y _ v._ _ v._ w.y _ _ _ _ _ _ _ _ _ _ "};
diff --git a/Zukitwo-Wise/xfwm4/menu-active.xpm b/Zukitwo-Wise/xfwm4/menu-active.xpm
deleted file mode 100644
index a16eccb..0000000
--- a/Zukitwo-Wise/xfwm4/menu-active.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Wise/xfwm4/menu-inactive.xpm b/Zukitwo-Wise/xfwm4/menu-inactive.xpm
deleted file mode 100644
index f3a1968..0000000
--- a/Zukitwo-Wise/xfwm4/menu-inactive.xpm
+++ /dev/null
@@ -1,176 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"25 26 147 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D4D4D4",
-"t 	c #FDFDFD",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #F9F9F9",
-"D 	c #C9C9CA",
-"E 	c #DEDFDF",
-"F 	c #DDDEDD",
-"G 	c #DDDEDE",
-"H 	c #DEDDDD",
-"I 	c #DDDDDE",
-"J 	c #DDDDDD",
-"K 	c #C8C9C8",
-"L 	c #F5F5F5",
-"M 	c #C8C8C8",
-"N 	c #DEDEDD",
-"O 	c #DEDDDE",
-"P 	c #DCDDDC",
-"Q 	c #DCDDDD",
-"R 	c #DCDCDD",
-"S 	c #DDDDDC",
-"T 	c #DDDCDD",
-"U 	c #CDCDCE",
-"V 	c #F1F1F1",
-"W 	c #CECDCD",
-"X 	c #CFCFCE",
-"Y 	c #DDDCDC",
-"Z 	c #DBDBDC",
-"` 	c #DCDBDB",
-" .	c #DCDCDB",
-"..	c #DCDBDC",
-"+.	c #D6D6D5",
-"@.	c #C8C8C9",
-"#.	c #CBCACB",
-"$.	c #CBCBCA",
-"%.	c #C8C9C9",
-"&.	c #DCDCDC",
-"*.	c #DBDBDA",
-"=.	c #DADBDA",
-"-.	c #DBDADA",
-";.	c #D5D5D5",
-">.	c #CDCDCD",
-",.	c #C6C6C5",
-"'.	c #CCCDCD",
-").	c #D5D4D5",
-"!.	c #DADAD9",
-"~.	c #D9DADA",
-"{.	c #DAD9DA",
-"].	c #DAD9D9",
-"^.	c #D9D9D9",
-"/.	c #D9D9D8",
-"(.	c #D8D9D8",
-"_.	c #D8D8D9",
-":.	c #D8D8D8",
-"<.	c #D9D8D8",
-"[.	c #D8D9D9",
-"}.	c #D7D7D7",
-"|.	c #D7D8D8",
-"1.	c #D8D7D7",
-"2.	c #D7D8D7",
-"3.	c #D8D8D7",
-"4.	c #D6D7D6",
-"5.	c #D7D6D6",
-"6.	c #D6D6D7",
-"7.	c #D7D6D7",
-"8.	c #D6D7D7",
-"9.	c #D6D5D5",
-"0.	c #D5D5D6",
-"a.	c #D6D5D6",
-"b.	c #D5D6D6",
-"c.	c #D5D6D5",
-"d.	c #D4D5D4",
-"e.	c #D4D5D5",
-"f.	c #D5D5D4",
-"g.	c #D4D4D5",
-"h.	c #D4D3D3",
-"i.	c #D3D4D4",
-"j.	c #D4D3D4",
-"k.	c #D4D4D3",
-"l.	c #D3D3D4",
-"m.	c #D3D3D3",
-"n.	c #D2D3D3",
-"o.	c #D3D2D3",
-"p.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B + C C C C + D A x y w w x E w x ",
-"x F G H I H I J K ! L L L L ! M H I N O O H F N N ",
-"P Q R J S S T S l U V V V V W X R Y R T Y T S S Y ",
-"Z Z `  . . ...` +.@.#.x x $.%.m  ... .....&...&.&.",
-"*.=.*.-.g g g g k ;.>.,.,.'.).!.=.g g g g g *.-.g ",
-"k k ~.{.{.k {.k k ].k k !.!.].~.k k k k k k k !.k ",
-"^./.^.^.^.^.^.^.^.^./.^.^.^.^.^.^.^.^.^.^.^.^.{.^.",
-"(._.:.:.:.:.:.:._._.:.:.:.:.:.:.<._.[.:.<.:.:.<.:.",
-"}.|.}.1.}.}.1.1.2.2.}.}.}.}.}.}.}.}.2.1.3.}.:.2.}.",
-"m 4.4.5.6.7.m m m m 8.5.6.5.5.}.m 4.4.8.}.8.m 4.4.",
-"9.9.0.;.a.;.0.+.;.0.b.c.m a.c.9.0.a.+.c.9.a.9.m m ",
-"d.;.).e.s f.e.g.;.g.g.;.g.f.;.;.e.;.f.s ;.f.e.;.;.",
-"h.i.s j.s s i.s k.j.s s l.i.j.s h.s s s k.s s s s ",
-"m.m.n.m.o.n.n.m.o.m.m.o.m.p.n.m.m.m.m.m.m.m.m.m.m."};
diff --git a/Zukitwo-Wise/xfwm4/menu-prelight.xpm b/Zukitwo-Wise/xfwm4/menu-prelight.xpm
deleted file mode 100644
index 9fc47f5..0000000
--- a/Zukitwo-Wise/xfwm4/menu-prelight.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Wise/xfwm4/menu-pressed.xpm b/Zukitwo-Wise/xfwm4/menu-pressed.xpm
deleted file mode 100644
index 18c4b04..0000000
--- a/Zukitwo-Wise/xfwm4/menu-pressed.xpm
+++ /dev/null
@@ -1,171 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"25 26 142 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #E8E8E8",
-"@ 	c #E8E8E7",
-"# 	c #E7E7E7",
-"$ 	c #E7E7E8",
-"% 	c #E8E7E7",
-"& 	c #E7E8E7",
-"* 	c #E6E6E7",
-"= 	c #E6E6E6",
-"- 	c #E6E7E6",
-"; 	c #E7E7E6",
-"> 	c #E7E6E6",
-", 	c #E5E5E6",
-"' 	c #E5E6E5",
-") 	c #E6E5E5",
-"! 	c #E5E5E5",
-"~ 	c #E6E5E6",
-"{ 	c #E6E6E5",
-"] 	c #E5E6E6",
-"^ 	c #E4E4E4",
-"/ 	c #E4E5E4",
-"( 	c #E4E5E5",
-"_ 	c #E5E4E4",
-": 	c #E5E5E4",
-"< 	c #E5E4E5",
-"[ 	c #E4E4E5",
-"} 	c #E3E3E3",
-"| 	c #E3E4E4",
-"1 	c #E4E4E3",
-"2 	c #E4E3E3",
-"3 	c #E4E3E4",
-"4 	c #E3E3E4",
-"5 	c #E3E3E2",
-"6 	c #E2E3E3",
-"7 	c #E3E2E3",
-"8 	c #E2E3E2",
-"9 	c #E2E2E1",
-"0 	c #E2E1E2",
-"a 	c #E2E2E2",
-"b 	c #E1E2E2",
-"c 	c #E1E1E1",
-"d 	c #E1E1E0",
-"e 	c #E0E1E1",
-"f 	c #E0E0E0",
-"g 	c #DBDBDB",
-"h 	c #D2D2D2",
-"i 	c #CBCBCB",
-"j 	c #DFE0E0",
-"k 	c #DADADA",
-"l 	c #CECECE",
-"m 	c #D6D6D6",
-"n 	c #EEEEEE",
-"o 	c #E0E0E1",
-"p 	c #DFDFDF",
-"q 	c #DFE0DF",
-"r 	c #D1D1D1",
-"s 	c #D5D5D5",
-"t 	c #FFFFFF",
-"u 	c #E0DFDF",
-"v 	c #E0DFE0",
-"w 	c #DEDFDE",
-"x 	c #DEDEDE",
-"y 	c #DEDEDF",
-"z 	c #DFDEDE",
-"A 	c #DFDEDF",
-"B 	c #CAC9C9",
-"C 	c #EDEEED",
-"D 	c #EDEDEE",
-"E 	c #C9C9CA",
-"F 	c #DEDFDF",
-"G 	c #DDDEDD",
-"H 	c #DDDEDE",
-"I 	c #DEDDDD",
-"J 	c #DDDDDE",
-"K 	c #DDDDDD",
-"L 	c #C8C9C8",
-"M 	c #EDEDED",
-"N 	c #C8C8C8",
-"O 	c #DEDEDD",
-"P 	c #DEDDDE",
-"Q 	c #DCDDDC",
-"R 	c #DCDDDD",
-"S 	c #DCDCDD",
-"T 	c #DDDDDC",
-"U 	c #DDDCDD",
-"V 	c #D4D4D4",
-"W 	c #CFCFCE",
-"X 	c #DDDCDC",
-"Y 	c #DBDBDC",
-"Z 	c #DCDBDB",
-"` 	c #DCDCDB",
-" .	c #DCDBDC",
-"..	c #D6D6D5",
-"+.	c #CACACA",
-"@.	c #DCDCDC",
-"#.	c #DBDBDA",
-"$.	c #DADBDA",
-"%.	c #DBDADA",
-"&.	c #CDCDCD",
-"*.	c #C6C6C5",
-"=.	c #CCCDCD",
-"-.	c #D5D4D5",
-";.	c #DADAD9",
-">.	c #D9DADA",
-",.	c #DAD9DA",
-"'.	c #DAD9D9",
-").	c #D9D9D9",
-"!.	c #D9D9D8",
-"~.	c #D8D9D8",
-"{.	c #D8D8D9",
-"].	c #D8D8D8",
-"^.	c #D9D8D8",
-"/.	c #D8D9D9",
-"(.	c #D7D7D7",
-"_.	c #D7D8D8",
-":.	c #D8D7D7",
-"<.	c #D7D8D7",
-"[.	c #D8D8D7",
-"}.	c #D6D7D6",
-"|.	c #D7D6D6",
-"1.	c #D6D6D7",
-"2.	c #D7D6D7",
-"3.	c #D6D7D7",
-"4.	c #D6D5D5",
-"5.	c #D5D5D6",
-"6.	c #D6D5D6",
-"7.	c #D5D6D6",
-"8.	c #D5D6D5",
-"9.	c #D4D5D4",
-"0.	c #D4D5D5",
-"a.	c #D5D5D4",
-"b.	c #D4D4D5",
-"c.	c #D4D3D3",
-"d.	c #D3D4D4",
-"e.	c #D4D3D4",
-"f.	c #D4D4D3",
-"g.	c #D3D3D4",
-"h.	c #D3D3D3",
-"i.	c #D2D3D3",
-"j.	c #D3D2D3",
-"k.	c #D3D3D2",
-". . . . . . . . . . . . . . . . . . . . . . . . . ",
-"+ + + + + + + @ + + @ + + + + + + + + + + + + + + ",
-"# # # # $ # # # # # # # # % # # % $ # & @ # % # # ",
-"* = = - = * ; - = = > = ; = = - = = = * = # > ; = ",
-", , , ' ' ) ! ! ~ ~ ) ' ! { { , , ! ] , ) ! ] ' ) ",
-"^ ^ / ! ( ^ _ ( : ! < : [ ( ! ^ : _ _ _ [ _ [ ( : ",
-"} ^ | 1 1 2 | ^ | 1 | 3 4 ^ 1 2 ^ 2 4 ^ 2 1 | ^ ^ ",
-"} 5 5 5 } } 6 5 5 5 6 5 7 } } } 8 8 } } 7 } 6 7 5 ",
-"9 0 0 a b 9 b a a a 0 9 a a a b b a a 9 a 9 a a a ",
-"c c c d c c c e f g h i i h g j d c c c c c c c c ",
-"f f f f f f f f k l m n n m l k f f f o f f f f f ",
-"p p p p p p q p r s t t t t s r q p p p p p u v f ",
-"w x x x y z A A B C t t t t D E A x y w w x F w x ",
-"x G H I J I J K L M t t t t M N I J O P P I G O O ",
-"Q R S K T T U T l V t t t t V W S X S U X U T T X ",
-"Y Y Z ` ` `  .Z ..+.V M M V +.m `  .`  . .@. .@.@.",
-"#.$.#.%.g g g g k s &.*.*.=.-.;.$.g g g g g #.%.g ",
-"k k >.,.,.k ,.k k '.k k ;.;.'.>.k k k k k k k ;.k ",
-").!.).).).).).).).).!.).).).).).).).).).).).).,.).",
-"~.{.].].].].].].{.{.].].].].].].^.{./.].^.].].^.].",
-"(._.(.:.(.(.:.:.<.<.(.(.(.(.(.(.(.(.<.:.[.(.].<.(.",
-"m }.}.|.1.2.m m m m 3.|.1.|.|.(.m }.}.3.(.3.m }.}.",
-"4.4.5.s 6.s 5...s 5.7.8.m 6.8.4.5.6...8.4.6.4.m m ",
-"9.s -.0.V a.0.b.s b.b.s b.a.s s 0.s a.V s a.0.s s ",
-"c.d.V e.V V d.V f.e.V V g.d.e.V c.V V V f.V V V V ",
-"h.h.i.h.j.i.i.h.j.h.h.j.h.k.i.h.h.h.h.h.h.h.h.h.h."};
diff --git a/Zukitwo-Wise/xfwm4/right-active.png b/Zukitwo-Wise/xfwm4/right-active.png
deleted file mode 100644
index 44e68fa..0000000
--- a/Zukitwo-Wise/xfwm4/right-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/right-active.xpm b/Zukitwo-Wise/xfwm4/right-active.xpm
deleted file mode 100644
index b02f911..0000000
--- a/Zukitwo-Wise/xfwm4/right-active.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wise/xfwm4/right-inactive.png b/Zukitwo-Wise/xfwm4/right-inactive.png
deleted file mode 100644
index 6f6719a..0000000
--- a/Zukitwo-Wise/xfwm4/right-inactive.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/right-inactive.xpm b/Zukitwo-Wise/xfwm4/right-inactive.xpm
deleted file mode 100644
index dfb6278..0000000
--- a/Zukitwo-Wise/xfwm4/right-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"2 24 3 1",
-" 	c None",
-".	c #D2D2D2",
-"+	c #6A6A6A",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
diff --git a/Zukitwo-Wise/xfwm4/themerc b/Zukitwo-Wise/xfwm4/themerc
deleted file mode 100644
index 8a78afa..0000000
--- a/Zukitwo-Wise/xfwm4/themerc
+++ /dev/null
@@ -1,27 +0,0 @@
-button_offset=6
-button_spacing=0
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
-#title_shadow_active=true
-title_shadow_inactive=true
-
-#button_layout=O|HMC
-
-active_text_color=#2c2c2c
-inactive_text_color=#999999
-inactive_text_shadow_color=#ffffff
-
-placement_ratio=20
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-10
-shadow_opacity=50
-
-resize_opacity=100
-move_opacity=100
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=false
diff --git a/Zukitwo-Wise/xfwm4/title-1-active-shaded.xpm b/Zukitwo-Wise/xfwm4/title-1-active-shaded.xpm
deleted file mode 100644
index 620ac75..0000000
--- a/Zukitwo-Wise/xfwm4/title-1-active-shaded.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_shaded_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-1-active.xpm b/Zukitwo-Wise/xfwm4/title-1-active.xpm
deleted file mode 100644
index 637660e..0000000
--- a/Zukitwo-Wise/xfwm4/title-1-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-1-inactive.xpm b/Zukitwo-Wise/xfwm4/title-1-inactive.xpm
deleted file mode 100644
index c1987c8..0000000
--- a/Zukitwo-Wise/xfwm4/title-1-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-2-active.xpm b/Zukitwo-Wise/xfwm4/title-2-active.xpm
deleted file mode 100644
index 2a6aa29..0000000
--- a/Zukitwo-Wise/xfwm4/title-2-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-2-inactive.xpm b/Zukitwo-Wise/xfwm4/title-2-inactive.xpm
deleted file mode 100644
index cc7ae61..0000000
--- a/Zukitwo-Wise/xfwm4/title-2-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_2_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-3-active.xpm b/Zukitwo-Wise/xfwm4/title-3-active.xpm
deleted file mode 100644
index 1f85176..0000000
--- a/Zukitwo-Wise/xfwm4/title-3-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-3-inactive.xpm b/Zukitwo-Wise/xfwm4/title-3-inactive.xpm
deleted file mode 100644
index f675f95..0000000
--- a/Zukitwo-Wise/xfwm4/title-3-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-4-active.xpm b/Zukitwo-Wise/xfwm4/title-4-active.xpm
deleted file mode 100644
index da1e16f..0000000
--- a/Zukitwo-Wise/xfwm4/title-4-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-4-inactive.xpm b/Zukitwo-Wise/xfwm4/title-4-inactive.xpm
deleted file mode 100644
index 1f1c751..0000000
--- a/Zukitwo-Wise/xfwm4/title-4-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_4_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-5-active.xpm b/Zukitwo-Wise/xfwm4/title-5-active.xpm
deleted file mode 100644
index 4c1c074..0000000
--- a/Zukitwo-Wise/xfwm4/title-5-active.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_active_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-5-inactive.xpm b/Zukitwo-Wise/xfwm4/title-5-inactive.xpm
deleted file mode 100644
index f326677..0000000
--- a/Zukitwo-Wise/xfwm4/title-5-inactive.xpm
+++ /dev/null
@@ -1,55 +0,0 @@
-/* XPM */
-static char * title_5_inactive_xpm[] = {
-"10 26 26 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #E7E7E7",
-"#	c #E6E6E7",
-"$	c #E5E5E6",
-"%	c #E4E4E4",
-"&	c #E3E3E3",
-"*	c #E2E2E1",
-"=	c #E1E1E1",
-"-	c #E0E0E0",
-";	c #DFDFDF",
-">	c #DEDFDE",
-",	c #DEDEDE",
-"'	c #DCDDDC",
-")	c #DBDBDC",
-"!	c #DBDBDA",
-"~	c #DADADA",
-"{	c #D9D9D9",
-"]	c #D8D9D8",
-"^	c #D7D7D7",
-"/	c #D6D6D6",
-"(	c #D6D5D5",
-"_	c #D4D5D4",
-":	c #D4D3D3",
-"<	c #D3D3D3",
-"..........",
-"++++++++++",
-"@@@@@@@@@@",
-"##########",
-"$$$$$$$$$$",
-"%%%%%%%%%%",
-"&&&&&&&&&&",
-"&&&&&&&&&&",
-"**********",
-"==========",
-"----------",
-";;;;;;;;;;",
-">>>>>>>>>>",
-",,,,,,,,,,",
-"''''''''''",
-"))))))))))",
-"!!!!!!!!!!",
-"~~~~~~~~~~",
-"{{{{{{{{{{",
-"]]]]]]]]]]",
-"^^^^^^^^^^",
-"//////////",
-"((((((((((",
-"__________",
-"::::::::::",
-"<<<<<<<<<<"};
diff --git a/Zukitwo-Wise/xfwm4/title-left-active.png b/Zukitwo-Wise/xfwm4/title-left-active.png
deleted file mode 100755
index 5cd7a9a..0000000
--- a/Zukitwo-Wise/xfwm4/title-left-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/title-right-active.png b/Zukitwo-Wise/xfwm4/title-right-active.png
deleted file mode 100755
index d1612b7..0000000
--- a/Zukitwo-Wise/xfwm4/title-right-active.png
+++ /dev/null
diff --git a/Zukitwo-Wise/xfwm4/top-left-active-shaded.xpm b/Zukitwo-Wise/xfwm4/top-left-active-shaded.xpm
deleted file mode 100644
index ba5c54e..0000000
--- a/Zukitwo-Wise/xfwm4/top-left-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Wise/xfwm4/top-left-active.xpm b/Zukitwo-Wise/xfwm4/top-left-active.xpm
deleted file mode 100644
index 79ed379..0000000
--- a/Zukitwo-Wise/xfwm4/top-left-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Wise/xfwm4/top-left-inactive.xpm b/Zukitwo-Wise/xfwm4/top-left-inactive.xpm
deleted file mode 100644
index 77fb344..0000000
--- a/Zukitwo-Wise/xfwm4/top-left-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #828282",
-"@	c #D3D3D3",
-"#	c #E8E8E8",
-"$	c #E7E7E7",
-"%	c #696A6A",
-"&	c #E6E6E7",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"  ..",
-" +@#",
-".@$$",
-"%&&&",
-".***",
-".===",
-".---",
-".---",
-".;;;",
-".>>>",
-".,,,",
-".'''",
-".)))",
-".!!!",
-".~~~",
-".{{{",
-".]]]",
-".^^^",
-".///",
-".(((",
-".___",
-".:::",
-".<<<",
-".[[[",
-".}}}",
-".@@@"};
diff --git a/Zukitwo-Wise/xfwm4/top-right-active-shaded.xpm b/Zukitwo-Wise/xfwm4/top-right-active-shaded.xpm
deleted file mode 100644
index 7b8a2e5..0000000
--- a/Zukitwo-Wise/xfwm4/top-right-active-shaded.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_shaded_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Wise/xfwm4/top-right-active.xpm b/Zukitwo-Wise/xfwm4/top-right-active.xpm
deleted file mode 100644
index ba66af2..0000000
--- a/Zukitwo-Wise/xfwm4/top-right-active.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/Zukitwo-Wise/xfwm4/top-right-inactive.xpm b/Zukitwo-Wise/xfwm4/top-right-inactive.xpm
deleted file mode 100644
index d9f7f97..0000000
--- a/Zukitwo-Wise/xfwm4/top-right-inactive.xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"4 26 28 1",
-" 	c None",
-".	c #6A6A6A",
-"+	c #E8E8E8",
-"@	c #D3D3D3",
-"#	c #828282",
-"$	c #E7E7E7",
-"%	c #E6E6E7",
-"&	c #696A6A",
-"*	c #E5E5E6",
-"=	c #E4E4E4",
-"-	c #E3E3E3",
-";	c #E2E2E1",
-">	c #E1E1E1",
-",	c #E0E0E0",
-"'	c #DFDFDF",
-")	c #DEDFDE",
-"!	c #DEDEDE",
-"~	c #DCDDDC",
-"{	c #DBDBDC",
-"]	c #DBDBDA",
-"^	c #DADADA",
-"/	c #D9D9D9",
-"(	c #D8D9D8",
-"_	c #D7D7D7",
-":	c #D6D6D6",
-"<	c #D6D5D5",
-"[	c #D4D5D4",
-"}	c #D4D3D3",
-"..  ",
-"+@# ",
-"$$@.",
-"%%%&",
-"***.",
-"===.",
-"---.",
-"---.",
-";;;.",
-">>>.",
-",,,.",
-"'''.",
-"))).",
-"!!!.",
-"~~~.",
-"{{{.",
-"]]].",
-"^^^.",
-"///.",
-"(((.",
-"___.",
-":::.",
-"<<<.",
-"[[[.",
-"}}}.",
-"@@@."};
diff --git a/make-colors-themes b/make-colors-themes
index 6695d91..f104307 100755
--- a/make-colors-themes
+++ b/make-colors-themes
@@ -37,7 +37,7 @@ debug() {
 }
 
 install_theme() {
-    [[ ! -d "zuki_themes" ]] && update
+    [[ ! -d "zuki-themes" ]] && update
     for color in ${colors[@]};do
         if [[ -d "Zukitwo-$color" ]];then
             printf "Installing \"Zukitwo-$color\""
@@ -93,18 +93,18 @@ patch() {
 }
 
 patch_theme() {
-    echo "Patching zuki_themes..."
+    echo "Patching zuki-themes..."
     echo "If these files were already patched before, you'll see errors. Ignore them."
-    cd zuki_themes
-    echo "Resetting zuki_themes git repo..."
+    cd zuki-themes
+    echo "Resetting zuki-themes git repo..."
     git reset --hard HEAD
     cd "$OLDPWD"
-    fix_line_endings "./zuki_themes/Zukitwo/gtk-2.0/widgets/panel.rc" "./zuki_themes/Zukitwo/gtk-2.0/gtkrc" "./Zukitwo-colors-common/patches/panel.rc.patch" "./Zukitwo-colors-common/patches/enable-dark-menubar.patch"
-    yes | patch ./zuki_themes/Zukitwo/gtk-2.0/widgets/panel.rc <./Zukitwo-colors-common/patches/panel.rc.patch
-    yes | patch ./zuki_themes/Zukitwo/gtk-2.0/gtkrc <./Zukitwo-colors-common/patches/enable-dark-menubar.patch
+    fix_line_endings "./zuki-themes/Zukitwo/gtk-2.0/widgets/panel.rc" "./zuki-themes/Zukitwo/gtk-2.0/gtkrc" "./Zukitwo-colors-common/patches/panel.rc.patch" "./Zukitwo-colors-common/patches/enable-dark-menubar.patch"
+    yes | patch ./zuki-themes/Zukitwo/gtk-2.0/widgets/panel.rc <./Zukitwo-colors-common/patches/panel.rc.patch
+    yes | patch ./zuki-themes/Zukitwo/gtk-2.0/gtkrc <./Zukitwo-colors-common/patches/enable-dark-menubar.patch
     OLDIFS="$IFS"
     IFS=$'\n'
-    for file in $(find ./zuki_themes/ -type f);do
+    for file in $(find ./zuki-themes/ -type f);do
         sed -i 's/gtk_color_scheme = ./gtk_color_scheme = \"menubar_bg_color:#ffffff\\nmenubar_fg_color:#ffffff\\nmenuitem_fg_color:#ffffff\\n/g' "$file"
     done
     printf "\n"
@@ -113,12 +113,12 @@ patch_theme() {
 }
 
 generate_theme() {
-    if [[ ! -d "zuki_themes/" ]];then
-        echo "zuki_themes does not exist. You need to run \`./make-color-themes update\`."
+    if [[ ! -d "zuki-themes/" ]];then
+        echo "zuki-themes does not exist. You need to run \`./make-color-themes update\`."
         exit 1
     fi
     color="$1"
-    cp -r "zuki_themes/Zukitwo" "Zukitwo-$color"
+    cp -r "zuki-themes/Zukitwo" "Zukitwo-$color"
     cd "Zukitwo-$color"
     echo "Creating \"Zukitwo-$color\"..."
     file_list=$(find . -type f | grep -v 'make-colors-themes')
@@ -147,13 +147,13 @@ generate_theme() {
 }
 
 update() {
-    if [[ ! -d "zuki_themes/.git" ]];then
-        git clone https://github.com/lassekongo83/zuki_themes.git
+    if [[ ! -d "zuki-themes/.git" ]];then
+        git clone https://github.com/lassekongo83/zuki-themes.git
     fi
-    cd zuki_themes
-    echo "Resetting git tree of zuki_themes..."
+    cd zuki-themes
+    echo "Resetting git tree of zuki-themes..."
     git reset --hard HEAD
-    echo "Getting latest revision of zuki_themes..."
+    echo "Getting latest revision of zuki-themes..."
     git pull
     cd "$OLDPWD"
     printf '\n\n'
@@ -178,8 +178,8 @@ help() {
     echo "  user_install    - install the theme in your ~/.themes directory"
     echo "  uninstall       - uninstall the theme"
     echo "  clean           - delete old generated files"
-    echo "  patch           - patch zuki_themes file"
-    echo "  update          - update the local copy of the zuki_themes repo"
+    echo "  patch           - patch zuki-themes file"
+    echo "  update          - update the local copy of the zuki-themes repo"
     echo "  debug           - activate debug messages"
     echo "  help            - display this message"
     echo