E SVN: jeffdameth IN trunk/THEMES/detourious: . bits images images/illume

[Enlightenment S. <no-...@en...>]

Log:
themes/dtrs: make all focus/colored parts changeable by 'focus' color_class
  - round style for winlist and pager popup with composite
  - use focus color only for slected desk in pager 
  

Author:       jeffdameth
Date:         2011-09-01 05:54:35 -0700 (Thu, 01 Sep 2011)
New Revision: 63056
Trac:         http://trac.enlightenment.org/e/changeset/63056

Added:
  trunk/THEMES/detourious/images/engage_im0.png trunk/THEMES/detourious/images/popup_round.png 
Modified:
  trunk/THEMES/detourious/bits/button.edc trunk/THEMES/detourious/bits/check.edc trunk/THEMES/detourious/bits/engage.edc trunk/THEMES/detourious/bits/everything.edc trunk/THEMES/detourious/bits/exebuf.edc trunk/THEMES/detourious/bits/ilist.edc trunk/THEMES/detourious/bits/illume.edc trunk/THEMES/detourious/bits/illume_kbd.edc trunk/THEMES/detourious/bits/itask.edc trunk/THEMES/detourious/bits/menu.edc trunk/THEMES/detourious/bits/pager.edc trunk/THEMES/detourious/bits/radio.edc trunk/THEMES/detourious/bits/scrollframe.edc trunk/THEMES/detourious/bits/shelf.edc trunk/THEMES/detourious/bits/slider.edc trunk/THEMES/detourious/bits/winlist.edc trunk/THEMES/detourious/colors.edc trunk/THEMES/detourious/images.edc trunk/THEMES/detourious/images/backdrop_grad.png trunk/THEMES/detourious/images/button_im3.png trunk/THEMES/detourious/images/check_bt3.png trunk/THEMES/detourious/images/illume/illume-apps.png trunk/THEMES/detourious/images/itask_im0.png trunk/THEMES/detourious/images/menu_im2.png trunk/THEMES/detourious/images/pager_im0.png trunk/THEMES/detourious/images/pager_im2.png trunk/THEMES/detourious/images/pager_im3.png trunk/THEMES/detourious/images/radio_bt3.png trunk/THEMES/detourious/main.edc 

Modified: trunk/THEMES/detourious/bits/button.edc
===================================================================
--- trunk/THEMES/detourious/bits/button.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/button.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -193,12 +193,9 @@
 				state: "default" 0.0;
 				image.normal: "images/button_im3.png";
 				image.border: 7 7 7 7;
-				rel1 { 
-					to: "focus_clip"; 
-				}
-				rel2 { 
-					to: "focus_clip"; 
-				}
+				rel1.to: "focus_clip"; 
+				rel2.to: "focus_clip"; 
+				color_class: "focus";
 			}
 		}
 

Modified: trunk/THEMES/detourious/bits/check.edc
===================================================================
--- trunk/THEMES/detourious/bits/check.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/check.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -150,7 +150,8 @@
 			description {
 				state: "visible" 0.0;
 				inherit: "default" 0.0;
-				color: 109 152 222 255;
+				/* color: 109 152 222 255; */
+				color_class: "focus";
 			}
 		}
 		/*
@@ -204,6 +205,7 @@
 					relative: 1.0 1.0;
 					offset: -1 -1;
 				}
+				color_class: "focus";
 			}
 		}
 		/*

Modified: trunk/THEMES/detourious/bits/engage.edc
===================================================================
--- trunk/THEMES/detourious/bits/engage.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/engage.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -87,7 +87,7 @@
 				rel2.offset: 34 -1;
 
 				image {
-					normal: "images/itask_im0.png";
+					normal: "images/engage_im0.png";
 					border: 26 26 10 4;
 				}
 				color_class: "shelf_base";

Modified: trunk/THEMES/detourious/bits/everything.edc
===================================================================
--- trunk/THEMES/detourious/bits/everything.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/everything.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -147,7 +147,7 @@
 				}
 			}
 		}
-#if (BUILD_ILLUME == 0) || (BUILD_COMPOSITE == 0)
+#if (EVRY_TRANSPARENT == 0)
 
 		part {
 			name: "list_bg";
@@ -290,7 +290,7 @@
 				visible: 1;
 			}
 		}
-#if (BUILD_ILLUME == 0) || (BUILD_COMPOSITE == 0)
+#if (EVRY_TRANSPARENT == 0)
 
 		part {
 			name: "list_top_shadow";
@@ -552,7 +552,7 @@
 }
 group {
 	name: "e/modules/everything/main";
-#if (BUILD_ILLUME == 1) && (BUILD_COMPOSITE == 1)
+#if (EVRY_TRANSPARENT == 1)
 	data{
 		item: "shaped" "1";
 	}
@@ -569,7 +569,6 @@
 			}
 		}
 
-
 		part {
 			name: "win";
 			type: RECT;
@@ -583,7 +582,6 @@
 				color_class: "dialog_base";
 			}
 		}
-		
 
 		part {
 			name: "list";
@@ -604,7 +602,6 @@
 			}
 		}
 
-
 		part {
 			name: "separator";
 			mouse_events: 0;
@@ -1229,7 +1226,7 @@
 group {
 	name: "e/modules/everything/thumbview/item/thumb";
 #if BUILD_ILLUME
-	min: 128 128;
+	min: 110 110;
 #endif
 	parts {
 
@@ -1289,7 +1286,7 @@
 				rel1.offset: 1   1;
 				rel2.offset: -2 -2;
 
-#if (BUILD_ILLUME == 1) && (BUILD_COMPOSITE == 1)
+#if (EVRY_TRANSPARENT == 1)
 				color: 0 0 0 80;
 #else
 				color: 0 0 0 0;
@@ -1303,11 +1300,12 @@
 				state: "selected" 0.0;
 				inherit: "default" 0.0;
 				visible: 1;
-#if (BUILD_ILLUME == 1) && (BUILD_COMPOSITE == 1)
+#if (EVRY_TRANSPARENT == 1)
 				color: 255 255 255 200;
 #else
 				color: 255 255 255 255;
 #endif
+				color_class: "focus";
 			}
 		}
 
@@ -1331,6 +1329,7 @@
 				inherit: "default" 0.0;
 				visible: 1;
 				color: 255 255 255 60;
+				color_class: "focus";
 			}
 		}
 
@@ -1438,7 +1437,7 @@
 				rel2.offset: -3 -1;
 				rel1.relative: 0.0 1.0;
 
-#if (BUILD_ILLUME == 1) && (BUILD_COMPOSITE == 1)
+#if (EVRY_TRANSPARENT == 1)
 				TEXT_COLOR_SELECTED;
 #else
 				TEXT_COLOR;
@@ -2424,3 +2423,46 @@
 		}
 	}
 }
+group {
+	name: "e/modules/everything/gadget";
+	max: 128 128;
+	parts {
+		part {
+            name: "base";
+            description {
+				state: "default" 0.0;
+				aspect: 1.0 1.0;
+				aspect_preference: BOTH;
+				rel1.offset: 2 2;
+				rel2.offset: -3 -3;
+				image.normal: "icons/everything.png";
+            }
+            description {
+				state: "active" 0.0;
+				inherit: "default" 0.0;
+				visible: 0;
+				color: 255 255 255 0;
+            }
+		}
+	}
+	/* programs {
+	 * 	program {
+     *         name: "on";
+     *         signal: "e,state,focused";
+     *         source: "e";
+     *         action: STATE_SET "active" 0.0;
+     *         transition: LINEAR 0.2;
+     *         target: "base";
+     *         target: "over";
+	 * 	}
+	 * 	program {
+     *         name: "off";
+     *         signal: "e,state,unfocused";
+     *         source: "e";
+     *         action: STATE_SET "default" 0.0;
+     *         transition: LINEAR 0.3;
+     *         target: "base";
+     *         target: "over";
+	 * 	}
+	 * } */
+}

Modified: trunk/THEMES/detourious/bits/exebuf.edc
===================================================================
--- trunk/THEMES/detourious/bits/exebuf.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/exebuf.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -287,29 +287,29 @@
 			}
 		}
 
-		part {      
-			name: "icon_overlay";
-			type: IMAGE;
-			mouse_events: 0;
-			description {
-				state: "default" 0.0;
-				min: 48 47;
-				max: 48 47;
-				fixed: 1 1;
-				image.normal: "images/scrollframe_im2.png";
-				image.border: 7 7 7 7; 
-				rel1 { 
-					to: "icon"; 
-					relative: 0.0 0.0; 
-					offset: 0 0; 
-				}
-				rel2 { 
-					to: "icon"; 
-					relative: 1.0 1.0; 
-					offset: 0 -1; 
-				}
-			}
-		}
+		/* part {      
+		 * 	name: "icon_overlay";
+		 * 	type: IMAGE;
+		 * 	mouse_events: 0;
+		 * 	description {
+		 * 		state: "default" 0.0;
+		 * 		min: 48 47;
+		 * 		max: 48 47;
+		 * 		fixed: 1 1;
+		 * 		image.normal: "images/scrollframe_im2.png";
+		 * 		image.border: 7 7 7 7; 
+		 * 		rel1 { 
+		 * 			to: "icon"; 
+		 * 			relative: 0.0 0.0; 
+		 * 			offset: 0 0; 
+		 * 		}
+		 * 		rel2 { 
+		 * 			to: "icon"; 
+		 * 			relative: 1.0 1.0; 
+		 * 			offset: 0 -1; 
+		 * 		}
+		 * 	}
+		 * } */
 
 		part {
 			name: "e.swallow.icons";

Modified: trunk/THEMES/detourious/bits/ilist.edc
===================================================================
--- trunk/THEMES/detourious/bits/ilist.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/ilist.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -29,17 +29,26 @@
 	parts {
 
 		part {
+			name: "color";
+			type: RECT;
+			description {
+				state: "default" 0.0;
+				color_class: "focus";
+			}
+		}
+
+		part {
 			name: "base";
 			type: RECT;
+			clip_to: "color";
 			description {
 				state: "default" 0.0;
-				color: COLOR_LIST_BG;
-				color_class: "ilist_item_base";
+				color: 255 255 255 0;
+				/* color_class: "ilist_item_base"; */
 			}
 			description {
 				state: "active" 0.0;
-				color: COLOR_LIST_BG_ACTIVE;
-				color_class: "menu_item_active";
+				color: 255 255 255 255;
 			}
 		}
 
@@ -122,17 +131,30 @@
 	parts {
 
 		part {
+			name: "color";
+			type: RECT;
+			description {
+				state: "default" 0.0;
+				color_class: "focus";
+			}
+		}
+
+		part {
 			name: "base";
 			type: RECT;
+			clip_to: "color";
+
 			description {
 				state: "default" 0.0;
-				color: COLOR_LIST_BG_ODD;
-				color_class: "ilist_item_odd_base";
+				/* color: COLOR_LIST_BG_ODD;
+				 * color_class: "ilist_item_odd_base"; */
+				color: 255 255 255 20;
 			}
 			description {
 				state: "active" 0.0;
-				color: COLOR_LIST_BG_ACTIVE;
-				color_class: "menu_item_active";
+				/* color: COLOR_LIST_BG_ACTIVE;
+				 * color_class: "menu_item_active"; */
+				color: 255 255 255 255;
 			}
 		}
 
@@ -214,14 +236,24 @@
 	data.item: "stacking" "above";
 	data.item: "selectraise" "on";
 	parts {
+		part {
+			name: "color";
+			type: RECT;
+			description {
+				state: "default" 0.0;
+				color_class: "focus";
+			}
+		}
 
 		part {
 			name: "base";
 			type: RECT;
 			mouse_events: 0;
+			clip_to: "color";
 			description {
 				state: "default" 0.0;
-				color: COLOR_LIST_HEADER;
+				/* color: COLOR_LIST_HEADER; */
+				color: 180 180 180 255;
 			}
 		}
 

Modified: trunk/THEMES/detourious/bits/illume.edc
===================================================================
--- trunk/THEMES/detourious/bits/illume.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/illume.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -149,19 +149,17 @@
 				fixed: 1 1;
 				align: 0.5 0.5;
 				min: 32 16;
-				rel1.offset: 0 0;
-				rel2.offset: 1 -1;
+				/* rel1.offset: 0 0;
+				 * rel2.offset: 1 -1; */
 				image {
 					normal: "images/shelf_def_im0.png";
 					border: 4 4 3 3;
 				}
-				FILL(0 -6,0 6);
-
+				color: 225 225 225 40;
 			}
 			description {
 				state: "on" 0.0;
 				inherit: "default" 0.0;
-				color: 225 225 225 255;
 			}
 		}
 
@@ -196,7 +194,7 @@
 			mouse_events: 1;
 			description { state: "default" 0.0;
 				visible: 0;
-				color: 0 0 0 0;
+				color: 0 0 0 40;
 				rel1.to: "button_image";
 				rel2.to: "button_image";
 			}
@@ -258,18 +256,17 @@
 				fixed: 1 1;
 				align: 0.5 0.5;
 				min: 32 16;
-				rel1.offset: 0 0;
-				rel2.offset: 1 -1;
+				/* rel1.offset: 0 0;
+				 * rel2.offset: 1 -1; */
 				image {
 					normal: "images/shelf_def_im0.png";
 					border: 4 4 3 3;
 				}
-				FILL(0 -6,0 6);
+				color: 225 225 225 40;
 			}
 			description {
 				state: "clicked" 0.0;
 				inherit: "default" 0.0;
-				color: 225 225 225 255;
 			}
 			program {
 				name: "enable";
@@ -389,7 +386,7 @@
 				rel1.to: "button_image";
 				rel2.to: "button_image";
 				visible: 0;
-				color: 0 0 0 0;
+				color: 0 0 0 40;
 			}
 			description {
 				state: "clicked" 0.0;

Modified: trunk/THEMES/detourious/bits/illume_kbd.edc
===================================================================
--- trunk/THEMES/detourious/bits/illume_kbd.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/illume_kbd.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -18,11 +18,11 @@
 
 		part { name: "base";
 			description { state: "default" 0.0;
-				rel1 {
-					to_y: "compose_bg";
-					relative: 0.0 1.0;
-					offset: 0 0;
-				}
+				/* rel1 {
+				 * 	to_y: "compose_bg";
+				 * 	relative: 0.0 1.0;
+				 * 	offset: 0 0;
+				 * } */
 				image.normal: "images/illume/k_grad.png";
 				fill {
 					smooth: 0;
@@ -33,273 +33,274 @@
 				}
 			}
 		}
+		/* select word area */
+		/* part { name: "compose_bg";
+		 * 	description { state: "default" 0.0;
+		 * 		image.normal: "images/illume/k_wtgr.png";
+		 * 		rel2.to: "e.swallow.label";
+		 * 		rel2.offset: 1 2;
+		 * 		fill {
+		 * 			smooth: 0;
+		 * 			size {
+		 * 				relative: 0 1.0;
+		 * 				offset: 36 0;
+		 * 			}
+		 * 		}
+		 * 	}
+		 * } */
 
-		part { name: "compose_bg";
-			description { state: "default" 0.0;
-				image.normal: "images/illume/k_wtgr.png";
-				rel2.to: "e.swallow.label";
-				rel2.offset: 1 2;
-				fill {
-					smooth: 0;
-					size {
-						relative: 0 1.0;
-						offset: 36 0;
-					}
-				}
-			}
-		}
+		/* part { name: "e.text.label";
+		 * 	type: TEXT;
+		 * 	effect: TEXT_EFFECT;
+		 * 	mouse_events: 0;
+		 * 	scale: 1;
+		 * 	description { state: "default" 0.0;
+		 * 		visible: 0;
+		 * 		rel1.to_x: "tl_tab";
+		 * 		rel1.relative: 1.0 0.0;
+		 * 		rel1.offset: 1 8;
+		 * 		rel2.to_x: "rt_tab";
+		 * 		rel2.relative: 0.0 0.0;
+		 * 		rel2.offset: -2 8;
+		 * 		align: 0.5 0.0;
+		 * 		fixed: 0 1;
+		 * 		TEXT_COLOR;
+		 * 		TEXT_NORMAL(0, 0.5 0.5, 0 1);
+		 * 	}
+		 * } */
 
-		part { name: "e.text.label";
-			type: TEXT;
-			effect: TEXT_EFFECT;
-			mouse_events: 0;
-			scale: 1;
-			description { state: "default" 0.0;
-				visible: 0;
-				rel1.to_x: "tl_tab";
-				rel1.relative: 1.0 0.0;
-				rel1.offset: 1 8;
-				rel2.to_x: "rt_tab";
-				rel2.relative: 0.0 0.0;
-				rel2.offset: -2 8;
-				align: 0.5 0.0;
-				fixed: 0 1;
-				TEXT_COLOR;
-				TEXT_NORMAL(0, 0.5 0.5, 0 1);
-			}
-		}
+		/* part { name: "e.swallow.label";
+		 * 	type: SWALLOW;
+		 * 	description { state: "default" 0.0;
+		 * 		rel1.to: "e.text.label";
+		 * 		rel1.offset: -8 -8;
+		 * 		rel2.to_x: "e.text.label";
+		 * 		rel2.to_y: "e.swallow.content";
+		 * 		rel2.relative: 1.0 0.0;
+		 * 		rel2.offset: 7 -15;
+		 * 		align: 0.5 0.0;
+		 * 	}
+		 * } */
 
-		part { name: "e.swallow.label";
-			type: SWALLOW;
-			description { state: "default" 0.0;
-				rel1.to: "e.text.label";
-				rel1.offset: -8 -8;
-				rel2.to: "e.text.label";
-				rel2.offset: 7 7;
-				align: 0.5 0.0;
-			}
-		}
+		/* part { name: "compose_sh";
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		image.normal: "images/illume/k_tpsh.png";
+		 * 		rel1 {
+		 * 			to_x: "tl_tab";
+		 * 			relative: 1.0 0.0;
+		 * 			offset: -12 0;
+		 * 		}
+		 * 		rel2 {
+		 * 			to_x: "rt_tab";
+		 * 			to_y: "compose_bg";
+		 * 			relative: 0.0 1.0;
+		 * 			offset: 11 -1;
+		 * 		}
+		 * 		image.border: 12 12 12 12;
+		 * 		fill.smooth: 0;
+		 * 	}
+		 * } */
 
-		part { name: "compose_sh";
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: "images/illume/k_tpsh.png";
-				rel1 {
-					to_x: "tl_tab";
-					relative: 1.0 0.0;
-					offset: -12 0;
-				}
-				rel2 {
-					to_x: "rt_tab";
-					to_y: "compose_bg";
-					relative: 0.0 1.0;
-					offset: 11 -1;
-				}
-				image.border: 12 12 12 12;
-				fill.smooth: 0;
-			}
-		}
+		/* part { name: "tl_tab";
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		image.normal: "images/illume/k_tabl.png";
+		 * 		image.border: 0 12 6 6;
+		 * 		fill.smooth: 0;
+		 * 		rel1.to: "lprev";
+		 * 		rel2.to: "lprev";
+		 * 		rel2.offset: 13 -1;
+		 * 	}
+		 * }
+		 * 
+		 * part { name: "rt_tab";
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		image.normal: "images/illume/k_tabr.png";
+		 * 		image.border: 12 0 6 6;
+		 * 		fill.smooth: 0;
+		 * 		rel1.to: "lnext";
+		 * 		rel1.offset: -12 0;
+		 * 		rel2.to: "lnext";
+		 * 	}
+		 * } */
 
-		part { name: "tl_tab";
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: "images/illume/k_tabl.png";
-				image.border: 0 12 6 6;
-				fill.smooth: 0;
-				rel1.to: "lprev";
-				rel2.to: "lprev";
-				rel2.offset: 13 -1;
-			}
-		}
-
-		part { name: "rt_tab";
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: "images/illume/k_tabr.png";
-				image.border: 12 0 6 6;
-				fill.smooth: 0;
-				rel1.to: "lnext";
-				rel1.offset: -12 0;
-				rel2.to: "lnext";
-			}
-		}
-
-		part { name: "lprev";
-			type: RECT;
-			description { state: "default" 0.0;
-				aspect: 1.5 1.5;
-				align: 0.0 0.5;
-				aspect_preference: VERTICAL;
-				color: 0 0 0 0;
-				rel2 {
-					to_y: "compose_bg";
-					relative: 0.0 1.0;
-					offset: 0 -1;
-				}
-			}
-		}
-
-		part { name: "lnext";
-			type: RECT;
-			description { state: "default" 0.0;
-				aspect: 1.5 1.5;
-				align: 1.0 0.5;
-				aspect_preference: VERTICAL;
-				color: 0 0 0 0;
-				rel1 {
-					relative: 1.0 0.0;
-					offset: -1 0;
-				}
-				rel2 {
-					to_y: "compose_bg";
-					relative: 1.0 1.0;
-					offset: -1 -1;
-				}
-			}
-		}
+		/* part { name: "lprev";
+		 * 	type: RECT;
+		 * 	description { state: "default" 0.0;
+		 * 		aspect: 1.5 1.5;
+		 * 		align: 0.0 0.5;
+		 * 		aspect_preference: VERTICAL;
+		 * 		color: 0 0 0 0;
+		 * 		rel2 {
+		 * 			to_y: "compose_bg";
+		 * 			relative: 0.0 1.0;
+		 * 			offset: 0 -1;
+		 * 		}
+		 * 	}
+		 * }
+		 * 
+		 * part { name: "lnext";
+		 * 	type: RECT;
+		 * 	description { state: "default" 0.0;
+		 * 		aspect: 1.5 1.5;
+		 * 		align: 1.0 0.5;
+		 * 		aspect_preference: VERTICAL;
+		 * 		color: 0 0 0 0;
+		 * 		rel1 {
+		 * 			relative: 1.0 0.0;
+		 * 			offset: -1 0;
+		 * 		}
+		 * 		rel2 {
+		 * 			to_y: "compose_bg";
+		 * 			relative: 1.0 1.0;
+		 * 			offset: -1 -1;
+		 * 		}
+		 * 	}
+		 * } */
 	 
 
-		part { name: "tl_tabh";
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: "images/illume/k_tabhl.png";
-				image.border: 0 12 6 20;
-				fill.smooth: 0;
-				rel1.to: "tl_tab";
-				rel2.to: "tl_tab";
-				rel2.offset: -2 15;
-			}
-		}
+		/* part { name: "tl_tabh";
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		image.normal: "images/illume/k_tabhl.png";
+		 * 		image.border: 0 12 6 20;
+		 * 		fill.smooth: 0;
+		 * 		rel1.to: "tl_tab";
+		 * 		rel2.to: "tl_tab";
+		 * 		rel2.offset: -2 15;
+		 * 	}
+		 * }
+		 * 
+		 * part { name: "tr_tabh";
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		image.normal: "images/illume/k_tabhr.png";
+		 * 		image.border: 12 0 6 20;
+		 * 		fill.smooth: 0;
+		 * 		rel1.to: "rt_tab";
+		 * 		rel1.offset: 1 0;
+		 * 		rel2.to: "rt_tab";
+		 * 		rel2.offset: -1 15;
+		 * 	}
+		 * } */
 
-		part { name: "tr_tabh";
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: "images/illume/k_tabhr.png";
-				image.border: 12 0 6 20;
-				fill.smooth: 0;
-				rel1.to: "rt_tab";
-				rel1.offset: 1 0;
-				rel2.to: "rt_tab";
-				rel2.offset: -1 15;
-			}
-		}
-
 		part { name: "t_h";
 			mouse_events: 0;
 			description { state: "default" 0.0;
 				image.normal: "images/illume/k_tabhm.png";
 				fill.smooth: 0;
 				rel1 {
-					to: "tl_tabh";
-					relative: 1.0 1.0;
-					offset: 0 -15;
+					/* to: "tl_tabh"; */
+					/* relative: 1.0 1.0; */
+					offset: 0 1;
 				}
 				rel2 {
-					to: "tr_tabh";
-					relative: 0.0 1.0;
-					offset: -1 -1;
+					/* to: "tr_tabh"; */
+					relative: 1.0 0.0;
+					offset: -1 14;
 				}
 			}
 		}
 		// dict/selection selector
 
-		part { name: "lprev2";
-			mouse_events: 0;
-			scale: 1;
-			description { state: "default" 0.0;
-				max: 22 22;
-				aspect: 1.39393939 1.39393939;
-				aspect_preference: BOTH;
-				image.normal: "images/illume/big_arrow_up.png";
-				color: 255 255 255 255;
-				align: 0.5 0.5;
-				rel1.to: "lprev";
-				rel2.to: "lprev";
-			}
-		}
+		/* part { name: "lprev2";
+		 * 	mouse_events: 0;
+		 * 	scale: 1;
+		 * 	description { state: "default" 0.0;
+		 * 		max: 22 22;
+		 * 		aspect: 1.39393939 1.39393939;
+		 * 		aspect_preference: BOTH;
+		 * 		image.normal: "images/illume/big_arrow_up.png";
+		 * 		color: 255 255 255 255;
+		 * 		align: 0.5 0.5;
+		 * 		rel1.to: "lprev";
+		 * 		rel2.to: "lprev";
+		 * 	}
+		 * } */
 	 
 		// layout selector icon/config	
 
-		part { name: "button_image";
-			type: IMAGE;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1.to: "lnext";
-				rel1.offset: 0 1;
-				rel2.to: "lnext";
-				rel2.offset: -4 -1;
-				image.normal: "images/illume/bt_basew.png";
-				image.border: 7 7 7 7;
-				fill.smooth: 0;
-			}
-			description { state: "active" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "images/illume/bt_base2.png";
-				image.border: 7 7 7 7;
-				fill.smooth: 0;
-			}
-		}
+		/* part { name: "button_image";
+		 * 	type: IMAGE;
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		rel1.to: "lnext";
+		 * 		rel1.offset: 0 1;
+		 * 		rel2.to: "lnext";
+		 * 		rel2.offset: -4 -1;
+		 * 		image.normal: "images/illume/bt_basew.png";
+		 * 		image.border: 7 7 7 7;
+		 * 		fill.smooth: 0;
+		 * 	}
+		 * 	description { state: "active" 0.0;
+		 * 		inherit: "default" 0.0;
+		 * 		image.normal: "images/illume/bt_base2.png";
+		 * 		image.border: 7 7 7 7;
+		 * 		fill.smooth: 0;
+		 * 	}
+		 * } */
 
-		part { name: "e.swallow.layout";
-			type: SWALLOW;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1.to: "button_image";
-				rel2.to: "button_image";
-			}
-		}
+		/* part { name: "e.swallow.layout";
+		 * 	type: SWALLOW;
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		rel1.to: "button_image";
+		 * 		rel2.to: "button_image";
+		 * 	}
+		 * }
+		 * 
+		 * part { name: "over";
+		 * 	type: IMAGE;
+		 * 	mouse_events: 0;
+		 * 	description { state: "default" 0.0;
+		 * 		rel1.to: "button_image";	 
+		 * 		rel2.to: "button_image";
+		 * 		rel2.relative: 1.0 0.5;
+		 * 		image.normal: "images/illume/bt_hilightw.png";
+		 * 		image.border: 7 7 7 0;
+		 * 		fill.smooth: 0;
+		 * 	}
+		 * } */
 
-		part { name: "over";
-			type: IMAGE;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1.to: "button_image";	 
-				rel2.to: "button_image";
-				rel2.relative: 1.0 0.5;
-				image.normal: "images/illume/bt_hilightw.png";
-				image.border: 7 7 7 0;
-				fill.smooth: 0;
-			}
-		}
-
 		part { name: "e.swallow.content";
 			type: SWALLOW;
 			description { state: "default" 0.0;
 				rel1 {
-					to_y: "e.swallow.label";
-					relative: 0.0 1.0;
-					offset: 0 4;
+					relative: 0.0 0.0;
+					offset: 8 2;
 				}
 				rel2 {
 					relative: 1.0 1.0;
-					offset: -1 -1;
+					offset: -9 -3;
 				}
 			}
 		}
 	}
 	programs {
-		program { name: "lprev";
-			signal: "mouse,down,1";
-			source: "lprev";
-			action: SIGNAL_EMIT "e,action,do,matches" "";
-		}
-		program { name: "lnext";
-			signal: "mouse,up,1";
-			source: "lnext";
-			action: SIGNAL_EMIT "e,action,do,layouts" "";
-		}
-		program { name: "clicked";
-			signal: "mouse,down,1";
-			source: "lnext";
-			action: STATE_SET active 0.0;
-			target: "button_image";
-		}
-		program { name: "released";
-			signal: "mouse,up,1";
-			source: "lnext";
-			action: STATE_SET default 0.0;
-			target: "button_image";
-		}
+		/* program { name: "lprev";
+		 * 	signal: "mouse,down,1";
+		 * 	source: "lprev";
+		 * 	action: SIGNAL_EMIT "e,action,do,matches" "";
+		 * }
+		 * program { name: "lnext";
+		 * 	signal: "mouse,up,1";
+		 * 	source: "lnext";
+		 * 	action: SIGNAL_EMIT "e,action,do,layouts" "";
+		 * }
+		 * program { name: "clicked";
+		 * 	signal: "mouse,down,1";
+		 * 	source: "lnext";
+		 * 	action: STATE_SET active 0.0;
+		 * 	target: "button_image";
+		 * }
+		 * program { name: "released";
+		 * 	signal: "mouse,up,1";
+		 * 	source: "lnext";
+		 * 	action: STATE_SET default 0.0;
+		 * 	target: "button_image";
+		 * } */
 	}
 }
 

Modified: trunk/THEMES/detourious/bits/itask.edc
===================================================================
--- trunk/THEMES/detourious/bits/itask.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/itask.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -8,14 +8,11 @@
             mouse_events: 1;
             description {
 				state: "default" 0.0;
-				min: 32 16;
-				rel2.offset: 1 0;
 				image {
 					normal: "images/shelf_def_im0.png";
 					border: 4 4 3 3;
 				}
-				FILL(0 -6,0 6);
-				color: 255 255 255 128;
+				color: 255 255 255 40;
             }
             description {
 				state: "clicked" 0.0;

Modified: trunk/THEMES/detourious/bits/menu.edc
===================================================================
--- trunk/THEMES/detourious/bits/menu.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/menu.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -425,6 +425,7 @@
 					relative: 1.0 1.0; 
 					offset: 1 0; 
 				}
+				color_class: "focus";
 			} 
 			description {
 				state: "visible" 0.0;

Modified: trunk/THEMES/detourious/bits/pager.edc
===================================================================
--- trunk/THEMES/detourious/bits/pager.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/pager.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -1,10 +1,40 @@
 
 
 group {
+#ifdef BUILD_COMPOSITE
+	data {
+		item: "shaped" "1";
+	}	
+#endif
 	name: "e/modules/pager/popup";
 	parts {
+#ifdef BUILD_COMPOSITE
+		part {
+			name: "bg_border";
+			mouse_events: 0;
+			description {
+				state: "default" 0.0;
+				image {
+					normal: "images/popup_round.png";
+					border: 18 18 18 21;
+				}
+			}
+		}
 
 		part {
+			name: "base";
+			type: RECT;
+			mouse_events: 0;
+			description {
+				state: "default" 0.0;
+				visible: 0;
+				rel1.offset: 18 10;
+				rel2.offset: -19 -22;
+			}
+		}
+
+#else
+		part {
 			name: "bg_border";
 			type: RECT;
 			mouse_events: 0;
@@ -17,7 +47,6 @@
 
 		part {
 			name: "overlay";
-			type: IMAGE;
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
@@ -31,41 +60,55 @@
 			}
 		}
 
-		part { 
+		part {
+			name: "base";
+			type: RECT;
+			mouse_events: 0;
+			description {
+				state: "default" 0.0;
+				visible: 0;
+			}
+		}
+
+#endif
+		part {
 			name: "e.text.label";
 			type: TEXT;
 			effect: TEXT_EFFECT_BOLD;
 			mouse_events: 0;
 			scale: 1;
-			description { 
+			description {
 				state: "default" 0.0;
 				fixed: 1 1;
 				align: 0.5 0.0;
 				rel1 {
+					to: "base";
 					relative: 0.0 0.0;
 					offset: 0 8;
 				}
 				rel2 {
+					to: "base";
 					relative: 1.0 0.0;
 					offset: -1 -1;
 				}
 				TEXT_COLOR_BOLD;
-				TEXT_LARGE("module_large", 0.5 0.0, 1 1);
+				TEXT_LARGE("winlist_title", 0.5 0.0, 1 1);
 			}
 		}
 
-		part { 
+		part {
 			name: "e.swallow.content";
 			type: SWALLOW;
-			description { 
+			description {
 				state: "default" 0.0;
 				rel1 {
 					to_y: "e.text.label";
+					to_x: "base";
 					relative: 0.0 1.0;
 					offset: 4 0;
 				}
 				rel2 {
-					relative: 1.0 1.0;
+					to: "base";
 					offset: -5 -13;
 				}
 			}
@@ -73,7 +116,6 @@
 
 		part {
 			name: "decoration";
-			type: IMAGE;
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
@@ -82,11 +124,12 @@
 				fixed: 1 1;
 				align: 0.5 1.0;
 				rel1 {
+					to: "base";
 					relative: 0.0 1.0;
 					offset: 0 5;
 				}
 				rel2 {
-					relative: 1.0 1.0;
+					to: "base";
 					offset: -1 -2;
 				}
 				image {
@@ -109,59 +152,65 @@
 
 		part {
 			name: "gradient";
+			type: RECT;
 			mouse_events: 1;
-			description { 
-				state: "default" 0.0; 
-                           image {                                                        
-                              normal: "images/backdrop_grad.png";                         
-                           }                                                              
-                
-				rel1 { 
-					offset: 3 4; 
-				}
-				rel2 { 
-					offset: -2 -5; 
-				}
-			}
-		}
-
-		part {
-			name: "pattern";
-			type: IMAGE;
-			mouse_events: 0;
 			description {
 				state: "default" 0.0;
-				color: 205 204 188 5;
-				image {
-					normal: "images/wallpaper_pat3.png";
+				/* image.normal: "images/backdrop_grad.png"; */
+				color: 128 128 128 20;
+				rel1 {
+					offset: 3 4;
 				}
-				rel1 { 
-					offset: 3 4; 
+				rel2 {
+					offset: -2 -5;
 				}
-				rel2 { 
-					offset: -2 -5; 
-				}
-				fill {
-					smooth: 0;
-					size {
-						relative: 0 0;
-						offset: 200 200;
-					}
-				}
+				/* color_class: "focus"; */
 			}
+			description {
+				state: "active" 0.0;
+				inherit: "default" 0.0;
+				color: 255 255 255 200;
+				color_class: "focus";
+			}
 		}
 
+		/* part {
+		 * 	name: "pattern";
+		 * 	type: IMAGE;
+		 * 	mouse_events: 0;
+		 * 	description {
+		 * 		state: "default" 0.0;
+		 * 		color: 205 204 188 5;
+		 * 		image {
+		 * 			normal: "images/wallpaper_pat3.png";
+		 * 		}
+		 * 		rel1 {
+		 * 			offset: 3 4;
+		 * 		}
+		 * 		rel2 {
+		 * 			offset: -2 -5;
+		 * 		}
+		 * 		fill {
+		 * 			smooth: 0;
+		 * 			size {
+		 * 				relative: 0 0;
+		 * 				offset: 200 200;
+		 * 			}
+		 * 		}
+		 * 	}
+		 * } */
+
 		part {
 			name: "e.swallow.content";
 			type: SWALLOW;
 			clip_to: "transitions_clip";
 			description {
 				state: "default" 0.0;
-				rel1 { 
-					offset: 5 7; 
+				rel1 {
+					offset: 5 7;
 				}
-				rel2 { 
-					offset: -5 -7; 
+				rel2 {
+					offset: -5 -7;
 				}
 			}
 		}
@@ -173,11 +222,11 @@
 			description {
 				state: "default" 0.0;
 				color: 255 255 255 128;
-				rel1 { 
-					offset: 3 4; 
+				rel1 {
+					offset: 3 4;
 				}
-				rel2 { 
-					offset: -2 -5; 
+				rel2 {
+					offset: -2 -5;
 				}
 			}
 			description {
@@ -198,7 +247,9 @@
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
-				color: 75 115 199 128;
+				/* color_class: "focus"; */
+				/* color: 75 115 199 128; */
+				color: 200 200 200 255;
 				rel1.to: "background";
 				rel1.offset: 3 1;
 				rel2.to: "background";
@@ -215,29 +266,30 @@
 				state: "default" 0.0;
 				image.normal: "images/pager_im2.png";
 				image.border: 2 2 2 2;
-				rel1 { 
-					to: "transitions_clip"; 
-					relative: 0.0 0.0; 
-					offset: 0 0; 
+				color: 255 255 255 32;
+				rel1 {
+					to: "transitions_clip";
+					relative: 0.0 0.0;
+					offset: 0 0;
 				}
-				rel2 { 
-					to: "transitions_clip"; 
-					relative: 1.0 0.5; 
-					offset: 0 0; 
+				rel2 {
+					to: "transitions_clip";
+					relative: 1.0 0.5;
+					offset: 0 0;
 				}
 			}
 			description {
 				state: "active" 0.0;
 				inherit: "default" 0.0;
-				rel1 { 
-					to: "transitions_clip"; 
-					relative: 0.0 0.0; 
-					offset: 0 0; 
+				rel1 {
+					to: "transitions_clip";
+					relative: 0.0 0.0;
+					offset: 0 0;
 				}
-				rel2 { 
-					to: "transitions_clip"; 
-					relative: 1.0 0.0; 
-					offset: -1 -1; 
+				rel2 {
+					to: "transitions_clip";
+					relative: 1.0 0.0;
+					offset: -1 -1;
 				}
 			}
 		}
@@ -251,29 +303,30 @@
 				state: "default" 0.0;
 				image.normal: "images/pager_im3.png";
 				image.border: 2 2 2 2;
-				rel1 { 
-					to: "transitions_clip"; 
-					relative: 0.0 0.5; 
-					offset: 0 0; 
+				color: 255 255 255 32;
+				rel1 {
+					to: "transitions_clip";
+					relative: 0.0 0.5;
+					offset: 0 0;
 				}
-				rel2 { 
-					to: "transitions_clip"; 
-					relative: 1.0 1.0; 
-					offset: 0 -1; 
+				rel2 {
+					to: "transitions_clip";
+					relative: 1.0 1.0;
+					offset: 0 -1;
 				}
 			}
 			description {
 				state: "active" 0.0;
 				inherit: "default" 0.0;
-				rel1 { 
-					to: "transitions_clip"; 
-					relative: 0.0 1.0; 
-					offset: 0 0; 
+				rel1 {
+					to: "transitions_clip";
+					relative: 0.0 1.0;
+					offset: 0 0;
 				}
-				rel2 { 
-					to: "transitions_clip"; 
-					relative: 1.0 1.0; 
-					offset: -1 -1; 
+				rel2 {
+					to: "transitions_clip";
+					relative: 1.0 1.0;
+					offset: -1 -1;
 				}
 			}
 		}
@@ -284,11 +337,11 @@
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
-				rel1 { 
-					offset: 0 3; 
+				rel1 {
+					offset: 0 3;
 				}
-				rel2 { 
-					offset: 1 -3; 
+				rel2 {
+					offset: 1 -3;
 				}
 				image {
 					normal: "images/pager_im6.png";
@@ -303,30 +356,32 @@
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
-				color: 192 192 192 255;
-				rel1 { 
-					to: "background"; 
-					relative: 0.0 0.0; 
-					offset: 1 -1; 
+				/* color: 192 192 192 255; */
+				color: 80 80 80 255;
+				rel1 {
+					to: "background";
+					relative: 0.0 0.0;
+					offset: 1 -1;
 				}
-				rel2 { 
-					to: "background"; 
-					relative: 1.0 1.0; 
-					offset: -2 0; 
+				rel2 {
+					to: "background";
+					relative: 1.0 1.0;
+					offset: -2 0;
 				}
 				image { /* unfocused */
-					normal: "images/pager_im8.png";
+					normal: "images/pager_im0.png";
 					border: 7 7 7 7;
 				}
 			}
 			description {
 				state: "active" 0.0;
 				inherit: "default" 0.0;
-				color: 255 255 255 192;
+				/* color: 255 255 255 192; */
 				image {
 					normal: "images/pager_im0.png";
 					border: 7 7 7 7;
 				}
+				color_class: "focus";
 			}
 		}
 
@@ -349,22 +404,22 @@
 		}
 /*
 
-  part { 
+  part {
 			name: "e.text.label";
 			type: TEXT;
 			effect: SHADOW;
 			mouse_events: 0;
 			scale: 1;
-			description { 
+			description {
 				state: "default" 0.0;
 				color: 255 255 255 0;
 				color3: 7 7 7 0;
 				color_class: "module_label";
-				rel1 { 
-					offset: 0 3; 
+				rel1 {
+					offset: 0 3;
 				}
-				rel2 { 
-					offset: 1 -3; 
+				rel2 {
+					offset: 1 -3;
 				}
 				text {
 				    font: "Sans:style=Bold";
@@ -373,7 +428,7 @@
 					text_class: "module_small";
 				}
 			}
-			description { 
+			description {
 				state: "active" 0.0;
 				inherit: "default" 0.0;
 				color: 255 255 255 221;
@@ -474,7 +529,7 @@
 			target: "focus";
 		}
 /*
-		program { 
+		program {
 			name: "name_show";
 			signal: "mouse,in";
 			source: "transitions_clip";
@@ -482,7 +537,7 @@
 			transition: SINUSOIDAL 0.1;
 			target: "e.text.label";
 		}
-		program { 
+		program {
 			name: "name_hide";
 			signal: "mouse,out";
 			source: "transitions_clip";
@@ -503,13 +558,13 @@
 			type: IMAGE;
 			description {
 				state: "default" 0.0;
-				rel1 { 
-					relative: 0.0 0.0; 
-					offset: -2 -2; 
+				rel1 {
+					relative: 0.0 0.0;
+					offset: -2 -2;
 				}
-				rel2 { 
-					relative: 1.0 1.0; 
-					offset: 3 3; 
+				rel2 {
+					relative: 1.0 1.0;
+					offset: 3 3;
 				}
 				image {
 					normal: "images/pager_im7.png";
@@ -532,13 +587,13 @@
 			description {
 				state: "default" 0.0;
 				color: 255 255 255 255;
-				rel1 { 
-					relative: 0.0 0.0; 
-					offset: -2 -2; 
+				rel1 {
+					relative: 0.0 0.0;
+					offset: -2 -2;
 				}
-				rel2 { 
-					relative: 1.0 1.0; 
-					offset: 3 3; 
+				rel2 {
+					relative: 1.0 1.0;
+					offset: 3 3;
 				}
 				image {
 					normal: "images/pager_im7.png";
@@ -557,11 +612,11 @@
 				state: "urgent" 0.0;
 				inherit: "default" 0.0;
 				color: 255 255 255 0;
-				rel1 { 
-					relative: -0.5 -0.5; 
+				rel1 {
+					relative: -0.5 -0.5;
 				}
-				rel2 { 
-					relative: 1.5 1.5; 
+				rel2 {
+					relative: 1.5 1.5;
 				}
 			}
 		}
@@ -575,19 +630,19 @@
 				max: 24 24;
 				aspect: 1.0 1.0;
 				aspect_preference: BOTH;
-				rel1 { 
-					to: "overlay"; 
-					offset: 6 6; 
+				rel1 {
+					to: "overlay";
+					offset: 6 6;
 				}
-				rel2 { 
-					to: "overlay"; 
-					offset: -5 -5; 
+				rel2 {
+					to: "overlay";
+					offset: -5 -5;
 				}
 			}
 		}
 	}
 	programs {
-		program { 
+		program {
 			name: "focused";
 			signal: "e,state,focused";
 			source: "e";
@@ -595,7 +650,7 @@
 			target: "pager_window";
 			target: "overlay";
 		}
-		program { 
+		program {
 			name: "unfocused";
 			signal: "e,state,unfocused";
 			source: "e";

Modified: trunk/THEMES/detourious/bits/radio.edc
===================================================================
--- trunk/THEMES/detourious/bits/radio.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/radio.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -123,7 +123,7 @@
 			description {
 				state: "visible" 0.0;
 				inherit: "default" 0.0;
-				color: 109 152 222 255;
+				color_class: "focus";
 			}
 		}
 
@@ -160,6 +160,7 @@
 					relative: 1.0 1.0; 
 					offset: -1 -1; 
 				}
+				color_class: "focus";
 			}
 		}
 

Modified: trunk/THEMES/detourious/bits/scrollframe.edc
===================================================================
--- trunk/THEMES/detourious/bits/scrollframe.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/scrollframe.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -443,38 +443,38 @@
             }
         }
 
-        part {
-            name: "focus_clip";
-            mouse_events: 0;
-            type: RECT;
-            description {
-                state: "default" 0.0;
-                color: 255 255 255 0;
-                rel1.offset: -1 3;
-                rel2.offset: -2 -3;
-            }
-            description {
-                state: "focused" 0.0;
-                inherit: "default" 0.0;
-                color: 255 255 255 220;
-            }
-        }
+        /* part {
+         *     name: "focus_clip";
+         *     mouse_events: 0;
+         *     type: RECT;
+         *     description {
+         *         state: "default" 0.0;
+         *         color: 255 255 255 0;
+         *         rel1.offset: -1 3;
+         *         rel2.offset: -2 -3;
+         *     }
+         *     description {
+         *         state: "focused" 0.0;
+         *         inherit: "default" 0.0;
+         *         color: 255 255 255 220;
+         *     }
+         * } */
 
-        part {
-            name: "focus";
-            mouse_events: 0;
-            clip_to: "focus_clip";
-            description {
-                state: "default" 0.0;
-                rel1.offset: -1 3;
-                rel2.offset: -2 -3;
-                image.normal: "images/scrollframe_im2.png";
-                image.border: 7 7 7 7;
-                fill {
-                    smooth: 0;
-                }
-            }
-        }
+        /* part {
+         *     name: "focus";
+         *     mouse_events: 0;
+         *     clip_to: "focus_clip";
+         *     description {
+         *         state: "default" 0.0;
+         *         rel1.offset: -1 3;
+         *         rel2.offset: -2 -3;
+         *         image.normal: "images/scrollframe_im2.png";
+         *         image.border: 7 7 7 7;
+         *         fill {
+         *             smooth: 0;
+         *         }
+         *     }
+         * } */
     }
     /* vertical programs */
     programs {

Modified: trunk/THEMES/detourious/bits/shelf.edc
===================================================================
--- trunk/THEMES/detourious/bits/shelf.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/shelf.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -48,6 +48,8 @@
 			description {
 				state: "left" 0.0;
 				inherit: "default" 0.0;
+				rel1.offset: 0 -1;
+				rel2.offset: -1 0;
 				image {
 					normal: "images/shelf_def_im1.png";
 					border: 3 2 3 2;

Modified: trunk/THEMES/detourious/bits/slider.edc
===================================================================
--- trunk/THEMES/detourious/bits/slider.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/slider.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -87,36 +87,36 @@
 			}
 		}
 
-		part {
-			name: "label_focus";
-			type: IMAGE;
-			mouse_events: 0;
-			description {
-				state: "default" 0.0;
-				min: 22 24;
-				visible: 0;
-				align: 0.0 0.5;
-				rel1 {
-					to: "e.text.label";
-					relative: 0.0  0.0;
-					offset: -11 -4;
-				}
-				rel2 {
-					to: "e.text.label";
-					relative: 1.0 1.0;
-					offset: 9 5;
-				}
-				image {
-					normal: "images/entry_im1.png";
-					border: 7 7 8 7;
-				}
-			}
-			description {
-				state: "active" 0.0;
-				inherit: "default" 0.0;
-				visible: 1;
-			}
-		}
+		/* part {
+		 * 	name: "label_focus";
+		 * 	type: IMAGE;
+		 * 	mouse_events: 0;
+		 * 	description {
+		 * 		state: "default" 0.0;
+		 * 		min: 22 24;
+		 * 		visible: 0;
+		 * 		align: 0.0 0.5;
+		 * 		rel1 {
+		 * 			to: "e.text.label";
+		 * 			relative: 0.0  0.0;
+		 * 			offset: -11 -4;
+		 * 		}
+		 * 		rel2 {
+		 * 			to: "e.text.label";
+		 * 			relative: 1.0 1.0;
+		 * 			offset: 9 5;
+		 * 		}
+		 * 		image {
+		 * 			normal: "images/entry_im1.png";
+		 * 			border: 7 7 8 7;
+		 * 		}
+		 * 	}
+		 * 	description {
+		 * 		state: "active" 0.0;
+		 * 		inherit: "default" 0.0;
+		 * 		visible: 1;
+		 * 	}
+		 * } */
 
 		part {
 			name: "e.text.label";
@@ -509,36 +509,36 @@
 			}
 		}
 
-		part {
-			name: "label_focus";
-			type: IMAGE;
-			mouse_events: 0;
-			description {
-				state: "default" 0.0;
-				min: 27 24;
-				max: 9999 24;
-				visible: 0;
-				rel1 {
-					to: "e.text.label";
-					relative: 0.0 0.0;
-					offset: -7 -4;
-				}
-				rel2 {
-					to: "e.text.label";
-					relative: 1.0 1.0;
-					offset: 3 3;
-				}
-				image {
-					normal: "images/entry_im1.png";
-					border: 7 7 8 7;
-				}
-			}
-			description {
-				state: "active" 0.0;
-				inherit: "default" 0.0;
-				visible: 1;
-			}
-		}
+		/* part {
+		 * 	name: "label_focus";
+		 * 	type: IMAGE;
+		 * 	mouse_events: 0;
+		 * 	description {
+		 * 		state: "default" 0.0;
+		 * 		min: 27 24;
+		 * 		max: 9999 24;
+		 * 		visible: 0;
+		 * 		rel1 {
+		 * 			to: "e.text.label";
+		 * 			relative: 0.0 0.0;
+		 * 			offset: -7 -4;
+		 * 		}
+		 * 		rel2 {
+		 * 			to: "e.text.label";
+		 * 			relative: 1.0 1.0;
+		 * 			offset: 3 3;
+		 * 		}
+		 * 		image {
+		 * 			normal: "images/entry_im1.png";
+		 * 			border: 7 7 8 7;
+		 * 		}
+		 * 	}
+		 * 	description {
+		 * 		state: "active" 0.0;
+		 * 		inherit: "default" 0.0;
+		 * 		visible: 1;
+		 * 	}
+		 * } */
 
 		part {
 			name: "e.text.label";

Modified: trunk/THEMES/detourious/bits/winlist.edc
===================================================================
--- trunk/THEMES/detourious/bits/winlist.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/bits/winlist.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -1,11 +1,40 @@
 
 group {
 	name: "e/widgets/winlist/main";
+#ifdef BUILD_COMPOSITE
 	data {
-	 	item: "shaped" "1";
-	} 
+		item: "shaped" "1";
+	}	
+#endif
 	parts {
 
+#ifdef BUILD_COMPOSITE
+		part {
+			name: "bg_border";
+			mouse_events: 0;
+			description {
+				state: "default" 0.0;
+				image {
+					normal: "images/popup_round.png";
+					border: 18 18 18 21;
+				}
+			}
+		}
+
+		part {
+			name: "base";
+			type: RECT;
+			mouse_events: 0;
+			description {
+				state: "default" 0.0;
+				visible: 0;
+				rel1.offset: 18 10;
+				rel2.offset: -19 -22;
+			}
+		}
+
+#else
+
 	  	part {
 			name: "bg_border";
 			type: RECT;
@@ -34,21 +63,58 @@
 		}
 
 		part {
+			name: "base";
+			type: RECT;
+			mouse_events: 0;
+			description {
+				state: "default" 0.0;
+				visible: 0;
+			}
+		}
+
+#endif
+		part {
+			name: "e.text.label";
+			type: TEXT;
+			effect: TEXT_EFFECT_BOLD;
+			mouse_events: 0;
+			scale: 1;
+			description {
+				state: "default" 0.0;
+				fixed: 1 1;
+				align: 0.5 0.0;
+				rel1 {
+					to: "base";
+					relative: 0.0 0.0;
+					offset: 8 10;
+				}
+				rel2 {
+					to: "base";
+					relative: 1.0 0.0;
+					offset: -9 -1;
+				}
+				TEXT_COLOR_BOLD;
+				TEXT_LARGE("winlist_title", 0.5 0.0, 0 1);
+				text.elipsis: 0.0;
+			}
+		}
+
+		part {
 			name: "list";
 			type: IMAGE;
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
 				color: 255 255 255 180;
-				rel1 { 
-					to_y: "e.swallow.list"; 
-					relative: 0.0 0.0; 
-					offset: 7 -7; 
+				rel1 {
+					to_y: "e.text.label";
+					to_x: "base";
+					relative: 0.0 1.0;
+					offset: 4 2;
 				}
-				rel2 { 
-					to_y: "e.swallow.list";
-					relative: 1.0 1.0;	
-					offset: -8 4;
+				rel2 {
+					to: "base";
+					offset: -5 -13;
 				}
 				image {
 					normal: "images/scrollframe_im0.png";
@@ -81,42 +147,19 @@
 		}
 
 		part {
-			name: "list_overlay";
-			type: IMAGE;
-			mouse_events: 0;
-			description {
-				state: "default" 0.0;
-				image.normal: "images/scrollframe_im2.png";
-				image.border: 7 7 7 7;
-				rel1 { 
-					to: "list"; 
-					relative: 0.0 0.0; 
-					offset: -1 -1; 
-				}
-				rel2 { 
-					to: "list"; 
-					relative: 1.0 1.0; 
-					offset: 0 -1; 
-				}
-			}
-		}
-
-		part {
 			name: "list_clip";
 			type: RECT;
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
 				color: 255 255 255 255;
-				rel1 { 
-					to_y: "e.swallow.list"; 
-					relative: 0.0 0.0; 
-					offset: 5 -4; 
+				rel1 {
+					to: "list"; 
+					offset: 1 1; 
 				}
-				rel2 { 
-					to_y: "e.swallow.list"; 
-					relative: 1.0 1.0; 
-					offset: -6 0; 
+				rel2 {
+					to: "list"; 
+					offset: -2 -2; 
 				}
 			}
 		}
@@ -127,109 +170,34 @@
 			clip_to: "list_clip";
 			description {
 				state: "default" 0.0;
-				rel1 { 
-					//to_y: "e.text.title"; 
-					relative: 0.0 0.0; 
-					offset: 16 12; 
-				} 
+				rel1 {
+					to: "list"; 
+					offset: 8 5; 
+				}
 				rel2 {
-					to_y: "e.text.label"; 
-					relative: 1.0 0.0; 
-					offset: -17 -17; 
+					to: "list"; 
+					offset: -9 -7; 
 				}
 			}
 		}
 
 		part {
-			name: "separator";
-			type: IMAGE;
-			mouse_events: 0;
-			description {
-				state: "default" 0.0;
-				max: 600 12;
-				rel1 { 
-					relative: 0.0 1.0; 
-					offset: 0 -16; 
-					to_y: "e.text.label"; 
-				}
-				rel2 { 
-					relative: 1.0 1.0; 
-					offset: 0 0; 
-				}
-				image {
-					normal: "images/dialog_im1.png";
-					border: 0 0 4 0;
-				}
-			}
-		}
-
-		part {   
-			name: "title_overlay";
-			type: IMAGE;
-			mouse_events: 0;
-			description {
-				state: "default" 0.0;
-				min: 10 24;
-				max: 9999 24;
-				align: 0.5 1.0;
-				rel1 { 
-					to_x: "e.text.label"; 
-					relative: 0.0 0.0; 
-					offset: -11 -2;
-				}
-				rel2 { 
-					to_y: "e.text.label"; 
-					relative: 1.0 1.0; 
-					offset: -4 2; 
-				}
-				image {
-					normal: "images/entry_im0.png";
-					border: 6 6 8 7;
-				}
-			}
-		}
-
-		part {
-			name: "e.text.label";
-			type: TEXT;
-			effect: TEXT_EFFECT_BOLD;
-			mouse_events: 0;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				align: 0.5 1.0;
-				fixed: 0 1;
-				rel1 { 
-					relative: 0.0 1.0; 
-					offset: 14 -20; 
-				}
-				rel2 { 
-					relative: 1.0 1.0; 
-					offset: -15 -20; 
-				}
-				TEXT_COLOR_BOLD;
-				TEXT_LARGE("winlist_title", 0.5 0.5, 0 1);
-			}
-		}
-
-		part {
 			name: "decoration";
-			type: IMAGE;
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
 				min: 15 11;
 				max: 15 11;
 				fixed: 1 1;
-				rel1 { 
-					to: "gradient"; 
-					relative: 0.5 1.0; 
-					offset: 0 0; 
+				align: 0.5 1.0;
+				rel1 {
+					to: "base";
+					relative: 0.0 1.0;
+					offset: 0 5;
 				}
-				rel2 { 
-					to: "gradient"; 
-					relative: 0.5 1.0; 
-					offset: 0 -14; 
+				rel2 {
+					to: "base";
+					offset: -1 -2;
 				}
 				image {
 					normal: "images/decoration_im1.png";
@@ -248,7 +216,7 @@
 			mouse_events: 0;
 			description {
 				state: "default" 0.0;
-				max: 9999 24;
+				/* max: 9999 32; */
 				color: 255 255 255 0;
 				image.normal: "images/exebuf_im0.png";
 				image.border: 4 4 5 5;
@@ -315,9 +283,8 @@
 					offset: 0 0; 
 				}
 				rel2 { 
-					to_x: "e.text.label"; 
 					relative: 0.0 1.0; 
-					offset: -1 -1; 
+					offset: -1 -2; 
 				}
 			}
 		}
@@ -329,7 +296,7 @@
 			description {
 				state: "default" 0.0;
 				min: 24 24;
-				max: 24 24;
+				/* max: 24 24; */
 				fixed: 1 1;
 				rel1 { 
 					relative: 1.0 0.0;
@@ -338,7 +305,7 @@
 				rel2 { 
 					to_y: "title_bar"; 
 					relative: 1.0 1.0; 
-					offset: -24 -1; 
+					offset: -24 -3; 
 				}
 				image {
 					normal: "images/pager_im7.png";

Modified: trunk/THEMES/detourious/colors.edc
===================================================================
--- trunk/THEMES/detourious/colors.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/colors.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -3,6 +3,21 @@
 
 #if (COLORS == 0)
 color_class {
+	name: "focus";
+	/* blue intense */
+	//color:   22 107 246 255;
+	/* blue light */
+	//color:   135 169 224 255;
+	/* green */
+	//color:   135 169 38 255;
+	/* red */
+	//color: 169 47 38 255;
+
+	color: 113 151 213 255;
+	
+	color3: 255 255 255 128;					
+}
+color_class {
 	name: "label_text";
 	color: 20 20 20 255;
 	color3: 255 255 255 128;					
@@ -47,6 +62,14 @@
 }
 #else
 color_class {
+	name: "focus";
+	/* color:   22 107 246 255; */
+	color:   135 169 224 255;
+	/* color:   58 246 22 255; */
+	/* color:   135 169 38 255; */
+	color3: 255 255 255 128;					
+}
+color_class {
 	name: "comp_focus-out_color";
 	color: 253 253 253 255;
 	color3: 0 0 0 0;

Modified: trunk/THEMES/detourious/images/backdrop_grad.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/button_im3.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/check_bt3.png
===================================================================
(Binary files differ)


Property changes on: trunk/THEMES/detourious/images/engage_im0.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/THEMES/detourious/images/illume/illume-apps.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/itask_im0.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/menu_im2.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/pager_im0.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/pager_im2.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images/pager_im3.png
===================================================================
(Binary files differ)


Property changes on: trunk/THEMES/detourious/images/popup_round.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/THEMES/detourious/images/radio_bt3.png
===================================================================
(Binary files differ)

Modified: trunk/THEMES/detourious/images.edc
===================================================================
--- trunk/THEMES/detourious/images.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/images.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -3,6 +3,8 @@
  * Contains list of all used images: images list first, icons second.
  */
 
+image: "images/popup_round.png" COMP;
+
 image: "images/comp/comp-sh1.png" COMP;
 image: "images/comp/bt_glow.png" COMP;
 
@@ -65,7 +67,7 @@
 
 //~ entry
 image: "images/entry_im0.png" COMP; /* base */
-image: "images/entry_im1.png" COMP; /* focus */
+/* image: "images/entry_im1.png" COMP; /\* focus *\/ */
 
 //~ deskpreview
 image: "images/deskpreview_im0.png" COMP; /* background */
@@ -94,6 +96,7 @@
 image: "images/itask_im4.png" COMP; /* label overlay */
 image: "images/itask_im5.png" COMP; /* label overlay */
 
+image: "images/engage_im0.png" COMP; /* bottom orientation */
 
 //~ gadman
 image: "images/gadman_im0.png" COMP; /* background */
@@ -195,7 +198,7 @@
 image: "images/pager_im5.png" COMP; /* icon shaded: used by winlist */
 image: "images/pager_im6.png" COMP; /* overlay_bg */
 image: "images/pager_im7.png" COMP; /* icon: unselected window */
-image: "images/pager_im8.png" COMP; /* focused */
+/* image: "images/pager_im8.png" COMP; /\* focused *\/ */
 
 //~ about_detour
 image: "images/logo_im0.png" COMP; /* wireframe design */
@@ -207,7 +210,7 @@
 //~ scrollframe
 image: "images/scrollframe_im0.png" COMP; /* bg */
 image: "images/scrollframe_im1.png" COMP; /* inset */
-image: "images/scrollframe_im2.png" COMP; /* focus */
+/* image: "images/scrollframe_im2.png" COMP; /\* focus *\/ */
 
 //~ transitions
 image: "images/transition_im0.png" COMP; /* transitional wipe */
@@ -464,6 +467,8 @@
  * Contains list of all used icons. 
  */
 
+image: "icons/everything.png" COMP;
+
 //~ fill and stretch options (screen)
 image: "icons/wallscreen_im0.png" COMP; /* gradient box */
 image: "icons/wallscreen_im1.png" COMP; /* stretch */
@@ -513,6 +518,7 @@
 image: "icons/button-down.png" COMP;
 image: "icons/button-up.png" COMP;
 
+
 image: "actions/empty.png" COMP;
 image: "actions/object-move.png" COMP;
 image: "actions/object-resize.png" COMP;

Modified: trunk/THEMES/detourious/main.edc
===================================================================
--- trunk/THEMES/detourious/main.edc	2011-09-01 12:36:19 UTC (rev 63055)
+++ trunk/THEMES/detourious/main.edc	2011-09-01 12:54:35 UTC (rev 63056)
@@ -18,6 +18,8 @@
 #define ANIMATED_CURSOR 1	/* Mouse pointer will pulsate when inactive */
 #define ALTERNATE_CURSOR 0	/* Alternate (black) mouse pointer */
 
+#define EVRY_TRANSPARENT 0
+
 #define COLOR_LIST_BG        253 253 253 255
 #define COLOR_LIST_BG_ODD    240 245 250 255
 #define COLOR_LIST_BG_ACTIVE 138 171 225 255