replace gtk2. we go murrine only at all cost

50 files changed, 1224 insertions, 2560 deletions

diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png b/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png
deleted file mode 100755
index 11bb80b..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-checked.png b/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-checked.png
deleted file mode 100755
index be364ca..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-checked.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png b/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png
deleted file mode 100755
index 6a658b5..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-unchecked.png b/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-unchecked.png
deleted file mode 100755
index 0b14e4c..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/checkbox-unchecked.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck.png
deleted file mode 100644
index ae0cc6a..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck_prelight.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck_prelight.png
deleted file mode 100644
index 35dc5a7..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck_prelight.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption.png
deleted file mode 100644
index ca3b939..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption_prelight.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption_prelight.png
deleted file mode 100644
index 0a409ab..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption_prelight.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/option-checked-insensitive.png b/Kogaion-daylight/gtk-2.0/Check-Radio/option-checked-insensitive.png
deleted file mode 100755
index 962baa7..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/option-checked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/option-checked.png b/Kogaion-daylight/gtk-2.0/Check-Radio/option-checked.png
deleted file mode 100755
index 0b23e6d..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/option-checked.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/option-unchecked-insensitive.png b/Kogaion-daylight/gtk-2.0/Check-Radio/option-unchecked-insensitive.png
deleted file mode 100755
index 44e9aaa..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/option-unchecked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/option-unchecked.png b/Kogaion-daylight/gtk-2.0/Check-Radio/option-unchecked.png
deleted file mode 100755
index 9ecfcc3..0000000
--- a/Kogaion-daylight/gtk-2.0/Check-Radio/option-unchecked.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Others/null.png b/Kogaion-daylight/gtk-2.0/Others/null.png
deleted file mode 100644
index 9d7e6be..0000000
--- a/Kogaion-daylight/gtk-2.0/Others/null.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Others/pane-separator-grip-vertical.svg b/Kogaion-daylight/gtk-2.0/Others/pane-separator-grip-vertical.svg
deleted file mode 100755
index 87ae808..0000000
--- a/Kogaion-daylight/gtk-2.0/Others/pane-separator-grip-vertical.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="2" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">

- <g fill="#828282">

-  <ellipse style="enable-background:new" rx="1" ry="1" cy="2.5" cx="1"/>

-  <ellipse style="enable-background:new" rx="1" ry="1" cy="13.5" cx="1"/>

-  <ellipse style="enable-background:new" rx="1" ry="1" cy="8" cx="1"/>

- </g>

-</svg>

diff --git a/Kogaion-daylight/gtk-2.0/Others/pane-separator-grip.svg b/Kogaion-daylight/gtk-2.0/Others/pane-separator-grip.svg
deleted file mode 100755
index a4136b1..0000000
--- a/Kogaion-daylight/gtk-2.0/Others/pane-separator-grip.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="2" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">

- <g transform="translate(0,-14)" fill="#828282">

-  <ellipse style="enable-background:new" rx="1" transform="scale(-1)" ry="1" cy="-15" cx="-2.5"/>

-  <ellipse style="enable-background:new" rx="1" transform="scale(-1)" ry="1" cy="-15" cx="-8"/>

-  <ellipse style="enable-background:new" rx="1" transform="scale(-1)" ry="1" cy="-15" cx="-13.5"/>

- </g>

-</svg>

diff --git a/Kogaion-daylight/gtk-2.0/Others/tree_header.png b/Kogaion-daylight/gtk-2.0/Others/tree_header.png
deleted file mode 100755
index 06864a8..0000000
--- a/Kogaion-daylight/gtk-2.0/Others/tree_header.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.png b/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.png
deleted file mode 100755
index 6a69afe..0000000
--- a/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.svg b/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.svg
deleted file mode 100755
index ee6900a..0000000
--- a/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.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="36"
-   viewBox="0 0 72.000002 36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="panel-bg-new.svg"
-   inkscape:export-filename="C:\Users\Ionel\Downloads\theme work\Panel\panel-bg-new.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4146">
-      <stop
-         style="stop-color:#4c77bf;stop-opacity:1"
-         offset="0"
-         id="stop4148" />
-      <stop
-         style="stop-color:#2153a7;stop-opacity:1"
-         offset="1"
-         id="stop4150" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4146"
-       id="linearGradient4152"
-       x1="35.734146"
-       y1="1026.4714"
-       x2="35.63451"
-       y2="1052.3564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.3846154,0,-404.91378)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#a5a5a5"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="35.82401"
-     inkscape:cy="6.0729682"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <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,-1016.3622)">
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient4152);fill-opacity:1;stroke:none;stroke-width:1.16299999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4136"
-       width="72"
-       height="36"
-       x="0"
-       y="1016.3622" />
-  </g>
-</svg>
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-button-active.png b/Kogaion-daylight/gtk-2.0/Panel/panel-button-active.png
deleted file mode 100644
index 6fe52ae..0000000
--- a/Kogaion-daylight/gtk-2.0/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-button-hover.png b/Kogaion-daylight/gtk-2.0/Panel/panel-button-hover.png
deleted file mode 100644
index 67b8b20..0000000
--- a/Kogaion-daylight/gtk-2.0/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-button-inactive.png b/Kogaion-daylight/gtk-2.0/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Kogaion-daylight/gtk-2.0/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Kogaion-daylight/gtk-2.0/app-styles/file-manager.rc b/Kogaion-daylight/gtk-2.0/app-styles/file-manager.rc
deleted file mode 100755
index 76c3da8..0000000
--- a/Kogaion-daylight/gtk-2.0/app-styles/file-manager.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-style "sidepane" 
-{
-	base[NORMAL]		= mix (0.5, @bg_color, @window_active_color)	# backgroung
-	bg[NORMAL]			= shade (0.91, @base_color)
-#	bg[PRELIGHT]		= @base_color
-	
-	engine "murrine"
-	{ 
-		contrast				= 0.80
-	}
-}
-
-# Thunar
-
-style "thunar-path-entry-increased-style"
-{
-  ThunarPathEntry::icon-size = 16
-}
-class "ThunarPathEntry" style "thunar-path-entry-increased-style"
-
-style "thunar-location-buttons"
-{
-  ThunarLocationButtons::spacing = 0
-}
-class "ThunarLocationButtons" style "thunar-location-buttons"
-
-widget_class "*ThunarShortcutsView*" 	style "sidepane"
-widget_class "*ThunarTreeView*" 	style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*"	style "sidepane"
-
-# Caja
-
-widget_class "*CajaSidePane*" style "sidepane"
-# widget_class "*CajaPathBar.*ToggleButton*" style:highest "test"
-# widget "*CajaNavigationWindow*GtkHPaned*" style "test"
-# widget_class "*CajaNotebook" style "test"
diff --git a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
deleted file mode 100644
index d95e863..0000000
--- a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
+++ /dev/null
@@ -1,195 +0,0 @@
-style "pixmap-panel"
-{
-	xthickness = 2 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 2
-
-	fg[NORMAL]		= @bg_color
-	fg[PRELIGHT]	= shade (1.45, @selected_bg_color)
-	fg[ACTIVE]		= @bg_color
-
-#	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]       	= shade (0.90, @window_active_color)
-#	bg[ACTIVE]			= @selected_bg_color
-#	bg[PRELIGHT]      	= shade(1.75, @selected_bg_color)
-#	bg[SELECTED]      	= @selected_bg_color
-	
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "Panel/panel-button-inactive.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		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
-#		}
-
-
-	}
-}
-
-style "other-panel" 	# this style is somehow doubled, discard when no longer needed
-{
-	xthickness = 0
-	ythickness = 0
-
-	fg[NORMAL]		= @bg_color
-	fg[PRELIGHT]	= shade (1.45, @selected_bg_color)
-	fg[ACTIVE]		= @bg_color
-	fg[SELECTED]	= @selected_bg_color
-
-	bg[NORMAL]       	=  shade (0.90, @window_active_color)
-#	bg[ACTIVE]			=  @selected_bg_color
-#	bg[PRELIGHT]      	=  shade(1.75, @selected_bg_color)
-#	bg[SELECTED]      	=  @selected_bg_color
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "Panel/panel-button-inactive.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		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			= HANDLE
-      		recolorable			= TRUE
-     		overlay_file		= "Others/null.png"
-     		#overlay_file		= "Handles/handle-v.png"
-      		overlay_stretch		= FALSE
-      		orientation			= VERTICAL
-    	}
-    	image {
-      		function			= HANDLE
-     		overlay_file		= "Others/null.png"
-     		#overlay_file		= "Handles/handle-h.png"
-      		overlay_stretch 	= FALSE
-      		orientation			= HORIZONTAL
-    	}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-main-menu-text" = "other-panel"
-{
-	fg[PRELIGHT]	= "#ffffff"
-	text[PRELIGHT]	= "#ffffff"
-}
-
-style "theme-panel-handle" 
-{
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
-}
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"				style "pixmap-panel"
-class "*Xfce*Panel*"					style "pixmap-panel"
-
-# Other (MATE) panel
-
-widget "*PanelWidget*"				style "other-panel"
-#widget "*PanelApplet*"				style "test"
-widget "*fast-user-switch*"			style "other-panel"
-widget "*CPUFreq*Applet*"			style "other-panel"
-widget "*indicator-applet*"			style "other-panel"
-class "PanelApp*"					style "other-panel"
-class "PanelToplevel*"				style "other-panel"
-widget_class "*PanelToplevel*"		style "other-panel" # pimp here
-
-# widget_class "*notif*"			style "other-panel"
-# widget_class "*Notif*"			style "other-panel"
-# widget_class "*Tray*"			style "other-panel" 
-# widget_class "*tray*"			style "other-panel"
-# widget_class "*computertemp*"		style "other-panel"
-# widget_class "*Applet*Tomboy*"		style "other-panel"
-# widget_class "*Applet*Netstatus*"	style "other-panel"
-
-# Fixes for tooltip text in some apps.
-# widget_class "*Notif*Beagle*"	style "theme-panel-light"
-# widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# lxpanel and fbpanel
-# widget "*.tclock.*"		style "other-panel"
-# widget "*.taskbar.*"		style "other-panel"
-# widget_class "*GtkBgbox*"	style "other-panel"
-
-# Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text" # pimp here
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text" # pimp here
-widget "*.clock-applet-button.*"		style "other-panel"
-widget "*PanelApplet*"				style "other-panel" # check here, why doubled, looks ok for bottom
-
-# Hide ugly handle
-# class "PanelAppletFrame" 			style "theme-panel-handle"
diff --git a/Kogaion-daylight/gtk-2.0/app-styles/terminal.rc b/Kogaion-daylight/gtk-2.0/app-styles/terminal.rc
deleted file mode 100755
index bc11c6d..0000000
--- a/Kogaion-daylight/gtk-2.0/app-styles/terminal.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-style "terminal"
-{
-	
-	bg[NORMAL]		= @bg_color
-	bg[ACTIVE]		= @bg_color
-	bg[PRELIGHT]	= @bg_color
-	bg[SELECTED]	= @bg_color
-	base[NORMAL]	= @bg_color
-}
-
-style "terminal-notebook"  
-{
-	bg[NORMAL]		= darker(@window_active_color) # bg selected tab
-	bg[ACTIVE]		= @window_active_color
-	fg[NORMAL]		= @bg_color	# text selected tab
-	fg[ACTIVE]		= @fg_color
-
-	engine "murrine"
-	{
-		contrast        	= 0.0	
-	}
-}
-
-style "notebook-button" {
-    xthickness		= 0
-    ythickness		= 0
-	bg[ACTIVE]	= shade (0.68, @window_active_color)    
-	bg[PRELIGHT]    = shade (0.75, @window_active_color)
-	engine "murrine"
-	{
-		gradient_shades		= {1.00,1.00,1.00,1.00}
-		contrast        	= 0.6
-		roundness       	= 0
-	}    
-}
-
-class "*TerminalWindow"										style "terminal"
-widget_class "TerminalWindow*GtkNotebook"					style "terminal-notebook"
-widget_class "TerminalWindow*<GtkNotebook>*<GtkLabel>" 	style "terminal-notebook"
-widget_class "TerminalWindow*<GtkNotebook>*<GtkButton>" 	style "notebook-button"
-
-
diff --git a/Kogaion-daylight/gtk-2.0/gtkrc b/Kogaion-daylight/gtk-2.0/gtkrc
index d836525..b59e98f 100755..100644
--- a/Kogaion-daylight/gtk-2.0/gtkrc
+++ b/Kogaion-daylight/gtk-2.0/gtkrc
@@ -1,1044 +1,763 @@
-gtk-color-scheme = "base_color:#ffffff\nbg_color:#f4f4f4"
-gtk-color-scheme = "text_color:#2e3436\nfg_color:#2e3436"
-gtk-color-scheme = "selected_bg_color:#0096ff\nselected_fg_color:#ffffff"
-gtk-color-scheme = "tooltip_bg_color:#d2e4f8\ntooltip_fg_color:#2e3436\nlink_color:#4a90f9"
-gtk-color-scheme = "theme_bg_color:#f4f4f4\nbutton_base:#f4f4f4"
-
-gtk_color_scheme = "window_active_color:#a3b5d9" #Windows decorations
-gtk_color_scheme = "test1:#ff0000\ntest2:#00ff00" #debug colors
-
-gtk-auto-mnemonics	= 1
-
-style "default" {
-	xthickness	= 1
-	ythickness	= 1
-
-	#######################
-	# Style Properties
-	#######################
-	GtkButton   			::child-displacement-x	= 0
-	GtkButton				::child-displacement-y	= 0
-	GtkButton				::default-border		= {0, 0, 0, 0}
-	GtkButton				::image-spacing			= 4
-	GtkToolButton			::icon-spacing			= 4
-
-	GtkCheckButton			::indicator-size		= 16
-	GtkRadioButton			::indicator-size		= 16
-
-	GtkEntry				::honors-transparent-bg-hint	= 1
-	GtkEntry				::invisible-char		= 0x2022
-	GtkEntry				::progress-border		= {2, 2, 2, 2}
-	GtkEntry    			::state-hint        	= 0
-
-	GtkProgressBar			::min-vertical-bar-width	= 13
-	GtkProgressBar			::min-horizontal-bar-height	= 13
-
-	GtkExpander				::expander-size			= 8
-
-	GtkMenuBar  			::internal-padding		= 0
-	GtkMenuBar  			::window-dragging		= 1
-	GtkMenuBar				::shadow-type			= GTK_SHADOW_NONE
-	GtkMenu					::horizontal-padding	= 0
-	GtkMenu					::vertical-padding		= 0
-	GtkSeparatorMenuItem	::horizontal-padding	= 7
-
-	GtkNotebook				::tab-overlap			= 2		# Default = 2
-	GtkNotebook				::tab-curvature			= 1		# Default = 1
-	
-	GtkPaned				::handle-size			= 4
-
-	GtkRange				::trough-border			= 0
-	GtkRange				::slider-width			= 15
-	GtkRange				::stepper-size			= 1
-
-	GtkScale				::slider-length			= 14
-	GtkScale				::slider-width			= 14
-	GtkScale				::trough-side-details	= 1
-
-	GtkScrollbar    		::has-backward-stepper	= 0  
-	GtkScrollbar			::has-forward-stepper	= 0
-	GtkScrollbar			::min-slider-length		= 30
-	GtkScrollbar			::slider-width			= 6
-	GtkScrollbar			::trough-border			= 3
-	GtkScrollbar			::activate-slider 		= 1
-	GtkScrollbar			::trough-side-details	= 0
-	GtkScrollbar			::stepper-size          = 1
-
-	GtkScrolledWindow		::scrollbar-spacing		= 0
-	GtkScrolledWindow		::scrollbars-within-bevel	= 1
-
-	GtkToolbar				::internal-padding		= 0
-	GtkToolbar				::window-dragging		= 1
-
-	GtkTreeView				::expander-size			= 8
-	GtkTreeView				::odd_row_color			= shade (1.05, @base_color)
-
-	#GtkTreeView			::even_row_color		= shade (1.05, @base_color)
-
-	GtkWidget				::link-color 			= @link_color
-	GtkWidget				::focus-padding			= 0
-	WnckTasklist			::fade-overlay-rect		= 0
-    
-	GtkWindow               ::resize-grip-height    = 0
-	GtkWindow               ::resize-grip-width     = 0
-	GtkImage				::x-ayatana-indicator-dynamic 	= 1
-
-
-	####################
-	# Color Definitions
-	####################
-
-	bg[NORMAL]          = @theme_bg_color
-	bg[PRELIGHT]		= shade (1.02, @theme_bg_color)
-	bg[SELECTED]		= @window_active_color	#used by metacity/xfwm
-	bg[INSENSITIVE] 	= shade (0.9, @theme_bg_color)
-	bg[ACTIVE]         	= @theme_bg_color
-
-	fg[NORMAL]          = @fg_color
-	fg[PRELIGHT]		= @text_color
-	fg[SELECTED]		= shade (1.10, @selected_fg_color)
-	fg[INSENSITIVE] 	= shade (0.75, @bg_color)
-	fg[ACTIVE]			= @fg_color		
-
-	text[NORMAL]		= @fg_color
-	text[PRELIGHT]		= @text_color
-	text[SELECTED]		= shade (1.10, @selected_fg_color)
-	text[INSENSITIVE]	= shade (0.75, @fg_color)
-	text[ACTIVE]		= shade (1.10, @selected_fg_color)
-
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @theme_bg_color)
-	base[SELECTED]		= @selected_bg_color
-	base[INSENSITIVE]	= shade (1.20, @theme_bg_color)
-	base[ACTIVE]		= @selected_bg_color
+# Numix GTK Theme
+
+gtk-color-scheme = "bg_color:#dedede\nfg_color:#555555\nbase_color:#f9f9f9\ntext_color:#333333\nselected_bg_color:#157DEC\nselected_fg_color:#f9f9f9\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dcdcdc\nmenubar_bg_color:#dedede\nmenubar_fg_color:#555555\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#dedede\nmenu_fg_color:#555555\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
+
+# Default Style
+
+style "murrine-default" {
+	GtkArrow::arrow-scaling= 0.6
+
+	GtkButton::child-displacement-x = 0
+	GtkButton::child-displacement-y = 0
+
+	GtkButton::default-border = { 0, 0, 0, 0 }
+
+	GtkButtonBox::child-min-height = 26
+
+	GtkCheckButton::indicator-size = 16
+
+	# 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
+
+	GtkExpander::expander-size = 16
+
+	GtkImage::x-ayatana-indicator-dynamic = 1
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	GtkMenuBar::internal-padding = 0
+	GtkMenuBar::window-dragging = 1
+
+	GtkMenuItem::arrow-scaling= 0.5
+
+	GtkPaned::handle-size = 1
+
+	GtkProgressBar::min-horizontal-bar-height = 12
+	GtkProgressBar::min-vertical-bar-width = 12
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 12
+	GtkRange::stepper-size = 12
+	GtkRange::stepper_spacing = 0
+	GtkRange::trough-under-steppers = 1
+
+	GtkScale::slider-length = 16
+	GtkScale::slider-width = 16
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar::activate-slider = 1
+	GtkScrollbar::has-backward-stepper = 0
+	GtkScrollbar::has-forward-stepper = 0
+	GtkScrollbar::has-secondary-backward-stepper = 0
+	GtkScrollbar::has-secondary-forward-stepper = 0
+	GtkScrollbar::min-slider-length = 80
+	GtkScrollbar::slider-width = 12
+	GtkScrollbar::trough-border = 0
+
+	GtkScrolledWindow::scrollbar-spacing = 0
+	GtkScrolledWindow::scrollbars-within-bevel = 1
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+
+	GtkToolbar::internal-padding = 0
+
+	GtkTreeView::expander-size = 11
+	GtkTreeView::vertical-separator = 0
+
+	GtkWidget::focus-line-width = 1
+	# The following line prevents the Firefox tabs
+	# from jumping a few pixels when you create a new tab
+	GtkWidget::focus-padding = 0
+
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 1
+
+	GtkWindow::resize-grip-height = 0
+	GtkWindow::resize-grip-width = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+
+	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
+
+	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
+	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
+
+	xthickness = 1
+	ythickness = 1
+
+	fg[NORMAL] = @fg_color
+	fg[PRELIGHT] = @fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @fg_color
+	fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
+
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.02, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = shade (0.9, @bg_color)
+	bg[INSENSITIVE] = @bg_color
+
+	base[NORMAL] = @base_color
+	base[PRELIGHT] = shade (0.95, @base_color)
+	base[SELECTED] = @selected_bg_color
+	base[ACTIVE] = @selected_bg_color
+	base[INSENSITIVE] = shade (0.85, @base_color)
+
+	text[NORMAL] = @text_color
+	text[PRELIGHT] = @text_color
+	text[SELECTED] = @selected_fg_color
+	text[ACTIVE] = @selected_fg_color
+	text[INSENSITIVE] = mix (0.5, @base_color, @text_color)
 
 	engine "murrine" {
-		animation				= FALSE
-        arrowstyle				= 2	# arrowstyle = 1 to draw filled arrows.
-              						# arrowstyle = 2 to draw fat filled arrows.
-		colorize_scrollbar		= TRUE
-		contrast				= 0.7
-		# default_button_color	= shade (0.88, @base_color)		
-		expanderstyle			= 0	# expanderstyle = 0 to draw arrows.
-              						# expanderstyle = 1 to draw circles with plus and minus.
-              						# expanderstyle = 2 to draw buttons with plus and minus.
-		focusstyle				= 0 # 0 to disable focus drawing. 
-									# 1 to use dots. 
-									# 2 to use a small colored rectangle. 
-									# 3 to use a colored rectangle that touches the borders.
-		focus_color 			= shade (1.2, @selected_bg_color)
-		glazestyle				= 0 # 0 = flat highlight, 
-									# 1 = curved highlight
-									# 2 = concave style, 
-									# 3 = top curved highlight, 
-									# 4 = beryl highlight
-		glowstyle				= 0 # 0 = top
-									# 1 = bottom
-									# 2 = top and bottom
-									# 3 = horizontal
-									# 4 = centered glow
-   		gradient_shades			= {1.00, 0.92, 0.92, 0.81}
-		handlestyle 			= 0
-		highlight_shade			= 1.0
-		lightborder_shade		= 1.0
-		lightborderstyle		= 1 # 0 = top side
-									# 1 = all sides
-		listviewstyle			= 0 # 0 = nothing
-									# 1 = dotted
-									# 2 = line
-		menubaritemstyle		= 0 # 0 = menuitem look
-									# 1 = button look
-		menubarstyle			= 0 # 0 = flat
-									# 1 = glassy
-									# 2 = gradient
-									# 3 = striped
-		menuitemstyle			= 0 # 0 = flat
-									# 1 = glassy
-									# 2 = striped
-		menustyle				= 3 # 0 = no vertical menu stripe
-									# 1 = display vertical menu stripe
-									# 2 = faint?
-									# 3 = borderless
-		progressbarstyle		= 0
-		reliefstyle				= 0 # 0 = flat
-									# 1 = inset
-									# 2 = shadow
-									# 3 = shadow with gradient
-									# 4 = stronger shadow with gradient
-		rgba					= FALSE	# alpha transparency
-		roundness				= 0 # 0 = square
-		scrollbarstyle			= 0 # 0 = nothing
-		separatorstyle 			= 1	# 0 = Hard separators
-									# 1 = Smooth separators
-		shadow_shades			= {1.1, 1.0}
-		sliderstyle				= 0 # 0 = nothing added
-		stepperstyle			= 1 # 0 = standard
-									# 1 = integrated stepper handles
-									# 2 = unknown
-		toolbarstyle			= 1 # 0 = flat
-									# 1 = glassy
-									# 2 = gradient
-		trough_shades			= {0.85, 1.0}
-
-#added for testing
-		#border_colors = { "#ff0000", "#00ff00" }
-	}
+		animation = FALSE
+		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
+		border_shades = { 1.0, 1.0 } # gradient to draw on border
+		colorize_scrollbar = FALSE
+		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
+		contrast = 0.8 # overal contrast with borders
+		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
+		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
+		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
+		glow_shade = 1.0 # amount of glow
+		gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets
+		highlight_shade = 1.0 # amount of highlight
+		lightborder_shade = 1.0 # amount of inset light border
+		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
+		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
+		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
+		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
+		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
+		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
+		menustyle = 0 # 0 = none, 1 = vertical striped
+		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
+		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
+		roundness = 0 # roundness of widgets
+		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
+		sliderstyle = 0 # 0 = none, 1 = handles
+		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
+		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
+   }
+}
+
+style "murrine-wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "murrine-wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "murrine-thin" {
+	xthickness = 0
+	ythickness = 0
 }
 
-style "test" = "default" {
-	fg[NORMAL]       	=  "#00FF00"
-	fg[ACTIVE]       	=  "#00FF00"
-	fg[PRELIGHT]     	=  "#00FF00"
-	fg[SELECTED]     	=  "#00FF00"
-	fg[INSENSITIVE]  	=  "#00FF00"
-
-	bg[NORMAL]       	=  "#FF0000"
-	bg[ACTIVE]			=  "#FF0000"
-	bg[PRELIGHT]      	=  "#FF0000"
-	bg[SELECTED]      	=  "#FF0000"
-	bg[INSENSITIVE]  	=  "#FF0000"
-
-	text[NORMAL]      	=  "#0000FF"
-	text[ACTIVE]      	=  "#0000FF"
-	text[PRELIGHT]    	=  "#0000FF"
-	text[SELECTED]    	=  "#0000FF"
-	text[INSENSITIVE] 	=  "#0000FF"
-
-	base[NORMAL]      	=  "#FFFF00"
-	base[ACTIVE]      	=  "#FFFF00"
-	base[PRELIGHT]    	=  "#FFFF00"
-	base[SELECTED]    	=  "#FFFF00"
-	base[INSENSITIVE] 	=  "#FFFF00"
+# Notebook
+
+style "murrine-notebook-bg" {
+	bg[NORMAL] = @base_color
+	bg[ACTIVE] = shade (0.87, @base_color)
 }
 
-style "wide"  { xthickness	= 2 ythickness	= 2 }
-style "wider" {	xthickness	= 3 ythickness	= 3 }
+style "murrine-notebook" = "murrine-notebook-bg" {
+	xthickness = 2
+	ythickness = 2
 
-style "button" {
-   	xthickness	= 3
-   	ythickness	= 3
+	engine "murrine" {
+		roundness = 0
+	}
+}
 
-	bg[NORMAL]          = shade (1.10, @button_base)
-	bg[PRELIGHT]        = shade (1.70, @selected_bg_color)    
-	bg[ACTIVE]          = shade (1.10, @selected_bg_color)
-	bg[SELECTED]    	= shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] 	= shade (1.4, @button_base)
+# Various Standard Widgets
 
-	engine "murrine" {
-		border_shades           = {0.9, 0.7}
-		contrast                = 0.72
-		roundness				= 0 # 0 = square
-		gradient_shades         = {1.20,1.10,1.10,0.95}
-		lightborderstyle		= 1 # 0 = top side, 1 = all sides
-		lightborder_shade       = 1.3
-        highlight_shade			= 1.0
-		focusstyle				= 3		
-		glowstyle				= 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
-        glow_shade          	= 1.5
-        reliefstyle         	= 0
-		textstyle               = 1
-		text_shade				= 0.7      
-     
+style "murrine-button"  = "murrine-wider" {
+	bg[NORMAL] = shade (1.08, @bg_color)
+	bg[PRELIGHT] = shade (1.7, @selected_bg_color)
+	bg[ACTIVE] = shade (0.95, @bg_color)
+	bg[INSENSITIVE] = shade (0.85, @bg_color)
+
+  	engine "murrine" {
 	}
 }
 
-style "button_label" { fg[ACTIVE] = @selected_fg_color }
+style "murrine-scrollbar" {
+	bg[NORMAL] = mix (0.21, @fg_color, @bg_color)
+	bg[PRELIGHT] = mix (0.31, @fg_color, @bg_color)
+	bg[ACTIVE] = @selected_bg_color
+
+	engine "murrine" {
+		roundness = 0
+		contrast = 0.0
+		border_shades = { 0.9, 0.9 }
+		trough_shades = { 0.97, 0.97 }
+		trough_border_shades = { 1.0, 1.0 }
+	}
+}
 
-# Force text color on radiobutton-eclipse
-style "checkradio_label" { fg[ACTIVE] = @fg_color }
+style "murrine-overlay-scrollbar" {
+	bg[ACTIVE] = shade (0.8, @bg_color)
+	bg[INSENSITIVE] = shade (0.97, @bg_color)
 
-style "entry" {
-    xthickness		= 3
-    ythickness		= 3
+	base[SELECTED] = shade (0.6, @base_color)
+	base[INSENSITIVE] = shade (0.85, @base_color)
+}
 
-#	bg[NORMAL]		= @window_active_color
+style "murrine-scale" = "murrine-thin" {
+	bg[NORMAL] = @bg_color
+	bg[ACTIVE] = @bg_color
+	bg[SELECTED] = @selected_bg_color
+	bg[INSENSITIVE] = shade (0.95, @bg_color)
 
 	engine "murrine" {
-		contrast		= 0.65
-		focusstyle		= 3
-		focus_color 	= @selected_bg_color	
+		roundness = 8
+		gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
+		border_shades = { 1.0, 1.0 }
+		trough_shades = { 1.08, 1.08 }
+		trough_border_shades = { 0.8, 0.8 }
 	}
 }
 
-style "expander" {
-	bg[NORMAL]			= "#FFF"
-	fg[NORMAL]			= shade (2.0, @text_color)
-	fg[PRELIGHT]		= shade (2.0, @text_color)
+style "murrine-progressbar" = "murrine-thin" {
+	bg[NORMAL] = @bg_color
+	bg[ACTIVE] = shade (1.08, @bg_color)
+
+	fg[PRELIGHT] = @selected_fg_color
 
 	engine "murrine" {
-		contrast		= 1.2
-		gradient_shades	= {1.0, 1.0, 1.0, 1.0}
+		roundness = 2
+		border_shades = { 1.2, 1.2 }
+		trough_border_shades = { 0.8, 0.8 }
 	}
 }
 
-style "frame_title" {
-	fg[NORMAL]	= shade(0.80, @fg_color)
+style "murrine-treeview-header" = "murrine-button" {
+  	engine "murrine" {
+		roundness = 0
+	}
 }
 
-style "handle" {
-	engine "pixmap" {
-		image {
-            function = HANDLE
-            overlay_file = "Others/pane-separator-grip.svg"
-            overlay_stretch = FALSE
-            orientation = HORIZONTAL
-        }
-        image {
-            function = HANDLE
-            overlay_file = "Others/pane-separator-grip-vertical.svg"
-            overlay_stretch = FALSE
-            orientation = VERTICAL
-        }
+style "murrine-treeview" {
+  	engine "murrine" {
+		roundness = 0
 	}
 }
 
-class "GtkPaned"	style "handle"
+style "murrine-frame-title" {
+	fg[NORMAL] = lighter (@fg_color)
+}
+
+style "murrine-tooltips" {
+	xthickness = 5
+	ythickness = 5
+
+	bg[NORMAL] = @tooltip_bg_color
+	bg[SELECTED] = @tooltip_bg_color
 
-style "menubar" {
-	xthickness	= 3
-	ythickness	= 0
+	fg[NORMAL] = @tooltip_fg_color
 
-	fg[PRELIGHT]	    = @selected_fg_color
-	fg[ACTIVE]	    	= @selected_fg_color
-	fg[SELECTED]	    = @selected_fg_color
-	bg[NORMAL]          = shade (1.00, @window_active_color)
-    
 	engine "murrine" {
-		gradient_shades     	= {1.00, 1.00, 1.00, 1.00}
-        border_shades 			= {1.1, 0.9}
-		contrast            	= 0.90
-		lightborderstyle		= 1
-		textstyle               = 1
-		text_shade				= 0.7
+		textstyle = 0
+		roundness = 2
+		rgba = FALSE
 	}
 }
 
-style "menu" {
-	xthickness	= 0
-	ythickness	= 0
-	
-	GtkMenuItem::arrow-scaling	= 0.6
+style "murrine-spinbutton" = "murrine-button" {
+	engine "murrine" {
+	}
+}
 
-	bg[NORMAL]				= shade (1.00, @bg_color)
+style "murrine-radiocheck" = "murrine-default" {
+	bg[SELECTED] = @base_color
 
+	text[NORMAL] = @selected_bg_color
+	text[PRELIGHT] = @selected_bg_color
+}
+
+style "murrine-entry" = "murrine-wider" {
 	engine "murrine" {
-		gradient_shades		= {1.00, 1.00, 1.00, 1.00}
-		roundness			= 0 # 0 = squared 
+		border_shades = { 1.15, 1.15 }
 	}
 }
 
-style "menu_item_white" {
-	xthickness	= 2
-	ythickness	= 3
+style "metacity-frame" = "murrine-default" {
+	bg[SELECTED] = @selected_bg_color
+}
+
+style "murrine-statusbar" { }
+style "murrine-comboboxentry" = "murrine-entry" { }
+style "murrine-hscale" = "murrine-scale" { }
+style "murrine-vscale" = "murrine-scale" { }
+style "murrine-hscrollbar" = "murrine-scrollbar" { }
+style "murrine-vscrollbar" = "murrine-scrollbar" { }
+
+# Menus
 
-	fg[NORMAL] 			= shade (1.00, @fg_color)					# menu item normal
-    fg[INSENSITIVE] 	= mix(0.60, @fg_color, @theme_bg_color)	    # menu item disabled
-	fg[PRELIGHT]		= @selected_fg_color						# menu item selected
+style "murrine-menu" = "murrine-thin" {
+	bg[NORMAL] = @menu_bg_color
+	bg[PRELIGHT] = @selected_bg_color
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = @menu_bg_color
+	bg[INSENSITIVE] = @menu_bg_color
 
-	text[NORMAL]        = shade (1.00, @fg_color)					# Color check/radio menu
-	text[INSENSITIVE] 	= mix(0.60, @text_color, @bg_color)	    
-	text[PRELIGHT]      = @selected_fg_color            			# Color check/radio menu
+	fg[NORMAL] = @menu_fg_color
+	fg[PRELIGHT] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @selected_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
 
-    bg[PRELIGHT]      	= shade (1.00, @selected_bg_color)
-    bg[SELECTED]      	= shade (1.00, @selected_bg_color)
+	text[NORMAL] = @menu_fg_color
+	text[PRELIGHT] = @selected_fg_color
+	text[SELECTED] = @selected_fg_color
+	text[ACTIVE] = @selected_fg_color
+	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
 
 	engine "murrine" {
-        gradient_shades		= {0.90, 0.95, 0.95, 1.00}
-		border_shades 		= {1.40, 1.0}
-        roundness           = 1
-        contrast            = 0.8           # separators contrast
-		#textstyle          = 2
-		#text_shade			= 0.4
+		roundness = 0
 	}
 }
 
-style "menubar_menuitem" {
-	xthickness	= 2
-	ythickness	= 3
+style "murrine-menu-item" = "murrine-wider" {
+	bg[PRELIGHT] = @selected_bg_color
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = @selected_bg_color
 
-	fg[NORMAL] 		= shade (1.00, @fg_color)						# menu item normal
-    fg[INSENSITIVE] = mix(0.60, @fg_color, @window_active_color)	    # menu item disabled
-	fg[PRELIGHT]	= @selected_fg_color										# menu item selected
-
-	bg[PRELIGHT]    = shade (0.94, @selected_bg_color)
-	bg[SELECTED]    = shade (1.05, @selected_bg_color)
+	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
+	fg[PRELIGHT] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @selected_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
 
 	engine "murrine" {
-        gradient_shades		= {1.03, 1.00, 1.00, 1.00}
-        roundness           = 1
-        contrast            = 0.5
-		textstyle           = 1
-		text_shade			= 0.7
+		textstyle = 0
+		border_shades = { 1.2, 1.2 }
 	}
 }
 
-style "notebook" {
-    xthickness		= 8 
-    ythickness		= 2
-  
-	bg[NORMAL]		= @base_color							# selected tab entire
-	bg[ACTIVE]		= shade (1.15, @window_active_color)	# unselected tab
-	bg[INSENSITIVE]	= shade (1.05, @base_color)				# disabled controls
+style "murrine-separator-menu-item" = "murrine-thin" { }
+
+style "murrine-menubar" {
+	bg[NORMAL] = @menubar_bg_color
+	bg[PRELIGHT] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[SELECTED] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[ACTIVE] = shade (0.9, @menubar_bg_color)
+	bg[INSENSITIVE] = @menubar_bg_color
 
-	fg[NORMAL]		= shade (1.00, @fg_color)				# text selected tab
-	fg[ACTIVE]		= shade (1.05, @fg_color)				# text unselected tab
-	fg[INSENSITIVE] = shade (1.10, @fg_color)
+	fg[NORMAL] = @menubar_fg_color
+	fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
+	fg[SELECTED] = shade (1.08, @menubar_fg_color)
+	fg[ACTIVE] = @menubar_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
 
-	engine "murrine" {	
-		contrast 		= 1.3
+	engine "murrine" {
+		roundness = 0
 	}
 }
 
-style "progressbar" {
-	xthickness	= 0
-	ythickness	= 0
+style "murrine-menubaritem" {
+	bg[NORMAL] = @menubar_bg_color
+	bg[PRELIGHT] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[SELECTED] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[ACTIVE] = shade (0.9, @menubar_bg_color)
+	bg[INSENSITIVE] = @menubar_bg_color
 
-	bg[ACTIVE]		=  shade (0.95, @base_color)
-	bg[SELECTED]	=  shade (1.10, @selected_bg_color)	
+	fg[NORMAL] = @menubar_fg_color
+	fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
+	fg[SELECTED] = shade (1.08, @menubar_fg_color)
+	fg[ACTIVE] = @menubar_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
 
 	engine "murrine" {
-		gradient_shades			= {1.5, 1.0, 1.0, 0.85}
-		border_shades 			= {1.7, 1.5}
-		roundness				= 1
-		contrast				= 0.95
-		reliefstyle				= 0
-		lightborder_shade		= 1.05
-		lightborderstyle		= 1 # 0 = top side, 1 = all sides
-		trough_border_shades 	= {1.0, 1.1}
+		roundness = 0
 	}
 }
 
-style "scale" { # slider
-
-	GtkScale::trough-border			= 1
-	GtkScale::slider-width			= 8
-	GtkScale::slider-length 		= 15
-	GtkScale::trough-side-details	= 1
+# Toolbars
 
-	xthickness	= 2
-	ythickness	= 2
+style "murrine-toolbar" = "murrine-thin" {
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.02, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = shade (0.9, @bg_color)
+	bg[INSENSITIVE] = @bg_color
 
-	bg[NORMAL]		= shade (0.95, @selected_bg_color)
-	bg[SELECTED]	= shade (1.25, @selected_bg_color)
-	bg[PRELIGHT]	= shade (0.82, @selected_bg_color)
+	fg[NORMAL] = @fg_color
+	fg[PRELIGHT] = @fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @fg_color
+	fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
 
 	engine "murrine" {
-		sliderstyle				= 0 					# slider shape
-		contrast 				= 1.1					# elements border
-		gradient_shades 		= {1.1, 1.0, 1.0, 0.9}	# slider gradient
-		border_shades 			= {0.8, 0.9}			# slider border
-		roundness 				= 0
-		lightborderstyle		= 1 					# inner-stroke progress-higlight y slider
-		lightborder_shade		= 1.1
-
-		trough_shades			= {0.7, 0.8}
-		trough_border_shades 	= {1.0, 1.7}
-		#trough_border_shades	= {0.9, 1.20}
-		glow_shade 				= 1.0
-		reliefstyle 			= 0
-#		shadow_shades 			= { 1.0, 0.9 }
 	}
 }
 
-style "scale-1" { # slider
- 	xthickness	= 2
-	ythickness	= 2
-
-	bg[NORMAL]		= shade (0.75, @button_base)
-	bg[SELECTED]	= shade (1.35, @selected_bg_color)
-	bg[PRELIGHT]	= shade (0.82, @button_base)
-	bg[ACTIVE]		= shade (0.85, @theme_bg_color)
-
-	engine "murrine" {		
-		border_shades           = {0.8, 0.6}
-		contrast                = 1.00
-		gradient_shades         = {1.25,1.00,0.99,0.80}	
-		roundness		    	= 18
-		lightborderstyle		= 1		
-		trough_shades			= {0.9, 1.1}
-		trough_border_shades 	= {1.0, 1.5}
-	}
-}
+style "murrine-toolbutton" = "murrine-button" {
+	bg[NORMAL] = shade (1.08, @bg_color)
+	bg[PRELIGHT] = shade (1.10, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = shade (0.95, @bg_color)
+	bg[INSENSITIVE] = shade (0.85, @bg_color)
+
+	fg[NORMAL] = @fg_color
+	fg[PRELIGHT] = @fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @fg_color
+	fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
 
-style "scrollbar" {
-	bg[NORMAL]		= @selected_bg_color
-	bg[SELECTED]	= shade (1.1, @selected_bg_color)
-	bg[ACTIVE]		= @selected_bg_color
-	bg[PRELIGHT]	= shade (1.25, @selected_bg_color)
-	
 	engine "murrine" {
-		roundness		= 0
-		border_shades	= {1.0, 1.0}
-		contrast		= 0.0
 	}
 }
 
-style "overlay_scrollbar" {
-	bg[SELECTED] 		= shade (1.0, @selected_bg_color)
-	bg[INSENSITIVE] 	= shade (0.85, @theme_bg_color)
-	bg[ACTIVE] 			= shade (0.6, @theme_bg_color)
-}
+class "GtkToolbar" style "murrine-toolbar"
+class "GtkHandleBox" style "murrine-toolbar"
+widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
+
+# Panels
+
+style "murrine-panel" = "murrine-thin" {
+	xthickness = 2
+
+	bg[NORMAL] = @panel_bg_color
+	bg[PRELIGHT] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	bg[SELECTED] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	bg[ACTIVE] = shade (0.8, @panel_bg_color)
+	bg[INSENSITIVE] = @panel_bg_color
+
+	fg[NORMAL] = @panel_fg_color
+	fg[PRELIGHT] = shade (1.08, @panel_fg_color)
+	fg[SELECTED] = shade (1.08, @panel_fg_color)
+	fg[ACTIVE] = @panel_fg_color
+	fg[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color)
+
+	base[NORMAL] = @panel_bg_color
+	base[PRELIGHT] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	base[SELECTED] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	base[ACTIVE] = shade (0.9, @panel_bg_color)
+	base[INSENSITIVE] = @panel_bg_color
+
+	text[NORMAL] = @panel_fg_color
+	text[PRELIGHT] = shade (1.08, @panel_fg_color)
+	text[SELECTED] = shade (1.08, @panel_fg_color)
+	text[ACTIVE] = @panel_fg_color
+	text[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color)
 
-style "spinbutton" = "button" { # input/stepper 
-	#bg[NORMAL]		= "#FFF"
 	engine "murrine" {
-		contrast			= 1.0
-        lightborder_shade	= 1.00
+		roundness = 0
+		contrast = 0.0
 	}
 }
 
-style "toolbar" = "wider" {
-	bg[NORMAL]		= shade (1.00, @window_active_color)
-    	
+widget "*PanelWidget*" style "murrine-panel"
+widget "*PanelApplet*" style "murrine-panel"
+widget "*fast-user-switch*" style "murrine-panel"
+widget "*CPUFreq*Applet*" style "murrine-panel"
+widget "*indicator-applet*" style "murrine-panel"
+class "PanelApp*" style "murrine-panel"
+class "PanelToplevel*" style "murrine-panel"
+widget_class "*PanelToplevel*" style "murrine-panel"
+widget_class "*notif*" style "murrine-panel"
+widget_class "*Notif*" style "murrine-panel"
+widget_class "*Tray*" style "murrine-panel" 
+widget_class "*tray*" style "murrine-panel"
+widget_class "*computertemp*" style "murrine-panel"
+widget_class "*Applet*Tomboy*" style "murrine-panel"
+widget_class "*Applet*Netstatus*" style "murrine-panel"
+widget "*gdm-user-switch-menubar*" style "murrine-panel"
+
+style "bold-panel-item" {
+	font_name = "Bold"
+
 	engine "murrine" {
-		separatorstyle		= 0
-		lightborderstyle	= 0		
-		contrast			= 0.9
-		lightborder_shade	= 1.0
-        gradient_shades     = {1.00, 0.98, 0.97, 0.95}        
+		roundness = 0
 	}
 }
 
-style "toolbar_button" {
-    xthickness	= 3
-    ythickness	= 3	
+widget "*Panel*MenuBar*" style "bold-panel-item"
+widget "*gimmie*" style "bold-panel-item"
 
-    bg[PRELIGHT]	= shade (0.95, @window_active_color)
-    bg[ACTIVE]		= shade (0.80, @window_active_color)
-	bg[SELECTED]	= shade (0.85, @window_active_color)
-	bg[INSENSITIVE]	= shade (0.98, @window_active_color)
+# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
+# class "*Panel*" style "murrine-panel" # Disabled to fix bug
 
-	fg[INSENSITIVE]	= shade (0.7, @window_active_color)
+# XFCE Styles
 
-	engine "murrine" {
-		gradient_shades		= {1.00,0.96,0.96,0.90}
-		border_shades		= {1.10, 0.90}
-		contrast			= 1.00
-		lightborderstyle	= 1
-	}
+style "workspace-switcher" = "murrine-panel" {
+	bg[SELECTED] = @selected_bg_color
 }
 
-# toolbar separator
-style "toolbar_separator" {
-	xthickness = 0
-  	ythickness = 0
+style "xfce-header" {
+	bg[NORMAL] = shade (0.9, @bg_color)
+	base[NORMAL] = shade (1.18, @bg_color)
+}
 
-	bg[NORMAL]	    = shade (0.80, @theme_bg_color)
-	engine "murrine" {
-		border_shades	= {1.00, 1.00}
-		contrast     	= 0.5
-	}
+style "xfdesktop-windowlist" {
+	bg[NORMAL] = @base_color
+	fg[INSENSITIVE] = shade (0.95, @base_color)
+	text[INSENSITIVE] = shade (0.95, @base_color)
 }
 
-# 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 "separator_menu_item" {
-	xthickness = 1
-	ythickness = 0
+style "xfdesktop-icon-view" {
+	XfdesktopIconView::label-alpha = 0
+	XfdesktopIconView::selected-label-alpha = 60
+	XfdesktopIconVIew::ellipsize-icon-labels = 1
 
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
+	base[NORMAL] = @selected_bg_color
+	base[SELECTED] = @selected_bg_color
+	base[ACTIVE] = @selected_bg_color
+
+	fg[NORMAL] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @selected_fg_color
 
 	engine "murrine" {
-		contrast 		= 0.5
-		separatorstyle 	= 0
+		textstyle = 5
+		text_shade = 0.05
 	}
 }
 
-style "separator_tool_item" {
-	xthickness = 0
-	ythickness = 1
+style "xfwm-tabwin" {
+	Xfwm4TabwinWidget::border-width = 0
+	Xfwm4TabwinWidget::icon-size = 64
 
-	GtkVSeparator::vertical-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 7
-	GtkWidget::separator-height = 1
+	bg[NORMAL] = @menu_bg_color
+	fg[NORMAL] = @menu_fg_color
 
 	engine "murrine" {
-		contrast = 0.5
-		separatorstyle = 0
+		focusstyle = 0
 	}
 }
 
-style "tooltips" {
-	xthickness	= 8
-	ythickness	= 4
+style "xfsm-logout" {
+	bg[NORMAL] = @menu_bg_color
+	bg[ACTIVE] = @menu_bg_color
+	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
+	bg[SELECTED] = shade (0.5, @menu_bg_color)
+	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
 
-	bg[NORMAL]	= @tooltip_bg_color
-	fg[NORMAL]	= @tooltip_fg_color
+	fg[NORMAL] = @menu_fg_color
+	fg[PRELIGHT] = @menu_fg_color
 
-	GtkWidget::new-tooltip-style	= 1
+	text[NORMAL] = @menu_fg_color
 
 	engine "murrine" {
-		border_colors	= { "#080808", "#080808" }
 	}
 }
 
-style "treeview" {	
-	bg[SELECTED]	= @base_color				# backcolor list-minicheck
-	text[NORMAL]    = shade (1.05, @fg_color)	# normal indicator 
+style "xfsm-logout-button" {
+	bg[NORMAL] = shade (1.2, @menu_bg_color)
+	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
 
 	engine "murrine" {
-		gradient_shades	= {1.00, 1.04, 1.06, 1.10}
-        separatorstyle 	= 0
-		contrast 		= 1.7
 	}
 }
 
-style "treeview_header"
-{
-	ythickness = 1
+widget "*WnckPager*" style "workspace-switcher"
 
-	fg[NORMAL] 		= shade(0.55, @bg_color)
-	fg[PRELIGHT] 	= shade(0.80, @text_color)
-
-	engine "pixmap"
-	{
-	image 
-      	{
-        function	= BOX
-		file        = "Others/tree_header.png"
-		border      = { 1, 1, 1, 1 }
-		stretch		= TRUE
-		}
-    }
-}
+widget "*Xfce*Panel*" style "murrine-panel"
+class "*Xfce*Panel*" style "murrine-panel"
 
-#Added pixmap style for check/radiobuttons
-
-style "checkradio-pixmap"  {
-	engine "pixmap"
-	{
-
-	# Check Buttons
-
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= NORMAL
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= PRELIGHT
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= ACTIVE
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= SELECTED
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= INSENSITIVE
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked-insensitive.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state	 				= NORMAL
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch	 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state 					= PRELIGHT
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state 		        	= ACTIVE
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state 		        	= SELECTED
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-  		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 		        	= INSENSITIVE
-            shadow          		= IN
-            overlay_file			= "Check-Radio/checkbox-checked-insensitive.png"
-            overlay_stretch 		= FALSE
-	}
+# Thunar Styles
 
-	# Radio Buttons
-
-	image 
-		{
-            function        		= OPTION
-            state 					= NORMAL
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-            state 					= PRELIGHT
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-            state 					= ACTIVE
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image
-		{
-            function        		= OPTION
-            state 					= SELECTED
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-            state 					= INSENSITIVE
-            shadow         			= OUT
-            overlay_file    		= "Check-Radio/option-unchecked-insensitive.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-			state 					= NORMAL
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch 		= FALSE
-        }
- 	image 
-		{
-            function        		= OPTION
-	 	   state					= PRELIGHT
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-		    state					= ACTIVE
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch	 		= FALSE
-        }
-	image
-		{
-            function        		= OPTION
-	    	state					= SELECTED
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch	 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-	    	state 					= INSENSITIVE
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked-insensitive.png"
-            overlay_stretch 		= FALSE
-        }
-	}
+style "sidepane" {
+	base[NORMAL] = @bg_color
+	base[INSENSITIVE] = mix (0.4, shade (1.35, @selected_bg_color), shade (0.9, @base_color))
+	bg[NORMAL] = @bg_color
+	text[NORMAL] = mix (0.9, @fg_color, @bg_color)
 }
 
-style "separator" = "wide" {
+widget_class "*ThunarShortcutsView*" style "sidepane"
+widget_class "*ThunarTreeView*" style "sidepane"
+widget_class "*ThunarLocationEntry*" style "murrine-entry"
+
+# Gtk2 Open-File Dialog
+
+widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
+widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
+
+# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
+
+style "chromium-toolbar-button" {
 	engine "murrine" {
-		contrast	= 0.4
+		roundness = 2
+		textstyle = 0
 	}
 }
-class "GtkSeparator"			style "separator"
 
+style "chrome-gtk-frame" {
+	ChromeGtkFrame::frame-color = @titlebar_bg_color
+	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
+
+	ChromeGtkFrame::frame-gradient-size = 0
+	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
+
+	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
+	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
 
-# ==============================================================================
-# FIREFOX SPECIFIC SETTINGS
-# ==============================================================================
-style "ff-default" {
-	GtkCheckButton::indicator-size = 14
+	ChromeGtkFrame::incognito-frame-gradient-size = 0
+	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
+
+	ChromeGtkFrame::scrollbar-trough-color = @bg_color
+	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @fg_color, @bg_color)
+	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @fg_color, @bg_color)
 }
 
-style	"ff-statusbar" {
+class "ChromeGtkFrame" style "chrome-gtk-frame"
+
+widget_class "*Chrom*Button*" style "chromium-toolbar-button"
+
+# General Styles
+
+class "GtkWidget" style "murrine-default"
+
+class "GtkFrame" style "murrine-wide"
+class "MetaFrames" style "metacity-frame"
+class "GtkWindow" style "metacity-frame"
+
+class "GtkSeparator" style "murrine-wide"
+class "GtkCalendar" style "murrine-wide"
+
+class "GtkSpinButton" style "murrine-spinbutton"
+
+class "GtkScale" style "murrine-scale"
+class "GtkVScale" style "murrine-vscale"
+class "GtkHScale" style "murrine-hscale"
+class "GtkScrollbar" style "murrine-scrollbar"
+class "GtkVScrollbar" style "murrine-vscrollbar"
+class "GtkHScrollbar" style "murrine-hscrollbar"
+
+class "GtkRadio*" style "murrine-radiocheck"
+class "GtkCheck*" style "murrine-radiocheck"
+
+class "GtkEntry" style "murrine-entry"
+
+widget_class "*<GtkNotebook>" style "murrine-notebook"
+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"
+
+widget_class "*<GtkButton>" style "murrine-button"
+widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
+widget_class "*<GtkProgress>" style "murrine-progressbar"
+widget_class "*<GtkProgressBar>" style "murrine-progressbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
+widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
+
+widget_class "*<GtkMenu>*" style "murrine-menu"
+widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
+widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
+widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
+widget_class "*<GtkMenuBar>*" style "murrine-menubar"
+widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
+
+widget_class "*GtkToolButton*" style "murrine-toolbutton"
+widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
+widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
+widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
+
+widget_class "*.<GtkTreeView>*" style "murrine-treeview"
+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"
+
+widget "gtk-tooltip*" style "murrine-tooltips"
+
+widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
+
+# Workarounds and Non-Standard Styling
+
+style "text-is-fg-color-workaround" {
+	text[NORMAL] = @text_color
+	text[PRELIGHT] = @fg_color
+	text[SELECTED] = @selected_fg_color
+	text[ACTIVE] = @fg_color
+	text[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
 }
 
-style "FireFox-MenuBar" = "menubar" {
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
+
+style "fg-is-text-color-workaround" {
+	fg[NORMAL] = @text_color
+	fg[PRELIGHT] = @text_color
+	fg[ACTIVE] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[INSENSITIVE] = darker (@fg_color)
 }
-widget "MozillaGtkWidget*GtkMenuBar" 			style "FireFox-MenuBar"
-
-#widget	"MozillaGtkWidget*Toolbar*"		style	"theme-toolbar"
-#widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
-
-widget	"MozillaGtkWidget*"	style	"ff-default"
-
-####  Firefox  ###
-style "firefox-base-entry" {
-	GtkWidget::interior_focus	= 0
-  	#GtkEntry	:: inner-border			= { 0, 0, 0, 0 }
-    #GtkEntry	:: progress-border		= { 2, 2, 2, 2 }
-  	xthickness 	= 3
-  	ythickness 	= 3
-	base[NORMAL] = "#dedede"
-    text[NORMAL]= "#000"
-	engine "murrine" {
 
+widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
+widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
+widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
+
+style "murrine-evo-new-button-workaround" {
+	engine "murrine" {
+		toolbarstyle = 0
 	}
 }
 
-# widget	"MozillaGtkWidget*GtkFixed*GtkEntry*"	style:highest	"firefox-base-entry"
-# widget	"MozillaGtkWidget*GtkEntry*"	style:highest	"firefox-base-entry"
-
-style "firefox-text-entry" {
-    text[NORMAL]= "#ff0000"
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
 
+style "inkscape-toolbar-fix" {
 	engine "murrine" {
-
+		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+		highlight_shade = 1.0
 	}
 }
-#class "GtkInvisible" style "firefox-text-entry"
-#widget "GtkInvisible" style "firefox-text-entry"
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# The default style is applied to every widget
-class "GtkWidget"				style "default"
-class "GtkFrame"				style "wide"
-class "GtkCalendar"				style "wide"
-class "GtkEntry"				style "entry"
-
-class "GtkSpinButton"			style "spinbutton"
-class "GtkScale"				style "scale"
-class "GtkVScale"				style "scale"
-class "GtkHScale"				style "scale"
-class "GtkScrollbar"			style "scrollbar"
-
-# Overlay scrollbar
-widget_class "*<OsScrollbar>" 	style "overlay_scrollbar"
-widget_class "*<OsThumb>" 		style "overlay_scrollbar"
-
-# General matching follows. The order is choosen so that the right styles override
-# each other. EG. progressbar needs to be more important than the menu match.
-widget_class "*<GtkButton>"			    		style "button"
-widget_class "*<GtkButton>*<GtkLabel>"  			style "button_label"
-
-widget_class "*<GtkNotebook>"					style "notebook"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook"
-widget_class "*<GtkNotebook>*<GtkLabel>"        style "notebook"
-
-widget_class "*<GtkMenuBar>*"					style "menubar"
-widget_class "*<GtkMenu>*"			    		style "menu"
-widget_class "*<GtkMenuItem>*"					style "menu_item_white"
-
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*"		style "menubar_menuitem"
-
-widget_class "*<GtkToolbar>"                    style "toolbar"
-widget_class "*<GtkHandleBox>"                  style "toolbar"
-widget_class "*<GtkToolbar>.*.<GtkButton>*"     style "toolbar_button"
-class "GtkSeparatorToolItem"		            style "toolbar_separator"
-widget_class "*<GtkSeparatorToolItem>*" 			style "separator_tool_item"
-widget_class "*<GtkSeparatorMenuItem>*" 			style "separator_menu_item"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"			style "frame_title"
-widget_class "*.<GtkTreeView>*"					style "treeview"
-
-class "*GtkExpander*"  							style "expander"
-
-widget_class "*<GtkProgress>"					style "progressbar"
-
-# Treeview headers (and similar stock GTK+ widgets)
-widget_class "*.<GtkTreeView>.<GtkButton>"		style "treeview_header"
-widget_class "*.<GtkCTree>.<GtkButton>"			style "treeview_header"
-widget_class "*.<GtkList>.<GtkButton>"			style "treeview_header"
-widget_class "*.<GtkCList>.<GtkButton>"			style "treeview_header"
-
-# The window of the tooltip is called "gtk-tooltip"
-widget "gtk-tooltip*"							style "tooltips"
-
-widget_class "*<GtkCheckButton>*"				style "checkradio-pixmap"
-widget_class "*<GtkRadioButton>*"				style "checkradio-pixmap"
-widget_class "*<GtkCheckButton>*<GtkLabel>"		style:highest "checkradio_label"
-widget_class "*<GtkRadioButton>*<GtkLabel>"		style:highest "checkradio_label"
-
-##########################################################################
-# Following are special cases and workarounds for issues in applications.
-##########################################################################
-# For Google Chrome/Chromium integration.
-style "chrome-gtk-frame" {
-    ChromeGtkFrame::frame-gradient-size		    	= 120
-    ChromeGtkFrame::frame-gradient-color			= @window_active_color
-    ChromeGtkFrame::inactive-frame-gradient-color	= shade (0.90, @theme_bg_color)
-    ChromeGtkFrame::frame-color			        	= @window_active_color
-    ChromeGtkFrame::inactive-frame-color			= shade (0.90, @theme_bg_color)
-
-    ChromeGtkFrame::scrollbar-trough-color			= shade (0.99, @bg_color)
-    ChromeGtkFrame::scrollbar-slider-prelight-color	= shade (0.87, @bg_color)
-    ChromeGtkFrame::scrollbar-slider-normal-color	= shade (0.80, @bg_color)
-}
-class "ChromeGtkFrame"	style "chrome-gtk-frame"
-
-# 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]		= @text_color
-	text[SELECTED]		= shade (1.10, @selected_fg_color)
-	text[INSENSITIVE]	= shade (0.75, @fg_color)
-	text[ACTIVE]		= shade (1.10, @selected_fg_color)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"	style "text_is_fg_color_workaround"
-
-# 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]		= @text_color
-	text[SELECTED]		= shade (1.10, @selected_fg_color)
-	text[INSENSITIVE]	= shade (0.75, @fg_color)
-	text[ACTIVE]		= shade (1.10, @selected_fg_color)
-}
-widget "*.gtk-combobox-popup-menu.*"	style "menuitem_text_is_fg_color_workaround"
-
-# For places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]	= @text_color
-	fg[SELECTED]	= @selected_fg_color
-	fg[ACTIVE]		= @selected_fg_color
-	fg[INSENSITIVE] = shade (0.98, @fg_color)
-}
-widget_class "*<GtkListItem>*"		style "fg_is_text_color_workaround"
-widget_class "*<GtkCList>"		    style "fg_is_text_color_workaround"
-widget_class "*<EelEditableLabel>"	style "fg_is_text_color_workaround"
-
-style "performance-fix" {	
 
+#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
+#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
+#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
+
+# Performance Fixes
+
+style "performance-fix" {
 	engine "murrine" {
 		textstyle = 0
-		contrast = 0.5
 	}
 }
-widget "*OOoFixed*"			style "performance-fix" # Openoffice/Libreoffice
-
-# For gvim scrollbars.
-#style "vim-scrollbar" = "scrollbar" {
-#	GtkScrollbar	::slider_width		= 16
-#	GtkScrollbar	::stepper_size		= 16
-
-#	engine "pixmap" {
-#		image {
-#			function	= BOX
-#			orientation	= VERTICAL
-#			file		= "assets/scroll-background.png"
-#		}
-#	}
-#}
-#widget "vim-main-window.*Scrollbar*"	style "vim-scrollbar"
-
-# For Eclipse (swt) toolbars.
-widget "*swt*toolbar*"			style "default"
-
-
-# ---------------------------------
-# Xfce panel theming
-# ---------------------------------
-#style "xfce-panel" {
-#    fg[NORMAL]          = @fg_color
-#    fg[PRELIGHT]        = @selected_fg_color
-#    fg[ACTIVE]          = @selected_fg_color
-#    fg[SELECTED]        = @selected_fg_color
-#
-#    bg[NORMAL]          = shade (1.00, @window_active_color)
-#    bg[PRELIGHT]        = shade (0.80, @window_active_color)
-#    bg[ACTIVE]          = shade (0.50, @window_active_color)
-#    bg[SELECTED]        = shade (1.20, @selected_bg_color)
-#    engine "murrine" {
-#        gradient_shades         = {0.80, 0.85, 0.95, 1.00}
-#        roundness           = 2
-#        contrast            = 0.2
-#    }
-#    xthickness = 3
-#    ythickness = 3
-#}
-#widget "*Xfce*Panel*"   style "xfce-panel"
-#class "*Xfce*Panel*"    style "xfce-panel"
 
-style "xfdesktop-icon-view" {
-    XfdesktopIconView::label-alpha = 0
-    XfdesktopIconView::selected-label-alpha = 100
-    XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-    XfdesktopIconView::shadow-x-offset = 1
-    XfdesktopIconView::shadow-y-offset = 1
-    XfdesktopIconView::shadow-color = "#000000"
-    XfdesktopIconView::selected-shadow-x-offset = 1
-    XfdesktopIconView::selected-shadow-y-offset = 1
-    XfdesktopIconView::selected-shadow-color = "#000000"
-
-    XfdesktopIconView::cell-spacing = 0
-    XfdesktopIconView::cell-padding = 0
-    XfdesktopIconView::cell-text-width-proportion = 2
-
-    base[NORMAL]   = @selected_bg_color
-    base[SELECTED] = @selected_bg_color
-    base[ACTIVE]   = @selected_bg_color
-
-    fg[NORMAL]      = @selected_fg_color
-    fg[SELECTED]    = @selected_fg_color
-    fg[ACTIVE]      = @selected_fg_color
-}
+widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
+widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
+widget_class "*GimpToolbox*" style "performance-fix"
+widget_class "*GimpMenuDock*" style "performance-fix"
+widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
+widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
 
+widget_class "*XfceHeading*" style "xfce-header"
+widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
 widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-# widget "xfwm4-tabwin*" style "murrine-dark"
-include "app-styles/file-manager.rc"
-include "app-styles/terminal.rc"
-include "app-styles/panel.rc"
+widget "xfwm4-tabwin*" style "xfwm-tabwin"
+widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
+widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png
deleted file mode 100755
index 76bbb50..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-checked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-checked.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-checked.png
deleted file mode 100755
index eaf8ed5..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-checked.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png
deleted file mode 100755
index 9089b6e..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-unchecked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-unchecked.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-unchecked.png
deleted file mode 100755
index 970855c..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/checkbox-unchecked.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck.png
deleted file mode 100644
index ae0cc6a..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck_prelight.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck_prelight.png
deleted file mode 100644
index 35dc5a7..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck_prelight.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption.png
deleted file mode 100644
index ca3b939..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption_prelight.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption_prelight.png
deleted file mode 100644
index 0a409ab..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption_prelight.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-checked-insensitive.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/option-checked-insensitive.png
deleted file mode 100755
index e8eba91..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-checked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-checked.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/option-checked.png
deleted file mode 100755
index 5300b98..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-checked.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-unchecked-insensitive.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/option-unchecked-insensitive.png
deleted file mode 100755
index 6672d93..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-unchecked-insensitive.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-unchecked.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/option-unchecked.png
deleted file mode 100755
index 7ac4322..0000000
--- a/Kogaion-nighttime/gtk-2.0/Check-Radio/option-unchecked.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Others/null.png b/Kogaion-nighttime/gtk-2.0/Others/null.png
deleted file mode 100644
index 9d7e6be..0000000
--- a/Kogaion-nighttime/gtk-2.0/Others/null.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Others/pane-separator-grip-vertical.svg b/Kogaion-nighttime/gtk-2.0/Others/pane-separator-grip-vertical.svg
deleted file mode 100755
index 87ae808..0000000
--- a/Kogaion-nighttime/gtk-2.0/Others/pane-separator-grip-vertical.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="2" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">

- <g fill="#828282">

-  <ellipse style="enable-background:new" rx="1" ry="1" cy="2.5" cx="1"/>

-  <ellipse style="enable-background:new" rx="1" ry="1" cy="13.5" cx="1"/>

-  <ellipse style="enable-background:new" rx="1" ry="1" cy="8" cx="1"/>

- </g>

-</svg>

diff --git a/Kogaion-nighttime/gtk-2.0/Others/pane-separator-grip.svg b/Kogaion-nighttime/gtk-2.0/Others/pane-separator-grip.svg
deleted file mode 100755
index a4136b1..0000000
--- a/Kogaion-nighttime/gtk-2.0/Others/pane-separator-grip.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="2" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">

- <g transform="translate(0,-14)" fill="#828282">

-  <ellipse style="enable-background:new" rx="1" transform="scale(-1)" ry="1" cy="-15" cx="-2.5"/>

-  <ellipse style="enable-background:new" rx="1" transform="scale(-1)" ry="1" cy="-15" cx="-8"/>

-  <ellipse style="enable-background:new" rx="1" transform="scale(-1)" ry="1" cy="-15" cx="-13.5"/>

- </g>

-</svg>

diff --git a/Kogaion-nighttime/gtk-2.0/Others/tree_header.png b/Kogaion-nighttime/gtk-2.0/Others/tree_header.png
deleted file mode 100755
index f8eec80..0000000
--- a/Kogaion-nighttime/gtk-2.0/Others/tree_header.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.png
deleted file mode 100755
index 6a69afe..0000000
--- a/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.svg b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.svg
deleted file mode 100755
index ee6900a..0000000
--- a/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.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="36"
-   viewBox="0 0 72.000002 36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="panel-bg-new.svg"
-   inkscape:export-filename="C:\Users\Ionel\Downloads\theme work\Panel\panel-bg-new.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4146">
-      <stop
-         style="stop-color:#4c77bf;stop-opacity:1"
-         offset="0"
-         id="stop4148" />
-      <stop
-         style="stop-color:#2153a7;stop-opacity:1"
-         offset="1"
-         id="stop4150" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4146"
-       id="linearGradient4152"
-       x1="35.734146"
-       y1="1026.4714"
-       x2="35.63451"
-       y2="1052.3564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.3846154,0,-404.91378)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#a5a5a5"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="35.82401"
-     inkscape:cy="6.0729682"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <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,-1016.3622)">
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient4152);fill-opacity:1;stroke:none;stroke-width:1.16299999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4136"
-       width="72"
-       height="36"
-       x="0"
-       y="1016.3622" />
-  </g>
-</svg>
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-active.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-active.png
deleted file mode 100644
index 6fe52ae..0000000
--- a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-active.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-hover.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-hover.png
deleted file mode 100644
index 67b8b20..0000000
--- a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-hover.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-inactive.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-inactive.png
deleted file mode 100644
index 309c39c..0000000
--- a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-inactive.png
+++ /dev/null
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/file-manager.rc b/Kogaion-nighttime/gtk-2.0/app-styles/file-manager.rc
deleted file mode 100755
index 92afeca..0000000
--- a/Kogaion-nighttime/gtk-2.0/app-styles/file-manager.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-style "sidepane" 
-{
-	base[NORMAL]		= mix (0.5, @window_active_color, @bg_color)	# backgroung
-	bg[NORMAL]			= shade (0.91, @base_color)
-#	bg[PRELIGHT]		= @base_color
-	
-	engine "murrine"
-	{ 
-		contrast				= 0.80
-	}
-}
-
-# Thunar
-
-style "thunar-path-entry-increased-style"
-{
-  ThunarPathEntry::icon-size = 16
-}
-class "ThunarPathEntry" style "thunar-path-entry-increased-style"
-
-style "thunar-location-buttons"
-{
-  ThunarLocationButtons::spacing = 0
-}
-class "ThunarLocationButtons" style "thunar-location-buttons"
-
-widget_class "*ThunarShortcutsView*" 	style "sidepane"
-widget_class "*ThunarTreeView*" 	style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*"	style "sidepane"
-
-# Caja
-
-widget_class "*CajaSidePane*" style "sidepane"
-# widget_class "*CajaPathBar.*ToggleButton*" style:highest "test"
-# widget "*CajaNavigationWindow*GtkHPaned*" style "test"
-# widget_class "*CajaNotebook" style "test"
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
deleted file mode 100644
index 7ce4e4a..0000000
--- a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
+++ /dev/null
@@ -1,208 +0,0 @@
-style "pixmap-panel"
-{
-	xthickness = 2 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
-	ythickness = 2
-
-	fg[NORMAL]		= lighter (@fg_color)
-	fg[PRELIGHT]	= shade (1.75, @selected_bg_color)
-	fg[ACTIVE]		= lighter (@fg_color)
-
-#	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]       	= shade (1.0, @window_active_color)
-#	bg[ACTIVE]			= @selected_bg_color
-#	bg[PRELIGHT]      	= shade(1.75, @selected_bg_color)
-#	bg[SELECTED]      	= @selected_bg_color
-	
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "Panel/panel-button-inactive.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		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
-#		}
-	}
-}
-
-style "other-panel" 	# this style is somehow doubled, discard when no longer needed
-{
-	xthickness = 0
-	ythickness = 0
-
-	fg[NORMAL]		= lighter (@fg_color)
-	fg[PRELIGHT]	= shade (1.75, @selected_bg_color)
-	fg[ACTIVE]		= lighter (@fg_color)
-	fg[SELECTED]	= @selected_bg_color
-
-	bg[NORMAL]       	=  shade (1.0, @window_active_color)
-#	bg[ACTIVE]			=  @selected_bg_color
-#	bg[PRELIGHT]      	=  shade(1.75, @selected_bg_color)
-#	bg[SELECTED]      	=  @selected_bg_color
-
-	engine "pixmap" {
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= NORMAL
-			file		= "Panel/panel-button-inactive.png"
-			border		= { 4, 4, 1, 1 }
-			stretch		= TRUE
-		}
-		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			= HANDLE
-      		recolorable			= TRUE
-     		overlay_file		= "Others/null.png"
-     		#overlay_file		= "Handles/handle-v.png"
-      		overlay_stretch		= FALSE
-      		orientation			= VERTICAL
-    	}
-    	image {
-      		function			= HANDLE
-     		overlay_file		= "Others/null.png"
-     		#overlay_file		= "Handles/handle-h.png"
-      		overlay_stretch 	= FALSE
-      		orientation			= HORIZONTAL
-    	}
-	}
-}
-
-style "theme-panel-light"
-{
-	xthickness = 1
-	ythickness = 0
-
-	fg[NORMAL] = @fg_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-	}
-}
-
-style "theme-panel-text"
-{
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]		= "#f5f5f5"
-
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-	
-#	bg[NORMAL]	= @test2
-
-	engine "murrine" { }
-}
-
-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
-		}
-	}
-}
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"				style "pixmap-panel"
-class "*Xfce*Panel*"					style "pixmap-panel"
-
-# Other (MATE) panel
-
-widget "*PanelWidget*"				style "other-panel"
-# widget "*PanelApplet*"				style "other-panel"
-widget "*fast-user-switch*"			style "other-panel"
-widget "*CPUFreq*Applet*"			style "other-panel"
-widget "*indicator-applet*"			style "other-panel"
-class "PanelApp*"					style "other-panel"
-class "PanelToplevel*"				style "other-panel"
-widget_class "*PanelToplevel*"		style "other-panel"
-
-# widget_class "*notif*"			style "other-panel"
-# widget_class "*Notif*"			style "other-panel"
-# widget_class "*Tray*"			style "other-panel" 
-# widget_class "*tray*"			style "other-panel"
-# widget_class "*computertemp*"		style "other-panel"
-# widget_class "*Applet*Tomboy*"		style "other-panel"
-# widget_class "*Applet*Netstatus*"	style "other-panel"
-
-# Fixes for tooltip text in some apps.
-# widget_class "*Notif*Beagle*"	style "theme-panel-light"
-# widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# lxpanel and fbpanel
-# widget "*.tclock.*"		style "other-panel"
-# widget "*.taskbar.*"		style "other-panel"
-# widget_class "*GtkBgbox*"	style "other-panel"
-
-# 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 "other-panel"
-widget "*PanelApplet*"				style "other-panel"
-
-# Hide ugly handle
-# class "PanelAppletFrame" 			style:highest "theme-panel-handle"
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/terminal.rc b/Kogaion-nighttime/gtk-2.0/app-styles/terminal.rc
deleted file mode 100755
index 4b24b7c..0000000
--- a/Kogaion-nighttime/gtk-2.0/app-styles/terminal.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-style "terminal"
-{
-	
-	bg[NORMAL]		= @bg_color
-	bg[ACTIVE]		= @bg_color
-	bg[PRELIGHT]	= @bg_color
-	bg[SELECTED]	= @bg_color
-	base[NORMAL]	= @bg_color
-}
-
-style "terminal-notebook"  
-{
-	bg[NORMAL]		= darker(@window_active_color) # bg selected tab
-	bg[ACTIVE]		= @window_active_color
-	fg[NORMAL]		= @fg_color	# text selected tab
-	fg[ACTIVE]		= @bg_color
-
-	engine "murrine"
-	{
-		contrast        	= 0.0	
-	}
-}
-
-style "notebook-button" {
-    xthickness		= 0
-    ythickness		= 0
-	bg[ACTIVE]	= shade (0.68, @window_active_color)    
-	bg[PRELIGHT]    = shade (0.75, @window_active_color)
-	engine "murrine"
-	{
-		gradient_shades		= {1.00,1.00,1.00,1.00}
-		contrast        	= 0.6
-		roundness       	= 0
-	}    
-}
-
-class "*TerminalWindow"										style "terminal"
-widget_class "TerminalWindow*GtkNotebook"					style "terminal-notebook"
-widget_class "TerminalWindow*<GtkNotebook>*<GtkLabel>" 	style "terminal-notebook"
-widget_class "TerminalWindow*<GtkNotebook>*<GtkButton>" 	style "notebook-button"
-
diff --git a/Kogaion-nighttime/gtk-2.0/gtkrc b/Kogaion-nighttime/gtk-2.0/gtkrc
index a7c7dbe..b52aac1 100755..100644
--- a/Kogaion-nighttime/gtk-2.0/gtkrc
+++ b/Kogaion-nighttime/gtk-2.0/gtkrc
@@ -1,1044 +1,763 @@
-gtk-color-scheme = "base_color:#383838\nbg_color:#2e2e2e"
-gtk-color-scheme = "text_color:#d4d4d4\nfg_color:#bababa"
-gtk-color-scheme = "selected_bg_color:#496490\nselected_fg_color:#f3f3f3"
-gtk-color-scheme = "tooltip_bg_color:#303030\ntooltip_fg_color:#ffffff\nlink_color:#4a90f9"
-gtk-color-scheme = "theme_bg_color:#2e2e2e\nbutton_base:#2e2e2e"
-
-gtk_color_scheme = "window_active_color:#496490" #Windows decorations
-gtk_color_scheme = "test1:#ff0000\ntest2:#00ff00" #debug colors
-
-gtk-auto-mnemonics	= 1
-
-style "default" {
-	xthickness	= 1
-	ythickness	= 1
-
-	#######################
-	# Style Properties
-	#######################
-	GtkButton   			::child-displacement-x	= 0
-	GtkButton				::child-displacement-y	= 0
-	GtkButton				::default-border		= {0, 0, 0, 0}
-	GtkButton				::image-spacing			= 4
-	GtkToolButton			::icon-spacing			= 4
-
-	GtkCheckButton			::indicator-size		= 16
-	GtkRadioButton			::indicator-size		= 16
-
-	GtkEntry				::honors-transparent-bg-hint	= 1
-	GtkEntry				::invisible-char		= 0x2022
-	GtkEntry				::progress-border		= {2, 2, 2, 2}
-	GtkEntry    			::state-hint        	= 0
-
-	GtkProgressBar			::min-vertical-bar-width	= 13
-	GtkProgressBar			::min-horizontal-bar-height	= 13
-
-	GtkExpander				::expander-size			= 8
-
-	GtkMenuBar  			::internal-padding		= 0
-	GtkMenuBar  			::window-dragging		= 1
-	GtkMenuBar				::shadow-type			= GTK_SHADOW_NONE
-	GtkMenu					::horizontal-padding	= 0
-	GtkMenu					::vertical-padding		= 0
-	GtkSeparatorMenuItem	::horizontal-padding	= 7
-
-	GtkNotebook				::tab-overlap			= 2		# Default = 2
-	GtkNotebook				::tab-curvature			= 1		# Default = 1
-	
-	GtkPaned				::handle-size			= 4
-
-	GtkRange				::trough-border			= 0
-	GtkRange				::slider-width			= 15
-	GtkRange				::stepper-size			= 1
-
-	GtkScale				::slider-length			= 14
-	GtkScale				::slider-width			= 14
-	GtkScale				::trough-side-details	= 1
-
-	GtkScrollbar    		::has-backward-stepper	= 0  
-	GtkScrollbar			::has-forward-stepper	= 0
-	GtkScrollbar			::min-slider-length		= 30
-	GtkScrollbar			::slider-width			= 6
-	GtkScrollbar			::trough-border			= 3
-	GtkScrollbar			::activate-slider 		= 1
-	GtkScrollbar			::trough-side-details	= 0
-	GtkScrollbar			::stepper-size          = 1
-
-	GtkScrolledWindow		::scrollbar-spacing		= 0
-	GtkScrolledWindow		::scrollbars-within-bevel	= 1
-
-	GtkToolbar				::internal-padding		= 0
-	GtkToolbar				::window-dragging		= 1
-
-	GtkTreeView				::expander-size			= 8
-	GtkTreeView				::odd_row_color			= shade (1.05, @base_color)
-
-	#GtkTreeView			::even_row_color		= shade (1.05, @base_color)
-
-	GtkWidget				::link-color 			= @link_color
-	GtkWidget				::focus-padding			= 0
-	WnckTasklist			::fade-overlay-rect		= 0
-    
-	GtkWindow               ::resize-grip-height    = 0
-	GtkWindow               ::resize-grip-width     = 0
-	GtkImage				::x-ayatana-indicator-dynamic 	= 1
-
-
-	####################
-	# Color Definitions
-	####################
-
-	bg[NORMAL]          = @theme_bg_color
-	bg[PRELIGHT]		= shade (1.02, @theme_bg_color)
-	bg[SELECTED]		= @window_active_color		#used by metacity/xfwm
-	bg[INSENSITIVE] 	= shade (1.20,@theme_bg_color)
-	bg[ACTIVE]         	= @theme_bg_color
-
-	fg[NORMAL]          = @fg_color
-	fg[PRELIGHT]		= @text_color
-	fg[SELECTED]		= shade (1.10, @selected_fg_color)
-	fg[INSENSITIVE] 	= shade (1.85, @bg_color)
-	fg[ACTIVE]			= @fg_color		
-
-	text[NORMAL]		= @fg_color
-	text[PRELIGHT]		= @text_color
-	text[SELECTED]		= shade (1.10, @selected_fg_color)
-	text[INSENSITIVE]	= shade (0.75, @fg_color)
-	text[ACTIVE]		= shade (1.10, @selected_fg_color)
-
-	base[NORMAL]		= @base_color
-	base[PRELIGHT]		= shade (0.95, @theme_bg_color)
-	base[SELECTED]		= @selected_bg_color
-	base[INSENSITIVE]	= shade (1.20, @theme_bg_color)
-	base[ACTIVE]		= @selected_bg_color
+# Numix GTK Theme
+
+gtk-color-scheme = "bg_color:#2d2d2d\nfg_color:#dedede\nbase_color:#2d2d2d\ntext_color:#dedede\nselected_bg_color:#1956a6\nselected_fg_color:#dedede\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dedede\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dedede\ntoolbar_bg_color:#2d2d2d\ntoolbar_fg_color:#dedede\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dedede\npanel_bg_color:#2d2d2d\npanel_fg_color:#dedede\nlink_color:#fc6f5d"
+
+# Default Style
+
+style "murrine-default" {
+	GtkArrow::arrow-scaling= 0.6
+
+	GtkButton::child-displacement-x = 0
+	GtkButton::child-displacement-y = 0
+
+	GtkButton::default-border = { 0, 0, 0, 0 }
+
+	GtkButtonBox::child-min-height = 26
+
+	GtkCheckButton::indicator-size = 16
+
+	# 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
+
+	GtkExpander::expander-size = 16
+
+	GtkImage::x-ayatana-indicator-dynamic = 1
+
+	GtkMenu::horizontal-padding = 0
+	GtkMenu::vertical-padding = 0
+
+	GtkMenuBar::internal-padding = 0
+	GtkMenuBar::window-dragging = 1
+
+	GtkMenuItem::arrow-scaling= 0.5
+
+	GtkPaned::handle-size = 1
+
+	GtkProgressBar::min-horizontal-bar-height = 12
+	GtkProgressBar::min-vertical-bar-width = 12
+
+	GtkRange::trough-border = 0
+	GtkRange::slider-width = 12
+	GtkRange::stepper-size = 12
+	GtkRange::stepper_spacing = 0
+	GtkRange::trough-under-steppers = 1
+
+	GtkScale::slider-length = 16
+	GtkScale::slider-width = 16
+	GtkScale::trough-side-details = 1
+
+	GtkScrollbar::activate-slider = 1
+	GtkScrollbar::has-backward-stepper = 0
+	GtkScrollbar::has-forward-stepper = 0
+	GtkScrollbar::has-secondary-backward-stepper = 0
+	GtkScrollbar::has-secondary-forward-stepper = 0
+	GtkScrollbar::min-slider-length = 80
+	GtkScrollbar::slider-width = 12
+	GtkScrollbar::trough-border = 0
+
+	GtkScrolledWindow::scrollbar-spacing = 0
+	GtkScrolledWindow::scrollbars-within-bevel = 1
+
+	GtkSeparatorMenuItem::horizontal-padding = 0
+
+	GtkToolbar::internal-padding = 0
+
+	GtkTreeView::expander-size = 11
+	GtkTreeView::vertical-separator = 0
+
+	GtkWidget::focus-line-width = 1
+	# The following line prevents the Firefox tabs
+	# from jumping a few pixels when you create a new tab
+	GtkWidget::focus-padding = 0
+
+	GtkWidget::wide-separators = 1
+	GtkWidget::separator-width = 1
+	GtkWidget::separator-height = 1
+
+	GtkWindow::resize-grip-height = 0
+	GtkWindow::resize-grip-width = 0
+
+	WnckTasklist::fade-overlay-rect = 0
+
+	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
+
+	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
+	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
+
+	xthickness = 1
+	ythickness = 1
+
+	fg[NORMAL] = @fg_color
+	fg[PRELIGHT] = @fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @fg_color
+	fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
+
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.02, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = shade (0.9, @bg_color)
+	bg[INSENSITIVE] = @bg_color
+
+	base[NORMAL] = @base_color
+	base[PRELIGHT] = shade (0.95, @base_color)
+	base[SELECTED] = @selected_bg_color
+	base[ACTIVE] = @selected_bg_color
+	base[INSENSITIVE] = shade (0.85, @base_color)
+
+	text[NORMAL] = @text_color
+	text[PRELIGHT] = @text_color
+	text[SELECTED] = @selected_fg_color
+	text[ACTIVE] = @selected_fg_color
+	text[INSENSITIVE] = mix (0.5, @base_color, @text_color)
 
 	engine "murrine" {
-		animation				= FALSE
-        arrowstyle				= 2	# arrowstyle = 1 to draw filled arrows.
-              						# arrowstyle = 2 to draw fat filled arrows.
-		colorize_scrollbar		= TRUE
-		contrast				= 0.7
-		# default_button_color	= shade (0.88, @base_color)		
-		expanderstyle			= 0	# expanderstyle = 0 to draw arrows.
-              						# expanderstyle = 1 to draw circles with plus and minus.
-              						# expanderstyle = 2 to draw buttons with plus and minus.
-		focusstyle				= 0 # 0 to disable focus drawing. 
-									# 1 to use dots. 
-									# 2 to use a small colored rectangle. 
-									# 3 to use a colored rectangle that touches the borders.
-		focus_color 			= shade (0.7, @selected_bg_color)
-		glazestyle				= 0 # 0 = flat highlight, 
-									# 1 = curved highlight
-									# 2 = concave style, 
-									# 3 = top curved highlight, 
-									# 4 = beryl highlight
-		glowstyle				= 0 # 0 = top
-									# 1 = bottom
-									# 2 = top and bottom
-									# 3 = horizontal
-									# 4 = centered glow
-   		gradient_shades			= {1.00, 0.92, 0.92, 0.81}
-		handlestyle 			= 0
-		highlight_shade			= 1.0
-		lightborder_shade		= 1.0
-		lightborderstyle		= 1 # 0 = top side
-									# 1 = all sides
-		listviewstyle			= 0 # 0 = nothing
-									# 1 = dotted
-									# 2 = line
-		menubaritemstyle		= 0 # 0 = menuitem look
-									# 1 = button look
-		menubarstyle			= 0 # 0 = flat
-									# 1 = glassy
-									# 2 = gradient
-									# 3 = striped
-		menuitemstyle			= 0 # 0 = flat
-									# 1 = glassy
-									# 2 = striped
-		menustyle				= 3 # 0 = no vertical menu stripe
-									# 1 = display vertical menu stripe
-									# 2 = faint?
-									# 3 = borderless
-		progressbarstyle		= 0
-		reliefstyle				= 0 # 0 = flat
-									# 1 = inset
-									# 2 = shadow
-									# 3 = shadow with gradient
-									# 4 = stronger shadow with gradient
-		rgba					= FALSE	# alpha transparency
-		roundness				= 0 # 0 = square
-		scrollbarstyle			= 0 # 0 = nothing
-		separatorstyle 			= 1	# 0 = Hard separators
-									# 1 = Smooth separators
-		shadow_shades			= {1.1, 1.0}
-		sliderstyle				= 0 # 0 = nothing added
-		stepperstyle			= 1 # 0 = standard
-									# 1 = integrated stepper handles
-									# 2 = unknown
-		toolbarstyle			= 1 # 0 = flat
-									# 1 = glassy
-									# 2 = gradient
-		trough_shades			= {0.85, 1.0}
-
-#added for testing
-		border_colors = { shade (0.45, @fg_color) , shade (0.45, @fg_color) }
-	}
+		animation = FALSE
+		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
+		border_shades = { 1.0, 1.0 } # gradient to draw on border
+		colorize_scrollbar = FALSE
+		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
+		contrast = 0.8 # overal contrast with borders
+		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
+		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
+		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
+		glow_shade = 1.0 # amount of glow
+		gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets
+		highlight_shade = 1.0 # amount of highlight
+		lightborder_shade = 2.5 # amount of inset light border
+		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
+		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
+		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
+		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
+		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
+		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
+		menustyle = 0 # 0 = none, 1 = vertical striped
+		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
+		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
+		roundness = 0 # roundness of widgets
+		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
+		sliderstyle = 0 # 0 = none, 1 = handles
+		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
+		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
+   }
+}
+
+style "murrine-wide" {
+	xthickness = 2
+	ythickness = 2
+}
+
+style "murrine-wider" {
+	xthickness = 3
+	ythickness = 3
+}
+
+style "murrine-thin" {
+	xthickness = 0
+	ythickness = 0
 }
 
-style "test" = "default" {
-	fg[NORMAL]       	=  "#00FF00"
-	fg[ACTIVE]       	=  "#00FF00"
-	fg[PRELIGHT]     	=  "#00FF00"
-	fg[SELECTED]     	=  "#00FF00"
-	fg[INSENSITIVE]  	=  "#00FF00"
-
-	bg[NORMAL]       	=  "#FF0000"
-	bg[ACTIVE]			=  "#FF0000"
-	bg[PRELIGHT]      	=  "#FF0000"
-	bg[SELECTED]      	=  "#FF0000"
-	bg[INSENSITIVE]  	=  "#FF0000"
-
-	text[NORMAL]      	=  "#0000FF"
-	text[ACTIVE]      	=  "#0000FF"
-	text[PRELIGHT]    	=  "#0000FF"
-	text[SELECTED]    	=  "#0000FF"
-	text[INSENSITIVE] 	=  "#0000FF"
-
-	base[NORMAL]      	=  "#FFFF00"
-	base[ACTIVE]      	=  "#FFFF00"
-	base[PRELIGHT]    	=  "#FFFF00"
-	base[SELECTED]    	=  "#FFFF00"
-	base[INSENSITIVE] 	=  "#FFFF00"
+# Notebook
+
+style "murrine-notebook-bg" {
+	bg[NORMAL] = @base_color
+	bg[ACTIVE] = shade (0.87, @base_color)
 }
 
-style "wide"  { xthickness	= 2 ythickness	= 2 }
-style "wider" {	xthickness	= 3 ythickness	= 3 }
+style "murrine-notebook" = "murrine-notebook-bg" {
+	xthickness = 2
+	ythickness = 2
 
-style "button" {
-   	xthickness	= 3
-   	ythickness	= 3
+	engine "murrine" {
+		roundness = 0
+	}
+}
 
-	bg[NORMAL]          = shade (0.90, @button_base)
-	bg[PRELIGHT]        = shade (0.70, @selected_bg_color)    
-	bg[ACTIVE]          = shade (0.90, @selected_bg_color)
-	bg[SELECTED]    	= shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] 	= shade (0.92, @button_base)
+# Various Standard Widgets
 
-	engine "murrine" {
-		border_shades           = {0.9, 0.7}
-		contrast                = 0.72
-		roundness				= 0 # 0 = square
-		gradient_shades         = {1.20,1.10,1.10,0.95}
-		lightborderstyle		= 1 # 0 = top side, 1 = all sides
-		lightborder_shade       = 1.3
-        highlight_shade			= 1.0
-		focusstyle				= 3		
-		glowstyle				= 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = horizontal, 4 = centered glow
-        glow_shade          	= 1.5
-        reliefstyle         	= 0
-		textstyle               = 1
-		text_shade				= 0.7      
-     
+style "murrine-button"  = "murrine-wider" {
+	bg[NORMAL] = shade (1.08, @bg_color)
+	bg[PRELIGHT] = shade (0.7, @selected_bg_color)
+	bg[ACTIVE] = shade (0.95, @bg_color)
+	bg[INSENSITIVE] = shade (0.85, @bg_color)
+
+  	engine "murrine" {
 	}
 }
 
-style "button_label" { fg[ACTIVE] = @selected_fg_color }
+style "murrine-scrollbar" {
+	bg[NORMAL] = mix (0.21, @fg_color, @bg_color)
+	bg[PRELIGHT] = mix (0.31, @fg_color, @bg_color)
+	bg[ACTIVE] = @selected_bg_color
+
+	engine "murrine" {
+		roundness = 0
+		contrast = 0.0
+		border_shades = { 0.9, 0.9 }
+		trough_shades = { 0.97, 0.97 }
+		trough_border_shades = { 1.0, 1.0 }
+	}
+}
 
-# Force text color on radiobutton-eclipse
-style "checkradio_label" { fg[ACTIVE] = @fg_color }
+style "murrine-overlay-scrollbar" {
+	bg[ACTIVE] = shade (0.8, @bg_color)
+	bg[INSENSITIVE] = shade (0.97, @bg_color)
 
-style "entry" {
-    xthickness		= 3
-    ythickness		= 3
+	base[SELECTED] = shade (0.6, @base_color)
+	base[INSENSITIVE] = shade (0.85, @base_color)
+}
 
-#	bg[NORMAL]		= @window_active_color
+style "murrine-scale" = "murrine-thin" {
+	bg[NORMAL] = @bg_color
+	bg[ACTIVE] = @bg_color
+	bg[SELECTED] = @selected_bg_color
+	bg[INSENSITIVE] = shade (0.95, @bg_color)
 
 	engine "murrine" {
-		contrast		= 0.65
-		focusstyle		= 3
-		focus_color 	= @selected_bg_color
+		roundness = 8
+		gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
+		border_shades = { 1.0, 1.0 }
+		trough_shades = { 1.08, 1.08 }
+		trough_border_shades = { 0.8, 0.8 }
 	}
 }
 
-style "expander" {
-	bg[NORMAL]			= "#FFF"
-	fg[NORMAL]			= shade (2.0, @text_color)
-	fg[PRELIGHT]		= shade (2.0, @text_color)
+style "murrine-progressbar" = "murrine-thin" {
+	bg[NORMAL] = @bg_color
+	bg[ACTIVE] = shade (1.08, @bg_color)
+
+	fg[PRELIGHT] = @selected_fg_color
 
 	engine "murrine" {
-		contrast		= 1.2
-		gradient_shades	= {1.0, 1.0, 1.0, 1.0}
+		roundness = 2
+		border_shades = { 1.2, 1.2 }
+		trough_border_shades = { 0.8, 0.8 }
 	}
 }
 
-style "frame_title" {
-	fg[NORMAL]	= shade(0.80, @fg_color)
+style "murrine-treeview-header" = "murrine-button" {
+  	engine "murrine" {
+		roundness = 0
+	}
 }
 
-style "handle" {
-	engine "pixmap" {
-		image {
-            function = HANDLE
-            overlay_file = "Others/pane-separator-grip.svg"
-            overlay_stretch = FALSE
-            orientation = HORIZONTAL
-        }
-        image {
-            function = HANDLE
-            overlay_file = "Others/pane-separator-grip-vertical.svg"
-            overlay_stretch = FALSE
-            orientation = VERTICAL
-        }
+style "murrine-treeview" {
+  	engine "murrine" {
+		roundness = 0
 	}
 }
 
-class "GtkPaned"	style "handle"
+style "murrine-frame-title" {
+	fg[NORMAL] = lighter (@fg_color)
+}
+
+style "murrine-tooltips" {
+	xthickness = 5
+	ythickness = 5
+
+	bg[NORMAL] = @tooltip_bg_color
+	bg[SELECTED] = @tooltip_bg_color
 
-style "menubar" {
-	xthickness	= 3
-	ythickness	= 0
+	fg[NORMAL] = @tooltip_fg_color
 
-	fg[PRELIGHT]	    = @selected_fg_color
-	fg[ACTIVE]	    	= @selected_fg_color
-	fg[SELECTED]	    = @selected_fg_color
-	bg[NORMAL]          = shade (1.00, @window_active_color)
-    
 	engine "murrine" {
-		gradient_shades     	= {1.00, 1.00, 1.00, 1.00}
-        border_shades 			= {1.1, 0.9}
-		contrast            	= 0.90
-		lightborderstyle		= 1
-		textstyle               = 1
-		text_shade				= 0.7
+		textstyle = 0
+		roundness = 2
+		rgba = FALSE
 	}
 }
 
-style "menu" {
-	xthickness	= 0
-	ythickness	= 0
-	
-	GtkMenuItem::arrow-scaling	= 0.6
+style "murrine-spinbutton" = "murrine-button" {
+	engine "murrine" {
+	}
+}
 
-	bg[NORMAL]				= shade (1.00, @bg_color)
+style "murrine-radiocheck" = "murrine-default" {
+	bg[SELECTED] = @base_color
 
+	text[NORMAL] = @selected_bg_color
+	text[PRELIGHT] = @selected_bg_color
+}
+
+style "murrine-entry" = "murrine-wider" {
 	engine "murrine" {
-		gradient_shades		= {1.00, 1.00, 1.00, 1.00}
-		roundness			= 0 # 0 = squared 
+		border_shades = { 1.15, 1.15 }
 	}
 }
 
-style "menu_item_white" {
-	xthickness	= 2
-	ythickness	= 3
+style "metacity-frame" = "murrine-default" {
+	bg[SELECTED] = @selected_bg_color
+}
+
+style "murrine-statusbar" { }
+style "murrine-comboboxentry" = "murrine-entry" { }
+style "murrine-hscale" = "murrine-scale" { }
+style "murrine-vscale" = "murrine-scale" { }
+style "murrine-hscrollbar" = "murrine-scrollbar" { }
+style "murrine-vscrollbar" = "murrine-scrollbar" { }
+
+# Menus
 
-	fg[NORMAL] 			= shade (1.00, @fg_color)					# menu item normal
-    fg[INSENSITIVE] 	= mix(0.60, @fg_color, @theme_bg_color)	    # menu item disabled
-	fg[PRELIGHT]		= @selected_fg_color						# menu item selected
+style "murrine-menu" = "murrine-thin" {
+	bg[NORMAL] = @menu_bg_color
+	bg[PRELIGHT] = @selected_bg_color
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = @menu_bg_color
+	bg[INSENSITIVE] = @menu_bg_color
 
-	text[NORMAL]        = shade (1.00, @fg_color)					# Color check/radio menu
-	text[INSENSITIVE] 	= mix(0.60, @text_color, @bg_color)	    
-	text[PRELIGHT]      = @selected_fg_color            			# Color check/radio menu
+	fg[NORMAL] = @menu_fg_color
+	fg[PRELIGHT] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @selected_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
 
-    bg[PRELIGHT]      	= shade (1.00, @selected_bg_color)
-    bg[SELECTED]      	= shade (1.00, @selected_bg_color)
+	text[NORMAL] = @menu_fg_color
+	text[PRELIGHT] = @selected_fg_color
+	text[SELECTED] = @selected_fg_color
+	text[ACTIVE] = @selected_fg_color
+	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
 
 	engine "murrine" {
-        gradient_shades		= {0.90, 0.95, 0.95, 1.00}
-		border_shades 		= {1.40, 1.0}
-        roundness           = 1
-        contrast            = 0.8           # separators contrast
-		#textstyle          = 2
-		#text_shade			= 0.4
+		roundness = 0
 	}
 }
 
-style "menubar_menuitem" {
-	xthickness	= 2
-	ythickness	= 3
+style "murrine-menu-item" = "murrine-wider" {
+	bg[PRELIGHT] = @selected_bg_color
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = @selected_bg_color
 
-	fg[NORMAL] 		= shade (1.00, @fg_color)						# menu item normal
-    fg[INSENSITIVE] = mix(0.60, @fg_color, @window_active_color)	    # menu item disabled
-	fg[PRELIGHT]	= @selected_fg_color										# menu item selected
-
-	bg[PRELIGHT]    = shade (0.94, @selected_bg_color)
-	bg[SELECTED]    = shade (1.2, @selected_bg_color)
+	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
+	fg[PRELIGHT] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @selected_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
 
 	engine "murrine" {
-        gradient_shades		= {1.03, 1.00, 1.00, 1.00}
-        roundness           = 1
-        contrast            = 0.5
-		textstyle           = 1
-		text_shade			= 0.7
+		textstyle = 0
+		border_shades = { 1.2, 1.2 }
 	}
 }
 
-style "notebook" {
-    xthickness		= 8 
-    ythickness		= 2
-  
-	bg[NORMAL]		= @base_color							# selected tab entire
-	bg[ACTIVE]		= shade (0.90, @window_active_color)	# unselected tab
-	bg[INSENSITIVE]	= shade (0.95, @base_color)				# disabled controls
+style "murrine-separator-menu-item" = "murrine-thin" { }
+
+style "murrine-menubar" {
+	bg[NORMAL] = @menubar_bg_color
+	bg[PRELIGHT] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[SELECTED] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[ACTIVE] = shade (0.9, @menubar_bg_color)
+	bg[INSENSITIVE] = @menubar_bg_color
 
-	fg[NORMAL]		= shade (1.00, @fg_color)				# text selected tab
-	fg[ACTIVE]		= shade (0.95, @fg_color)				# text unselected tab
-	fg[INSENSITIVE] = shade (0.90, @fg_color)
+	fg[NORMAL] = @menubar_fg_color
+	fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
+	fg[SELECTED] = shade (1.08, @menubar_fg_color)
+	fg[ACTIVE] = @menubar_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
 
-	engine "murrine" {	
-		contrast 		= 0.7 
+	engine "murrine" {
+		roundness = 0
 	}
 }
 
-style "progressbar" {
-	xthickness	= 0
-	ythickness	= 0
+style "murrine-menubaritem" {
+	bg[NORMAL] = @menubar_bg_color
+	bg[PRELIGHT] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[SELECTED] =  mix (0.21, @menubar_fg_color, @menubar_bg_color)
+	bg[ACTIVE] = shade (0.9, @menubar_bg_color)
+	bg[INSENSITIVE] = @menubar_bg_color
 
-	bg[ACTIVE]		=  shade (1.85, @base_color)
-	bg[SELECTED]	=  shade (1.00, @selected_bg_color)	
+	fg[NORMAL] = @menubar_fg_color
+	fg[PRELIGHT] = shade (1.08, @menubar_fg_color)
+	fg[SELECTED] = shade (1.08, @menubar_fg_color)
+	fg[ACTIVE] = @menubar_fg_color
+	fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color)
 
 	engine "murrine" {
-		gradient_shades			= {1.2, 1.00, 1.00, 0.85}
-		border_shades 			= {1.0, 1.1}
-		roundness				= 1
-		contrast				= 0.9
-		reliefstyle				= 0
-		lightborder_shade		= 1.05
-		lightborderstyle		= 1 # 0 = top side, 1 = all sides
-		trough_border_shades 	= {1.0, 1.1}
+		roundness = 0
 	}
 }
 
-style "scale" { # slider
-
-	GtkScale::trough-border			= 1
-	GtkScale::slider-width			= 8
-	GtkScale::slider-length			= 15
-	GtkScale::trough-side-details	= 1
+# Toolbars
 
-	xthickness	= 2
-	ythickness	= 2
+style "murrine-toolbar" = "murrine-thin" {
+	bg[NORMAL] = @bg_color
+	bg[PRELIGHT] = shade (1.02, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = shade (0.9, @bg_color)
+	bg[INSENSITIVE] = @bg_color
 
-	bg[NORMAL]		= shade (0.95, @selected_bg_color)
-	bg[SELECTED]	= shade (1.25, @selected_bg_color)
-	bg[PRELIGHT]	= shade (0.82, @selected_bg_color)
+	fg[NORMAL] = @fg_color
+	fg[PRELIGHT] = @fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @fg_color
+	fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
 
 	engine "murrine" {
-		sliderstyle				= 0 					# slider shape
-		contrast 				= 1.1					# elements border
-		gradient_shades 		= {1.1, 1.0, 1.0, 0.9}	# slider gradient
-		border_shades 			= {0.8, 0.9}			# slider border
-		roundness 				= 0
-		lightborderstyle		= 1 					# inner-stroke progress-higlight y slider
-		lightborder_shade		= 1.1
-
-		trough_shades			= {0.7, 0.8}
-		trough_border_shades 	= {1.0, 1.7}
-		#trough_border_shades 	= {0.9, 1.20}
-		glow_shade 				= 1.0
-		reliefstyle 			= 0
-#		shadow_shades 			= { 1.0, 0.9 }
 	}
 }
 
-style "scale-1" { # slider
- 	xthickness	= 2
-	ythickness	= 2
-
-	bg[NORMAL]		= shade (0.75, @button_base)
-	bg[SELECTED]	= shade (1.35, @selected_bg_color)
-	bg[PRELIGHT]	= shade (0.82, @button_base)
-	bg[ACTIVE]		= shade (0.85, @theme_bg_color)
-
-	engine "murrine" {		
-		border_shades           = {0.8, 0.6}
-		contrast                = 1.00
-		gradient_shades         = {1.25,1.00,0.99,0.80}	
-		roundness		    	= 18
-		lightborderstyle		= 1		
-		trough_shades			= {0.9, 1.1}
-		trough_border_shades 	= {1.0, 1.5}
-	}
-}
+style "murrine-toolbutton" = "murrine-button" {
+	bg[NORMAL] = shade (1.08, @bg_color)
+	bg[PRELIGHT] = shade (1.10, @bg_color)
+	bg[SELECTED] = @selected_bg_color
+	bg[ACTIVE] = shade (0.95, @bg_color)
+	bg[INSENSITIVE] = shade (0.85, @bg_color)
+
+	fg[NORMAL] = @fg_color
+	fg[PRELIGHT] = @fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @fg_color
+	fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
 
-style "scrollbar" {
-	bg[NORMAL]		= @selected_bg_color
-	bg[SELECTED]	= shade (1.1, @selected_bg_color)
-	bg[ACTIVE]		= @selected_bg_color
-	bg[PRELIGHT]	= shade (1.25, @selected_bg_color)
-	
 	engine "murrine" {
-		roundness		= 0
-		border_shades	= {1.0, 1.0}
-		contrast		= 0.0
 	}
 }
 
-style "overlay_scrollbar" {
-	bg[SELECTED] 		= shade (1.0, @selected_bg_color)
-	bg[INSENSITIVE] 	= shade (0.85, @theme_bg_color)
-	bg[ACTIVE] 			= shade (0.6, @theme_bg_color)
-}
+class "GtkToolbar" style "murrine-toolbar"
+class "GtkHandleBox" style "murrine-toolbar"
+widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
+
+# Panels
+
+style "murrine-panel" = "murrine-thin" {
+	xthickness = 2
+
+	bg[NORMAL] = @panel_bg_color
+	bg[PRELIGHT] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	bg[SELECTED] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	bg[ACTIVE] = shade (0.8, @panel_bg_color)
+	bg[INSENSITIVE] = @panel_bg_color
+
+	fg[NORMAL] = @panel_fg_color
+	fg[PRELIGHT] = shade (1.08, @panel_fg_color)
+	fg[SELECTED] = shade (1.08, @panel_fg_color)
+	fg[ACTIVE] = @panel_fg_color
+	fg[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color)
+
+	base[NORMAL] = @panel_bg_color
+	base[PRELIGHT] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	base[SELECTED] =  mix (0.21, @panel_fg_color, @panel_bg_color)
+	base[ACTIVE] = shade (0.9, @panel_bg_color)
+	base[INSENSITIVE] = @panel_bg_color
+
+	text[NORMAL] = @panel_fg_color
+	text[PRELIGHT] = shade (1.08, @panel_fg_color)
+	text[SELECTED] = shade (1.08, @panel_fg_color)
+	text[ACTIVE] = @panel_fg_color
+	text[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color)
 
-style "spinbutton" = "button" { # input/stepper 
-	#bg[NORMAL]		= "#FFF"
 	engine "murrine" {
-		contrast			= 1.0
-        lightborder_shade	= 1.00
+		roundness = 0
+		contrast = 0.0
 	}
 }
 
-style "toolbar" = "wider" {
-	bg[NORMAL]		= shade (1.00, @window_active_color)
-    	
+widget "*PanelWidget*" style "murrine-panel"
+widget "*PanelApplet*" style "murrine-panel"
+widget "*fast-user-switch*" style "murrine-panel"
+widget "*CPUFreq*Applet*" style "murrine-panel"
+widget "*indicator-applet*" style "murrine-panel"
+class "PanelApp*" style "murrine-panel"
+class "PanelToplevel*" style "murrine-panel"
+widget_class "*PanelToplevel*" style "murrine-panel"
+widget_class "*notif*" style "murrine-panel"
+widget_class "*Notif*" style "murrine-panel"
+widget_class "*Tray*" style "murrine-panel" 
+widget_class "*tray*" style "murrine-panel"
+widget_class "*computertemp*" style "murrine-panel"
+widget_class "*Applet*Tomboy*" style "murrine-panel"
+widget_class "*Applet*Netstatus*" style "murrine-panel"
+widget "*gdm-user-switch-menubar*" style "murrine-panel"
+
+style "bold-panel-item" {
+	font_name = "Bold"
+
 	engine "murrine" {
-		separatorstyle		= 0
-		lightborderstyle	= 0		
-		contrast			= 0.9
-		lightborder_shade	= 1.0
-        gradient_shades     = {1.00, 0.98, 0.97, 0.95}        
+		roundness = 0
 	}
 }
 
-style "toolbar_button" {
-    xthickness	= 3
-    ythickness	= 3	
+widget "*Panel*MenuBar*" style "bold-panel-item"
+widget "*gimmie*" style "bold-panel-item"
 
-    bg[PRELIGHT]	= shade (0.95, @window_active_color)
-    bg[ACTIVE]		= shade (0.80, @window_active_color)
-	bg[SELECTED]	= shade (0.85, @window_active_color)
-	bg[INSENSITIVE]	= shade (0.98, @window_active_color)
+# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
+# class "*Panel*" style "murrine-panel" # Disabled to fix bug
 
-	fg[INSENSITIVE]	= shade (0.7, @window_active_color)
+# XFCE Styles
 
-	engine "murrine" {
-		gradient_shades    	= {1.00,0.96,0.96,0.90}
-		border_shades		= {1.10, 0.90}
-		contrast     		= 1.00
-		lightborderstyle	= 1
-	}
+style "workspace-switcher" = "murrine-panel" {
+	bg[SELECTED] = @selected_bg_color
 }
 
-# toolbar separator
-style "toolbar_separator" {
-	xthickness = 0
-  	ythickness = 0
+style "xfce-header" {
+	bg[NORMAL] = shade (0.9, @bg_color)
+	base[NORMAL] = shade (1.18, @bg_color)
+}
 
-	bg[NORMAL]	    = shade (0.80, @theme_bg_color)
-	engine "murrine" {
-		border_shades	= {1.00, 1.00}
-		contrast     	= 0.5
-	}
+style "xfdesktop-windowlist" {
+	bg[NORMAL] = @base_color
+	fg[INSENSITIVE] = shade (0.95, @base_color)
+	text[INSENSITIVE] = shade (0.95, @base_color)
 }
 
-# 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 "separator_menu_item" {
-	xthickness = 1
-	ythickness = 0
+style "xfdesktop-icon-view" {
+	XfdesktopIconView::label-alpha = 0
+	XfdesktopIconView::selected-label-alpha = 60
+	XfdesktopIconVIew::ellipsize-icon-labels = 1
 
-	GtkSeparatorMenuItem::horizontal-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 7
+	base[NORMAL] = @selected_bg_color
+	base[SELECTED] = @selected_bg_color
+	base[ACTIVE] = @selected_bg_color
+
+	fg[NORMAL] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[ACTIVE] = @selected_fg_color
 
 	engine "murrine" {
-		contrast 		= 0.5
-		separatorstyle 	= 0
+		textstyle = 5
+		text_shade = 0.05
 	}
 }
 
-style "separator_tool_item" {
-	xthickness = 0
-	ythickness = 1
+style "xfwm-tabwin" {
+	Xfwm4TabwinWidget::border-width = 0
+	Xfwm4TabwinWidget::icon-size = 64
 
-	GtkVSeparator::vertical-padding = 0
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 7
-	GtkWidget::separator-height = 1
+	bg[NORMAL] = @menu_bg_color
+	fg[NORMAL] = @menu_fg_color
 
 	engine "murrine" {
-		contrast = 0.5
-		separatorstyle = 0
+		focusstyle = 0
 	}
 }
 
-style "tooltips" {
-	xthickness	= 8
-	ythickness	= 4
+style "xfsm-logout" {
+	bg[NORMAL] = @menu_bg_color
+	bg[ACTIVE] = @menu_bg_color
+	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
+	bg[SELECTED] = shade (0.5, @menu_bg_color)
+	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
 
-	bg[NORMAL]	= @tooltip_bg_color
-	fg[NORMAL]	= @tooltip_fg_color
+	fg[NORMAL] = @menu_fg_color
+	fg[PRELIGHT] = @menu_fg_color
 
-	GtkWidget::new-tooltip-style	= 1
+	text[NORMAL] = @menu_fg_color
 
 	engine "murrine" {
-		border_colors	= { "#080808", "#080808" }
 	}
 }
 
-style "treeview" {
-	bg[SELECTED]	= @base_color				# backcolor list-minicheck
-	text[NORMAL]    = shade (1.05, @fg_color)	# normal indicator  
+style "xfsm-logout-button" {
+	bg[NORMAL] = shade (1.2, @menu_bg_color)
+	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
 
 	engine "murrine" {
-		gradient_shades	= {1.00, 1.04, 1.06, 1.10}
-        separatorstyle 	= 0
-		contrast 		= 1.7
 	}
 }
 
-style "treeview_header"
-{
-	ythickness = 1
+widget "*WnckPager*" style "workspace-switcher"
 
-	fg[NORMAL] 		= shade(0.55, @bg_color)
-	fg[PRELIGHT] 	= shade(0.80, @text_color)
-
-	engine "pixmap"
-	{
-	image 
-      	{
-        function	= BOX
-		file        = "Others/tree_header.png"
-		border      = { 1, 1, 1, 1 }
-		stretch		= TRUE
-		}
-    }
-}
+widget "*Xfce*Panel*" style "murrine-panel"
+class "*Xfce*Panel*" style "murrine-panel"
 
-#Added pixmap style for check/radiobuttons
-
-style "checkradio-pixmap"  {
-	engine "pixmap"
-	{
-
-	# Check Buttons
-
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= NORMAL
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= PRELIGHT
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= ACTIVE
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= SELECTED
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 					= INSENSITIVE
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/checkbox-unchecked-insensitive.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state	 				= NORMAL
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch	 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state 					= PRELIGHT
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state 		        	= ACTIVE
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image
-		{
-            function        		= CHECK
-            recolorable     		= TRUE
-	    	state 		        	= SELECTED
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/checkbox-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-  		{
-            function        		= CHECK
-            recolorable     		= TRUE
-            state 		        	= INSENSITIVE
-            shadow          		= IN
-            overlay_file			= "Check-Radio/checkbox-checked-insensitive.png"
-            overlay_stretch 		= FALSE
-	}
+# Thunar Styles
 
-	# Radio Buttons
-
-	image 
-		{
-            function        		= OPTION
-            state 					= NORMAL
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-            state 					= PRELIGHT
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-            state 					= ACTIVE
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image
-		{
-            function        		= OPTION
-            state 					= SELECTED
-            shadow          		= OUT
-            overlay_file    		= "Check-Radio/option-unchecked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-            state 					= INSENSITIVE
-            shadow         			= OUT
-            overlay_file    		= "Check-Radio/option-unchecked-insensitive.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-			state 					= NORMAL
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch 		= FALSE
-        }
- 	image 
-		{
-            function        		= OPTION
-	 	   state					= PRELIGHT
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-		    state					= ACTIVE
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch	 		= FALSE
-        }
-	image
-		{
-            function        		= OPTION
-	    	state					= SELECTED
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked.png"
-            overlay_stretch	 		= FALSE
-        }
-	image 
-		{
-            function        		= OPTION
-	    	state 					= INSENSITIVE
-            shadow          		= IN
-            overlay_file    		= "Check-Radio/option-checked-insensitive.png"
-            overlay_stretch 		= FALSE
-        }
-	}
+style "sidepane" {
+	base[NORMAL] = @bg_color
+	base[INSENSITIVE] = mix (0.4, shade (1.35, @selected_bg_color), shade (0.9, @base_color))
+	bg[NORMAL] = @bg_color
+	text[NORMAL] = mix (0.9, @fg_color, @bg_color)
 }
 
-style "separator" = "wide" {
+widget_class "*ThunarShortcutsView*" style "sidepane"
+widget_class "*ThunarTreeView*" style "sidepane"
+widget_class "*ThunarLocationEntry*" style "murrine-entry"
+
+# Gtk2 Open-File Dialog
+
+widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
+widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
+
+# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
+
+style "chromium-toolbar-button" {
 	engine "murrine" {
-		contrast	= 0.4
+		roundness = 2
+		textstyle = 0
 	}
 }
-class "GtkSeparator"			style "separator"
 
+style "chrome-gtk-frame" {
+	ChromeGtkFrame::frame-color = @titlebar_bg_color
+	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
+
+	ChromeGtkFrame::frame-gradient-size = 0
+	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
+
+	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
+	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
 
-# ==============================================================================
-# FIREFOX SPECIFIC SETTINGS
-# ==============================================================================
-style "ff-default" {
-	GtkCheckButton::indicator-size = 14
+	ChromeGtkFrame::incognito-frame-gradient-size = 0
+	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
+
+	ChromeGtkFrame::scrollbar-trough-color = @bg_color
+	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @fg_color, @bg_color)
+	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @fg_color, @bg_color)
 }
 
-style	"ff-statusbar" {
+class "ChromeGtkFrame" style "chrome-gtk-frame"
+
+widget_class "*Chrom*Button*" style "chromium-toolbar-button"
+
+# General Styles
+
+class "GtkWidget" style "murrine-default"
+
+class "GtkFrame" style "murrine-wide"
+class "MetaFrames" style "metacity-frame"
+class "GtkWindow" style "metacity-frame"
+
+class "GtkSeparator" style "murrine-wide"
+class "GtkCalendar" style "murrine-wide"
+
+class "GtkSpinButton" style "murrine-spinbutton"
+
+class "GtkScale" style "murrine-scale"
+class "GtkVScale" style "murrine-vscale"
+class "GtkHScale" style "murrine-hscale"
+class "GtkScrollbar" style "murrine-scrollbar"
+class "GtkVScrollbar" style "murrine-vscrollbar"
+class "GtkHScrollbar" style "murrine-hscrollbar"
+
+class "GtkRadio*" style "murrine-radiocheck"
+class "GtkCheck*" style "murrine-radiocheck"
+
+class "GtkEntry" style "murrine-entry"
+
+widget_class "*<GtkNotebook>" style "murrine-notebook"
+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"
+
+widget_class "*<GtkButton>" style "murrine-button"
+widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
+widget_class "*<GtkProgress>" style "murrine-progressbar"
+widget_class "*<GtkProgressBar>" style "murrine-progressbar"
+
+widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
+widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
+
+widget_class "*<GtkMenu>*" style "murrine-menu"
+widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
+widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
+widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
+widget_class "*<GtkMenuBar>*" style "murrine-menubar"
+widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
+
+widget_class "*GtkToolButton*" style "murrine-toolbutton"
+widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
+widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
+widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
+
+widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
+
+widget_class "*.<GtkTreeView>*" style "murrine-treeview"
+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"
+
+widget "gtk-tooltip*" style "murrine-tooltips"
+
+widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
+
+# Workarounds and Non-Standard Styling
+
+style "text-is-fg-color-workaround" {
+	text[NORMAL] = @text_color
+	text[PRELIGHT] = @fg_color
+	text[SELECTED] = @selected_fg_color
+	text[ACTIVE] = @fg_color
+	text[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
 }
 
-style "FireFox-MenuBar" = "menubar" {
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
+
+style "fg-is-text-color-workaround" {
+	fg[NORMAL] = @text_color
+	fg[PRELIGHT] = @text_color
+	fg[ACTIVE] = @selected_fg_color
+	fg[SELECTED] = @selected_fg_color
+	fg[INSENSITIVE] = darker (@fg_color)
 }
-widget "MozillaGtkWidget*GtkMenuBar" 			style "FireFox-MenuBar"
-
-#widget	"MozillaGtkWidget*Toolbar*"		style	"theme-toolbar"
-#widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
-
-widget	"MozillaGtkWidget*"	style	"ff-default"
-
-####  Firefox  ###
-style "firefox-base-entry" {
-	GtkWidget::interior_focus	= 0
-  	#GtkEntry	:: inner-border			= { 0, 0, 0, 0 }
-    #GtkEntry	:: progress-border		= { 2, 2, 2, 2 }
-  	xthickness 	= 3
-  	ythickness 	= 3
-	base[NORMAL] = "#dedede"
-    text[NORMAL]= "#000"
-	engine "murrine" {
 
+widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
+widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
+widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
+
+style "murrine-evo-new-button-workaround" {
+	engine "murrine" {
+		toolbarstyle = 0
 	}
 }
 
-# widget	"MozillaGtkWidget*GtkFixed*GtkEntry*"	style:highest	"firefox-base-entry"
-# widget	"MozillaGtkWidget*GtkEntry*"	style:highest	"firefox-base-entry"
-
-style "firefox-text-entry" {
-    text[NORMAL]= "#ff0000"
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
 
+style "inkscape-toolbar-fix" {
 	engine "murrine" {
-
+		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+		highlight_shade = 1.0
 	}
 }
-#class "GtkInvisible" style "firefox-text-entry"
-#widget "GtkInvisible" style "firefox-text-entry"
-
-###############################################################################
-# The following part of the gtkrc applies the different styles to the widgets.
-###############################################################################
-
-# The default style is applied to every widget
-class "GtkWidget"				style "default"
-class "GtkFrame"				style "wide"
-class "GtkCalendar"				style "wide"
-class "GtkEntry"				style "entry"
-
-class "GtkSpinButton"			style "spinbutton"
-class "GtkScale"				style "scale"
-class "GtkVScale"				style "scale"
-class "GtkHScale"				style "scale"
-class "GtkScrollbar"			style "scrollbar"
-
-# Overlay scrollbar
-widget_class "*<OsScrollbar>" 	style "overlay_scrollbar"
-widget_class "*<OsThumb>" 		style "overlay_scrollbar"
-
-# General matching follows. The order is choosen so that the right styles override
-# each other. EG. progressbar needs to be more important than the menu match.
-widget_class "*<GtkButton>"			    		style "button"
-widget_class "*<GtkButton>*<GtkLabel>"  			style "button_label"
-
-widget_class "*<GtkNotebook>"					style "notebook"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook"
-widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook"
-widget_class "*<GtkNotebook>*<GtkLabel>"        style "notebook"
-
-widget_class "*<GtkMenuBar>*"					style "menubar"
-widget_class "*<GtkMenu>*"			    		style "menu"
-widget_class "*<GtkMenuItem>*"					style "menu_item_white"
-
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*"		style "menubar_menuitem"
-
-widget_class "*<GtkToolbar>"                    style "toolbar"
-widget_class "*<GtkHandleBox>"                  style "toolbar"
-widget_class "*<GtkToolbar>.*.<GtkButton>*"     	style "toolbar_button"
-class "GtkSeparatorToolItem"		            style "toolbar_separator"
-widget_class "*<GtkSeparatorToolItem>*" 			style "separator_tool_item"
-widget_class "*<GtkSeparatorMenuItem>*" 			style "separator_menu_item"
-
-widget_class "*.<GtkFrame>.<GtkLabel>"			style "frame_title"
-widget_class "*.<GtkTreeView>*"					style "treeview"
-
-class "*GtkExpander*"  							style "expander"
-
-widget_class "*<GtkProgress>"					style "progressbar"
-
-# Treeview headers (and similar stock GTK+ widgets)
-widget_class "*.<GtkTreeView>.<GtkButton>"		style "treeview_header"
-widget_class "*.<GtkCTree>.<GtkButton>"			style "treeview_header"
-widget_class "*.<GtkList>.<GtkButton>"			style "treeview_header"
-widget_class "*.<GtkCList>.<GtkButton>"			style "treeview_header"
-
-# The window of the tooltip is called "gtk-tooltip"
-widget "gtk-tooltip*"							style "tooltips"
-
-widget_class "*<GtkCheckButton>*"				style "checkradio-pixmap"
-widget_class "*<GtkRadioButton>*"				style "checkradio-pixmap"
-widget_class "*<GtkCheckButton>*<GtkLabel>"		style:highest "checkradio_label"
-widget_class "*<GtkRadioButton>*<GtkLabel>"		style:highest "checkradio_label"
-
-##########################################################################
-# Following are special cases and workarounds for issues in applications.
-##########################################################################
-# For Google Chrome/Chromium integration.
-style "chrome-gtk-frame" {
-    ChromeGtkFrame::frame-gradient-size		    	= 120
-    ChromeGtkFrame::frame-gradient-color			= @window_active_color
-    ChromeGtkFrame::inactive-frame-gradient-color	= shade (1.20, @theme_bg_color)
-    ChromeGtkFrame::frame-color			        	= @window_active_color
-    ChromeGtkFrame::inactive-frame-color			= shade (1.20, @theme_bg_color)
-
-    ChromeGtkFrame::scrollbar-trough-color			= shade (0.99, @bg_color)
-    ChromeGtkFrame::scrollbar-slider-prelight-color	= shade (0.87, @bg_color)
-    ChromeGtkFrame::scrollbar-slider-normal-color	= shade (0.80, @bg_color)
-}
-class "ChromeGtkFrame"	style "chrome-gtk-frame"
-
-# 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]		= @text_color
-	text[SELECTED]		= shade (1.10, @selected_fg_color)
-	text[INSENSITIVE]	= shade (0.75, @fg_color)
-	text[ACTIVE]		= shade (1.10, @selected_fg_color)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>"	style "text_is_fg_color_workaround"
-
-# 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]		= @text_color
-	text[SELECTED]		= shade (1.10, @selected_fg_color)
-	text[INSENSITIVE]	= shade (0.75, @fg_color)
-	text[ACTIVE]		= shade (1.10, @selected_fg_color)
-}
-widget "*.gtk-combobox-popup-menu.*"	style "menuitem_text_is_fg_color_workaround"
-
-# For places where the fg color is used instead of the text color.
-style "fg_is_text_color_workaround" {
-	fg[NORMAL]		= @fg_color
-	fg[PRELIGHT]	= @text_color
-	fg[SELECTED]	= @selected_fg_color
-	fg[ACTIVE]		= @selected_fg_color
-	fg[INSENSITIVE] = shade (0.98, @fg_color)
-}
-widget_class "*<GtkListItem>*"		style "fg_is_text_color_workaround"
-widget_class "*<GtkCList>"		    style "fg_is_text_color_workaround"
-widget_class "*<EelEditableLabel>"	style "fg_is_text_color_workaround"
-
-style "performance-fix" {	
 
+#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
+#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
+#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
+widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
+
+# Performance Fixes
+
+style "performance-fix" {
 	engine "murrine" {
 		textstyle = 0
-		contrast = 0.5
 	}
 }
-widget "*OOoFixed*"			style "performance-fix" # Openoffice/Libreoffice
-
-# For gvim scrollbars.
-#style "vim-scrollbar" = "scrollbar" {
-#	GtkScrollbar	::slider_width		= 16
-#	GtkScrollbar	::stepper_size		= 16
-
-#	engine "pixmap" {
-#		image {
-#			function	= BOX
-#			orientation	= VERTICAL
-#			file		= "assets/scroll-background.png"
-#		}
-#	}
-#}
-#widget "vim-main-window.*Scrollbar*"	style "vim-scrollbar"
-
-# For Eclipse (swt) toolbars.
-widget "*swt*toolbar*"			style "default"
-
-
-# ---------------------------------
-# Xfce panel theming
-# ---------------------------------
-#style "xfce-panel" {
-#    fg[NORMAL]          = @fg_color
-#    fg[PRELIGHT]        = @selected_fg_color
-#    fg[ACTIVE]          = @selected_fg_color
-#    fg[SELECTED]        = @selected_fg_color
-#
-#    bg[NORMAL]          = shade (1.00, @window_active_color)
-#    bg[PRELIGHT]        = shade (0.80, @window_active_color)
-#    bg[ACTIVE]          = shade (0.50, @window_active_color)
-#    bg[SELECTED]        = shade (1.20, @selected_bg_color)
-#    engine "murrine" {
-#        gradient_shades         = {0.80, 0.85, 0.95, 1.00}
-#        roundness           = 2
-#        contrast            = 0.2
-#    }
-#    xthickness = 3
-#    ythickness = 3
-#}
-#widget "*Xfce*Panel*"   style "xfce-panel"
-#class "*Xfce*Panel*"    style "xfce-panel"
 
-style "xfdesktop-icon-view" {
-    XfdesktopIconView::label-alpha = 0
-    XfdesktopIconView::selected-label-alpha = 100
-    XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-    XfdesktopIconView::shadow-x-offset = 1
-    XfdesktopIconView::shadow-y-offset = 1
-    XfdesktopIconView::shadow-color = "#000000"
-    XfdesktopIconView::selected-shadow-x-offset = 1
-    XfdesktopIconView::selected-shadow-y-offset = 1
-    XfdesktopIconView::selected-shadow-color = "#000000"
-
-    XfdesktopIconView::cell-spacing = 0
-    XfdesktopIconView::cell-padding = 0
-    XfdesktopIconView::cell-text-width-proportion = 2
-
-    base[NORMAL]   = @selected_bg_color
-    base[SELECTED] = @selected_bg_color
-    base[ACTIVE]   = @selected_bg_color
-
-    fg[NORMAL]      = @selected_fg_color
-    fg[SELECTED]    = @selected_fg_color
-    fg[ACTIVE]      = @selected_fg_color
-}
+widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
+widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
+widget_class "*GimpToolbox*" style "performance-fix"
+widget_class "*GimpMenuDock*" style "performance-fix"
+widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
+widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
 
+widget_class "*XfceHeading*" style "xfce-header"
+widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
 widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-
-# widget "xfwm4-tabwin*" style "murrine-dark"
-include "app-styles/file-manager.rc"
-include "app-styles/terminal.rc"
-include "app-styles/panel.rc"
+widget "xfwm4-tabwin*" style "xfwm-tabwin"
+widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
+widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"