fixing sidepanel for caja. changed xfce panel

21 files changed, 663 insertions, 32 deletions

diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.png b/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.png
new file mode 100755
index 0000000..6a69afe
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.png
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.svg b/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.svg
new file mode 100755
index 0000000..ee6900a
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/panel-bg-new.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.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
new file mode 100644
index 0000000..6fe52ae
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/panel-button-active.png
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-button-hover.png b/Kogaion-daylight/gtk-2.0/Panel/panel-button-hover.png
new file mode 100644
index 0000000..67b8b20
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/panel-button-hover.png
diff --git a/Kogaion-daylight/gtk-2.0/Panel/panel-button-inactive.png b/Kogaion-daylight/gtk-2.0/Panel/panel-button-inactive.png
new file mode 100644
index 0000000..309c39c
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/panel-button-inactive.png
diff --git a/Kogaion-daylight/gtk-2.0/apps/thunar.rc b/Kogaion-daylight/gtk-2.0/app-styles/file-manager.rc
index 79798c7..76c3da8 100755
--- a/Kogaion-daylight/gtk-2.0/apps/thunar.rc
+++ b/Kogaion-daylight/gtk-2.0/app-styles/file-manager.rc
@@ -1,4 +1,17 @@
-## Some additional thunar-specific theming
+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
@@ -11,19 +24,13 @@ style "thunar-location-buttons"
 }
 class "ThunarLocationButtons" style "thunar-location-buttons"
 
-style "sidepane" 
-{
-	base[NORMAL]		= mix (0.5, @bg_color, @window_active_color)	# backgroung
-	bg[NORMAL]			= shade (0.91, @base_color)
-	bg[PRELIGHT]		= @fg_color
-	
-	engine "murrine"
-	{ 
-		contrast				= 0.80
-	}
-}
-
 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
new file mode 100644
index 0000000..01c2f66
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
@@ -0,0 +1,182 @@
+style "xfce-panel"
+{
+	xthickness = 2 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
+	ythickness = 2
+
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
+	bg[NORMAL]		= shade (0.70, @window_active_color)
+
+	fg[NORMAL]		= @bg_color
+	fg[PRELIGHT]	= lighter (@selected_bg_color)
+	fg[ACTIVE]		= @bg_color
+
+	text[NORMAL]   	= @fg_color
+	text[PRELIGHT] 	= @text_color
+#	text[ACTIVE]	= @test1
+	
+	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"
+{
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
+	bg[NORMAL]		= shade (0.70, @window_active_color)
+
+	fg[NORMAL]		= @bg_color
+	fg[PRELIGHT]	= shade (0.9, @bg_color)
+	fg[ACTIVE]		= @bg_color
+
+	text[NORMAL]   	= @fg_color
+	text[PRELIGHT] 	= @text_color
+	text[ACTIVE]	= @fg_color
+
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-light"
+{
+	xthickness = 1
+	ythickness = 0
+
+	fg[NORMAL] = @fg_color
+
+	engine "murrine" {
+		textstyle = 0
+		roundness = 0
+	}
+}
+
+style "theme-panel-text"
+{
+	fg[NORMAL]		= @bg_color
+	fg[PRELIGHT]	= shade (0.9, @bg_color)
+	fg[ACTIVE]		= @bg_color
+	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
+		}
+	}
+}
+
+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"
+
+# XFCE panel theming.
+widget "*Xfce*Panel*"	style "xfce-panel"
+class "*Xfce*Panel*"	style "xfce-panel"
+
+# 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 "theme-panel-text"
+widget "*PanelApplet*"			style "theme-panel-text"
+
+# Hide ugly handle
+class "PanelAppletFrame" style:highest "theme-panel-handle"
+
+# The following removes the arrows from the panel
+
+style "panel-arrow-remove" {
+engine "pixmap" {
+	image {
+		function	= ARROW
+		recolorable	= TRUE
+		overlay_file	= "Panel/arrow-blank.png"
+		overlay_border	= {2,2,2,2}
+		overlay_stretch	= FALSE
+		arrow_direction	= UP
+		}
+	image {
+		function	= ARROW
+		recolorable	= TRUE
+		overlay_file	= "Panel/arrow-blank.png"
+		overlay_border	= {2,2,2,2}
+		overlay_stretch	= FALSE
+		arrow_direction	= DOWN
+		}
+	}
+}
+
+widget_class "*PanelToplevel*" style "panel-arrow-remove"
diff --git a/Kogaion-daylight/gtk-2.0/apps/panel.rc b/Kogaion-daylight/gtk-2.0/app-styles/panel1.rc
index e95c704..51d7430 100755
--- a/Kogaion-daylight/gtk-2.0/apps/panel.rc
+++ b/Kogaion-daylight/gtk-2.0/app-styles/panel1.rc
@@ -11,6 +11,48 @@ style "theme-panel"
 	
 	text[NORMAL]   	= @fg_color
 	text[PRELIGHT] 	= @text_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 "theme-panel-text"
@@ -51,6 +93,18 @@ style "workspace-switcher" = "theme-panel"
 	bg[SELECTED] = shade (1.4, @selected_bg_color)
 }
 
+style "theme-panel-handle" 
+{
+	engine "pixmap" {    
+		image {
+			function = HANDLE
+		}    
+		image {
+			function = HANDLE
+		}
+	}
+}
+
 widget "*PanelWidget*"              style "theme-panel"
 widget "*PanelApplet*"              style "theme-panel"
 widget "*fast-user-switch*"         style "theme-panel"
@@ -87,6 +141,9 @@ widget_class "*Panel*<GtkMenuBar>*" style "theme-main-menu-text"
 widget "*.clock-applet-button.*"    style "theme-panel-text"
 widget "*PanelApplet*"              style "theme-panel-text"
 
+# Hide ugly handle
+class "PanelAppletFrame" style:highest "theme-panel-handle"
+
 # dark menus
 #widget_class "*<GtkMenu>*"              	style "test"
 #widget_class "*<GtkMenuItem>*"          	style "test"
diff --git a/Kogaion-daylight/gtk-2.0/apps/terminal.rc b/Kogaion-daylight/gtk-2.0/app-styles/terminal.rc
index 204adec..204adec 100755
--- a/Kogaion-daylight/gtk-2.0/apps/terminal.rc
+++ b/Kogaion-daylight/gtk-2.0/app-styles/terminal.rc
diff --git a/Kogaion-daylight/gtk-2.0/gtkrc b/Kogaion-daylight/gtk-2.0/gtkrc
index efc6de8..4e17a8f 100755
--- a/Kogaion-daylight/gtk-2.0/gtkrc
+++ b/Kogaion-daylight/gtk-2.0/gtkrc
@@ -1026,6 +1026,6 @@ style "xfdesktop-icon-view" {
 widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
 
 # widget "xfwm4-tabwin*" style "murrine-dark"
-include "apps/thunar.rc"		# thunar especific
-include "apps/terminal.rc"
-include "apps/panel.rc"
+include "app-styles/file-manager.rc"
+include "app-styles/terminal.rc"
+include "app-styles/panel.rc"
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.png
new file mode 100755
index 0000000..6a69afe
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.png
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.svg b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.svg
new file mode 100755
index 0000000..ee6900a
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg-new.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.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-bg.svg b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg.svg
new file mode 100755
index 0000000..4dc0f27
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Panel/panel-bg.svg
@@ -0,0 +1,12 @@
+<?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="26" width="72" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 72.000002 26" xmlns:dc="http://purl.org/dc/elements/1.1/">

+ <defs>

+  <linearGradient id="a" y2="1052.4" gradientUnits="userSpaceOnUse" x2="35.635" y1="1026.5" x1="35.734">

+   <stop stop-color="#4c77bf" offset="0"/>

+   <stop stop-color="#2153a7" offset="1"/>

+  </linearGradient>

+ </defs>

+ <g transform="translate(0 -1026.4)">

+  <rect opacity=".5" height="26" width="72" y="1026.5" x="0" fill="url(#a)"/>

+ </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
new file mode 100644
index 0000000..6fe52ae
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-active.png
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-hover.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-hover.png
new file mode 100644
index 0000000..67b8b20
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-hover.png
diff --git a/Kogaion-nighttime/gtk-2.0/Panel/panel-button-inactive.png b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-inactive.png
new file mode 100644
index 0000000..309c39c
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Panel/panel-button-inactive.png
diff --git a/Kogaion-nighttime/gtk-2.0/apps/thunar.rc b/Kogaion-nighttime/gtk-2.0/app-styles/file-manager.rc
index 1c3869b..92afeca 100755
--- a/Kogaion-nighttime/gtk-2.0/apps/thunar.rc
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/file-manager.rc
@@ -1,4 +1,17 @@
-## Some additional thunar-specific theming
+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
@@ -11,19 +24,13 @@ style "thunar-location-buttons"
 }
 class "ThunarLocationButtons" style "thunar-location-buttons"
 
-style "sidepane" 
-{
-	base[NORMAL]		= mix (0.5, @window_active_color, @bg_color)	# backgroung
-	bg[NORMAL]			= shade (0.91, @base_color)
-	bg[PRELIGHT]		= @fg_color
-	
-	engine "murrine"
-	{ 
-		contrast				= 0.80
-	}
-}
-
 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/apps/panel.rc b/Kogaion-nighttime/gtk-2.0/app-styles/panel (copy).rc
index 1d00ae3..1d00ae3 100755
--- a/Kogaion-nighttime/gtk-2.0/apps/panel.rc
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/panel (copy).rc
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
new file mode 100644
index 0000000..030a873
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
@@ -0,0 +1,182 @@
+style "xfce-panel"
+{
+	xthickness = 2 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
+	ythickness = 2
+
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
+	bg[NORMAL]		= @selected_bg_color
+
+	fg[NORMAL]		= lighter (@fg_color)
+	fg[PRELIGHT]	= shade (1.75, @selected_bg_color)
+	fg[ACTIVE]		= lighter (@fg_color)
+
+	text[NORMAL]	= @fg_color
+	text[PRELIGHT]	= @text_color
+#	text[ACTIVE]	= @test1
+	
+	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"
+{
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
+	bg[NORMAL]		= shade (0.70, @window_active_color)
+
+	fg[NORMAL]		= @bg_color
+	fg[PRELIGHT]	= shade (0.9, @bg_color)
+	fg[ACTIVE]		= @bg_color
+
+	text[NORMAL]   	= @fg_color
+	text[PRELIGHT] 	= @text_color
+	text[ACTIVE]	= @fg_color
+
+	engine "murrine" {
+	}
+}
+
+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
+		}
+	}
+}
+
+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"
+
+# XFCE panel theming.
+widget "*Xfce*Panel*"	style "xfce-panel"
+class "*Xfce*Panel*"	style "xfce-panel"
+
+# 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 "theme-panel-text"
+widget "*PanelApplet*"			style "theme-panel-text"
+
+# Hide ugly handle
+class "PanelAppletFrame" style:highest "theme-panel-handle"
+
+# The following removes the arrows from the panel
+
+style "panel-arrow-remove" {
+engine "pixmap" {
+	image {
+		function	= ARROW
+		recolorable	= TRUE
+		overlay_file	= "Panel/arrow-blank.png"
+		overlay_border	= {2,2,2,2}
+		overlay_stretch	= FALSE
+		arrow_direction	= UP
+		}
+	image {
+		function	= ARROW
+		recolorable	= TRUE
+		overlay_file	= "Panel/arrow-blank.png"
+		overlay_border	= {2,2,2,2}
+		overlay_stretch	= FALSE
+		arrow_direction	= DOWN
+		}
+	}
+}
+
+widget_class "*PanelToplevel*" style "panel-arrow-remove"
diff --git a/Kogaion-nighttime/gtk-2.0/apps/terminal.rc b/Kogaion-nighttime/gtk-2.0/app-styles/terminal.rc
index 609aab5..609aab5 100755
--- a/Kogaion-nighttime/gtk-2.0/apps/terminal.rc
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/terminal.rc
diff --git a/Kogaion-nighttime/gtk-2.0/gtkrc b/Kogaion-nighttime/gtk-2.0/gtkrc
index 4d03ce6..5cc8b8e 100755
--- a/Kogaion-nighttime/gtk-2.0/gtkrc
+++ b/Kogaion-nighttime/gtk-2.0/gtkrc
@@ -1026,6 +1026,6 @@ style "xfdesktop-icon-view" {
 widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
 
 # widget "xfwm4-tabwin*" style "murrine-dark"
-include "apps/thunar.rc"		# thunar especific
-include "apps/terminal.rc"
-include "apps/panel.rc"
+include "app-styles/file-manager.rc"
+include "app-styles/terminal.rc"
+include "app-styles/panel.rc"