diff --git a/data/themes/engage.edc b/data/themes/engage.edc
index 12b5717..ba2f802 100644
--- a/data/themes/engage.edc
+++ b/data/themes/engage.edc
@@ -14,882 +14,882 @@ images
 }
 
 collections{
-group {
-	/* bg frame that keeps is not affected by 'Background
-	 * Transparency' setting */
-	name: "e/modules/engage/frame_bottom";
-	alias: "e/modules/engage/frame_top";
-	alias: "e/modules/engage/frame_left";
-	alias: "e/modules/engage/frame_right";
+	group {
+		/* bg frame that keeps is not affected by 'Background
+		 * Transparency' setting */
+		name: "e/modules/engage/frame_bottom";
+		alias: "e/modules/engage/frame_top";
+		alias: "e/modules/engage/frame_left";
+		alias: "e/modules/engage/frame_right";
 
-	data {
-		/* space between icons */
-		item: "icon_spacing"    "1";
+		data {
+			/* space between icons */
+			item: "icon_spacing"    "1";
 
-		/* space between boxes */
-		item: "separator_width" "6";
+			/* space between boxes */
+			item: "separator_width" "6";
 
-		/* space between screen edge and icons */
-		item: "edge_offset"    "6";
+			/* space between screen edge and icons */
+			item: "edge_offset"    "6";
 
-		/* clip separator to background group
-		 * change opacity with background transparency */
-		item: "clip_separator"  "1";
+			/* clip separator to background group
+			 * change opacity with background transparency */
+			item: "clip_separator"  "1";
 
-		/* extra space between icons and bg
-		   (required for autohide to hide the whole background) */
-		item: "bg_offset" "10";
-	}
+			/* extra space between icons and bg
+			   (required for autohide to hide the whole background) */
+			item: "bg_offset" "10";
+		}
 
-	parts {
-		part {
-			name: "frame";
-			type: RECT;
-			mouse_events: 0;
+		parts {
+			part {
+				name: "frame";
+				type: RECT;
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
-				visible: 0;
+				description {
+					state: "default" 0.0;
+					visible: 0;
+				}
 			}
 		}
 	}
-}
 
 #if REFLECTION
-group {
-	name: "e/modules/engage/frame_bottom";
+	group {
+		name: "e/modules/engage/frame_bottom";
 
-	data {
-		item: "icon_spacing"    "2";
-		item: "separator_width" "15";
-		item: "edge_offset"     "15";
-		item: "clip_separator"  "1";
-		item: "bg_offset"       "0";
+		data {
+			item: "icon_spacing"    "2";
+			item: "separator_width" "15";
+			item: "edge_offset"     "15";
+			item: "clip_separator"  "1";
+			item: "bg_offset"       "0";
 
-		/* clip reflection at bottom edge */
-		item: "reflection_offset" "1";
-	}
-	parts {
-		part {
-			name: "frame";
-			type: RECT;
-			mouse_events: 0;
+			/* clip reflection at bottom edge */
+			item: "reflection_offset" "1";
+		}
+		parts {
+			part {
+				name: "frame";
+				type: RECT;
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
-				visible: 0;
+				description {
+					state: "default" 0.0;
+					visible: 0;
+				}
 			}
 		}
+
 	}
 
-}
+	group {
+		name: "e/modules/engage/bg_bottom";
+		parts {
 
-group {
-	name: "e/modules/engage/bg_bottom";
-	parts {
+			part {
+				name: "bg";
+				mouse_events: 0;
 
-		part {
-			name: "bg";
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				rel1.relative: 0.0 1.0;
-				rel1.offset: -40 -40;
-				rel2.offset: 40 -1;
-				color: 255 255 255 255;
-				image {
-					normal: "itask_im6.png";
-					border: 36 36 7 2;
+				description {
+					state: "default" 0.0;
+					rel1.relative: 0.0 1.0;
+					rel1.offset: -40 -40;
+					rel2.offset: 40 -1;
+					color: 255 255 255 255;
+					image {
+						normal: "itask_im6.png";
+						border: 36 36 7 2;
+					}
 				}
 			}
 		}
 	}
-}
 #else
-group {
-	name: "e/modules/engage/bg_bottom";
-	parts {
-		part {
-			name: "bg";
-			mouse_events: 0;
+	group {
+		name: "e/modules/engage/bg_bottom";
+		parts {
+			part {
+				name: "bg";
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
+				description {
+					state: "default" 0.0;
 
-				rel1.offset: (-BG_OFFSET) -10;
-				rel2.offset: (-1 + BG_OFFSET) -1;
+					rel1.offset: (-BG_OFFSET) -10;
+					rel2.offset: (-1 + BG_OFFSET) -1;
+
+					image {
+						normal: "itask_im0.png";
+						border: 18 18 20 0;
+					}
 
-				image {
-					normal: "itask_im0.png";
-					border: 18 18 20 0;
 				}
-
 			}
 		}
 	}
-}
 #endif
 
-group {
-	name: "e/modules/engage/bg_top";
-	parts {
-		part {
-			name: "bg";
-			mouse_events: 0;
+	group {
+		name: "e/modules/engage/bg_top";
+		parts {
+			part {
+				name: "bg";
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
+				description {
+					state: "default" 0.0;
 
-				rel1.offset: (-BG_OFFSET) 0;
-				rel2.offset: (-1 + BG_OFFSET) (-1 + BG_OFFSET);
+					rel1.offset: (-BG_OFFSET) 0;
+					rel2.offset: (-1 + BG_OFFSET) (-1 + BG_OFFSET);
 
-				image {
-					normal: "itask_im1.png";
-					border: 18 18 0 28;
-				}
+					image {
+						normal: "itask_im1.png";
+						border: 18 18 0 28;
+					}
 
-			}
-		}
-	}
-}
-group {
-	name: "e/modules/engage/bg_left";
-	parts {
-		part {
-			name: "bg";
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-
-				rel1.offset: 0 (-BG_OFFSET);
-				rel2.offset: (-1 + BG_OFFSET) (-1 + BG_OFFSET);
-
-				image {
-					normal: "itask_im2.png";
-					border: 0 20 32 18;
 				}
 			}
 		}
 	}
-}
+	group {
+		name: "e/modules/engage/bg_left";
+		parts {
+			part {
+				name: "bg";
+				mouse_events: 0;
 
-group {
-	name: "e/modules/engage/bg_right";
-	parts {
-		part {
-			name: "bg";
-			mouse_events: 0;
+				description {
+					state: "default" 0.0;
 
-			description {
-				state: "default" 0.0;
+					rel1.offset: 0 (-BG_OFFSET);
+					rel2.offset: (-1 + BG_OFFSET) (-1 + BG_OFFSET);
 
-				rel1.offset: (-BG_OFFSET) (-BG_OFFSET);
-				rel2.offset: -1  (-1 + BG_OFFSET);
-
-				image {
-					normal: "itask_im3.png";
-					border: 20 0 32 18;
+					image {
+						normal: "itask_im2.png";
+						border: 0 20 32 18;
+					}
+				}
+			}
+		}
+	}
+
+	group {
+		name: "e/modules/engage/bg_right";
+		parts {
+			part {
+				name: "bg";
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+
+					rel1.offset: (-BG_OFFSET) (-BG_OFFSET);
+					rel2.offset: -1  (-1 + BG_OFFSET);
+
+					image {
+						normal: "itask_im3.png";
+						border: 20 0 32 18;
+					}
 				}
 			}
 		}
 	}
-}
 
 
-/* the vertical and horizontal separator image. it can be a rectangle
- * as it is in this example.
- */
+	/* the vertical and horizontal separator image. it can be a rectangle
+	 * as it is in this example.
+	 */
 
 #if REFLECTION
-group {
-	name: "e/modules/engage/separator_bottom";
-}
+	group {
+		name: "e/modules/engage/separator_bottom";
+	}
 #else
-group {
-	name: "e/modules/engage/separator_bottom";
+	group {
+		name: "e/modules/engage/separator_bottom";
 
-	parts {
-		part {
-			name: "separator";
-			type: RECT;
-			mouse_events: 0;
+		parts {
+			part {
+				name: "separator";
+				type: RECT;
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
-				color: 182 182 182 255;
-				max: 1 999;
-				align: 0.5 0.0;
+				description {
+					state: "default" 0.0;
+					color: 182 182 182 255;
+					max: 1 999;
+					align: 0.5 0.0;
 
-				rel1.offset: 0 -5;
-				rel2.offset: 0 2;
+					rel1.offset: 0 -5;
+					rel2.offset: 0 2;
+				}
 			}
 		}
 	}
-}
 #endif
 
-group {
-	name: "e/modules/engage/separator_top";
+	group {
+		name: "e/modules/engage/separator_top";
 
-	parts {
-		part {
-			name: "separator";
-			type: RECT;
-			mouse_events: 0;
+		parts {
+			part {
+				name: "separator";
+				type: RECT;
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
-				color: 182 182 182 255;
-				max: 1 999;
-				align: 0.5 0.0;
+				description {
+					state: "default" 0.0;
+					color: 182 182 182 255;
+					max: 1 999;
+					align: 0.5 0.0;
 
-				rel1.offset: 0 0;
-				rel2.offset: 0 2;
+					rel1.offset: 0 0;
+					rel2.offset: 0 2;
+				}
 			}
 		}
 	}
-}
 
-group {
-	name: "e/modules/engage/separator_left";
-	alias: "e/modules/engage/separator_right";
+	group {
+		name: "e/modules/engage/separator_left";
+		alias: "e/modules/engage/separator_right";
 
-	parts {
-		part {
-			name: "separator";
-			type: RECT;
-			mouse_events: 0;
+		parts {
+			part {
+				name: "separator";
+				type: RECT;
+				mouse_events: 0;
 
-			description {
-				state: "default" 0.0;
-				color: 182 182 182 255;
-				max: 999 1;
-				align: 0.0 0.5;
+				description {
+					state: "default" 0.0;
+					color: 182 182 182 255;
+					max: 999 1;
+					align: 0.0 0.5;
 
-				rel1.offset: -4 0;
-				rel2.offset: 3 0;
+					rel1.offset: -4 0;
+					rel2.offset: 3 0;
+				}
 			}
 		}
 	}
-}
 
-group {
-	name: "e/modules/engage/label_bottom";
+	group {
+		name: "e/modules/engage/label_bottom";
 
-	parts {
-		part {
-			name: "label";
-			type: IMAGE;
-			mouse_events: 0;
-			clip_to: "label.clip";
+		parts {
+			part {
+				name: "label";
+				type: IMAGE;
+				mouse_events: 0;
+				clip_to: "label.clip";
 
-			description {
-				state: "default" 0.0;
-				align: 0.5 0.5;
-				color: 0 0 0 148;
-				max: 999 26;
-
-				rel1 {
-					to: "e.text.label";
-					offset: -8 -2;
-				}
-
-				rel2 {
-					to: "e.text.label";
-					offset: 4 -1;
-				}
-
-				image {
-					normal: "itask_im4.png";
-					border: 5 5 5 5;
-				}
-			}
-		}
-
-		part {
-			name: "label_decoration";
-			type: IMAGE;
-			mouse_events: 0;
-			clip_to: "label.clip";
-
-			description {
-				state: "default" 0.0;
-				align: 0.5 1.0;
-				color: 255 0 0 148;
-				min: 11 6;
-				max: 11 6;
-				fixed: 1 1;
-
-				rel1 {
-					to: "label";
-					offset: 0 0;
-				}
-
-				rel2 {
-					to: "label";
-					offset: -1 4;
-				}
-
-				image {
-					normal: "itask_im5.png";
-				}
-			}
-		}
-
-		part {
-			name: "e.text.label";
-			type: TEXT;
-			effect: SHADOW;
-			mouse_events: 0;
-			clip_to: "label.clip";
-			scale: 1;
-
-			description {
-				state: "default" 0.0;
-				align: 0.5 0.5;
-				color: 255 255 255 255;
-				color3: 0 0 0 0;
-
-				rel1.offset: 0 2;
-				rel2.offset: -1 -1;
-
-				text {
-					text: "";
-					font: "Sans:style=Bold";
-					size: 11;
-					min: 1 1;
+				description {
+					state: "default" 0.0;
 					align: 0.5 0.5;
-					text_class: "module_large";
+					color: 0 0 0 148;
+					max: 999 26;
+
+					rel1 {
+						to: "e.text.label";
+						offset: -8 -2;
+					}
+
+					rel2 {
+						to: "e.text.label";
+						offset: 4 -1;
+					}
+
+					image {
+						normal: "itask_im4.png";
+						border: 5 5 5 5;
+					}
 				}
 			}
-		}
 
-		part {
-			name: "label.clip";
-			type: RECT;
-			mouse_events: 0;
+			part {
+				name: "label_decoration";
+				type: IMAGE;
+				mouse_events: 0;
+				clip_to: "label.clip";
 
-			description {
-				state: "default" 0.0;
-				align: 0.5 0.5;
-				color: 255 255 255 0;
-				min: 0 33;
+				description {
+					state: "default" 0.0;
+					align: 0.5 1.0;
+					color: 255 0 0 148;
+					min: 11 6;
+					max: 11 6;
+					fixed: 1 1;
 
-				rel1 {
-					to: "e.text.label";
-					offset: -12 -4;
-				}
+					rel1 {
+						to: "label";
+						offset: 0 0;
+					}
 
-				rel2 {
-					to: "e.text.label";
-					offset: 11 -1;
-				}
+					rel2 {
+						to: "label";
+						offset: -1 4;
+					}
 
-			}
-
-			description {
-				state: "visible" 0.0;
-				inherit: "default" 0.0;
-				color: 255 255 255 255;
-			}
-		}
-	}
-
-	programs {
-		program {
-			name: "go_label_show";
-			signal: "e,state,label,show";
-			source: "e";
-			action: STATE_SET "visible" 0.0;
-			transition: DECELERATE 0.5;
-			target: "label.clip";
-		}
-
-		program {
-			name: "go_label_hide";
-			signal: "e,state,label,hide";
-			source: "e";
-			action: STATE_SET "default" 0.0;
-			transition: ACCELERATE 0.25;
-			target: "label.clip";
-		}
-	}
-}
-
-group {
-	name: "e/modules/engage/label_top";
-	parts {
-		part {
-			name: "label";
-			type: IMAGE;
-			mouse_events: 0;
-			clip_to: "label.clip";
-
-			description {
-				state: "default" 0.0;
-				align: 0.5 0.5;
-				color: 0 0 0 148;
-				max: 999 26;
-
-				rel1 {
-					to: "e.text.label";
-					offset: -8 -2;
-				}
-
-				rel2 {
-					to: "e.text.label";
-					offset: 4 -1;
-				}
-
-				image {
-					normal: "itask_im4.png";
-					border: 5 5 5 5;
+					image {
+						normal: "itask_im5.png";
+					}
 				}
 			}
-		}
 
-		part {
-			name: "e.text.label";
-			type: TEXT;
-			effect: SHADOW;
-			mouse_events: 0;
-			clip_to: "label.clip";
-			scale: 1;
+			part {
+				name: "e.text.label";
+				type: TEXT;
+				effect: SHADOW;
+				mouse_events: 0;
+				clip_to: "label.clip";
+				scale: 1;
 
-			description {
-				state: "default" 0.0;
-				align: 0.5 0.5;
-				color: 255 255 255 255;
-				color3: 0 0 0 0;
-
-				rel1.offset: 0 2;
-				rel2.offset: -1 -1;
-
-				text {
-					text: "";
-					font: "Sans:style=Bold";
-					size: 11;
-					min: 1 1;
+				description {
+					state: "default" 0.0;
 					align: 0.5 0.5;
-					text_class: "module_large";
+					color: 255 255 255 255;
+					color3: 0 0 0 0;
+
+					rel1.offset: 0 2;
+					rel2.offset: -1 -1;
+
+					text {
+						text: "";
+						font: "Sans:style=Bold";
+						size: 11;
+						min: 1 1;
+						align: 0.5 0.5;
+						text_class: "module_large";
+					}
+				}
+			}
+
+			part {
+				name: "label.clip";
+				type: RECT;
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					align: 0.5 0.5;
+					color: 255 255 255 0;
+					min: 0 33;
+
+					rel1 {
+						to: "e.text.label";
+						offset: -12 -4;
+					}
+
+					rel2 {
+						to: "e.text.label";
+						offset: 11 -1;
+					}
+
+				}
+
+				description {
+					state: "visible" 0.0;
+					inherit: "default" 0.0;
+					color: 255 255 255 255;
 				}
 			}
 		}
 
-		part {
-			name: "label.clip";
-			type: RECT;
-			mouse_events: 0;
+		programs {
+			program {
+				name: "go_label_show";
+				signal: "e,state,label,show";
+				source: "e";
+				action: STATE_SET "visible" 0.0;
+				transition: DECELERATE 0.5;
+				target: "label.clip";
+			}
 
-			description {
-				state: "default" 0.0;
-				align: 0.5 0.5;
-				color: 255 255 255 0;
-				min: 0 33;
+			program {
+				name: "go_label_hide";
+				signal: "e,state,label,hide";
+				source: "e";
+				action: STATE_SET "default" 0.0;
+				transition: ACCELERATE 0.25;
+				target: "label.clip";
+			}
+		}
+	}
 
-				rel1 {
-					to: "e.text.label";
-					offset: -12 -4;
-				}
+	group {
+		name: "e/modules/engage/label_top";
+		parts {
+			part {
+				name: "label";
+				type: IMAGE;
+				mouse_events: 0;
+				clip_to: "label.clip";
 
-				rel2 {
-					to: "e.text.label";
-					offset: 11 -1;
+				description {
+					state: "default" 0.0;
+					align: 0.5 0.5;
+					color: 0 0 0 148;
+					max: 999 26;
+
+					rel1 {
+						to: "e.text.label";
+						offset: -8 -2;
+					}
+
+					rel2 {
+						to: "e.text.label";
+						offset: 4 -1;
+					}
+
+					image {
+						normal: "itask_im4.png";
+						border: 5 5 5 5;
+					}
 				}
 			}
 
-			description {
-				state: "visible" 0.0;
-				inherit: "default" 0.0;
-				color: 255 255 255 255;
+			part {
+				name: "e.text.label";
+				type: TEXT;
+				effect: SHADOW;
+				mouse_events: 0;
+				clip_to: "label.clip";
+				scale: 1;
+
+				description {
+					state: "default" 0.0;
+					align: 0.5 0.5;
+					color: 255 255 255 255;
+					color3: 0 0 0 0;
+
+					rel1.offset: 0 2;
+					rel2.offset: -1 -1;
+
+					text {
+						text: "";
+						font: "Sans:style=Bold";
+						size: 11;
+						min: 1 1;
+						align: 0.5 0.5;
+						text_class: "module_large";
+					}
+				}
+			}
+
+			part {
+				name: "label.clip";
+				type: RECT;
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					align: 0.5 0.5;
+					color: 255 255 255 0;
+					min: 0 33;
+
+					rel1 {
+						to: "e.text.label";
+						offset: -12 -4;
+					}
+
+					rel2 {
+						to: "e.text.label";
+						offset: 11 -1;
+					}
+				}
+
+				description {
+					state: "visible" 0.0;
+					inherit: "default" 0.0;
+					color: 255 255 255 255;
+				}
+			}
+		}
+
+		programs {
+			program {
+				name: "go_label_show";
+				signal: "e,state,label,show";
+				source: "e";
+				action: STATE_SET "visible" 0.0;
+				transition: DECELERATE 0.5;
+				target: "label.clip";
+			}
+
+			program {
+				name: "go_label_hide";
+				signal: "e,state,label,hide";
+				source: "e";
+				action: STATE_SET "default" 0.0;
+				transition: ACCELERATE 0.25;
+				target: "label.clip";
 			}
 		}
 	}
 
-	programs {
-		program {
-			name: "go_label_show";
-			signal: "e,state,label,show";
-			source: "e";
-			action: STATE_SET "visible" 0.0;
-			transition: DECELERATE 0.5;
-			target: "label.clip";
+	/* TODO needs to be supported in code */
+	/* group {
+	 * 	name: "e/modules/engage/label_left";
+	 * 	alias: "e/modules/engage/label_right";
+	 * } */
+
+	group {
+		name: "e/modules/engage/icon";
+		alias: "e/modules/engage/icon_top";
+		alias: "e/modules/engage/icon_left";
+		alias: "e/modules/engage/icon_right";
+		alias: "e/modules/engage/icon_bottom";
+
+		min: 32 32;
+		max: 128 128;
+
+		parts {
+			part {
+				name: "clip";
+				type: RECT;
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 128;
+				}
+				description {
+					state: "visible" 0.0;
+					color: 255 255 255 255;
+				}
+			}
+			part {
+				name: "focus_clip";
+				type: RECT;
+				clip_to: "clip";
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 255;
+				}
+
+				description {
+					state: "focused" 0.0;
+					color: 200 200 255 255;
+				}
+			}
+			part {
+				name: "iconic_clip";
+				type: RECT;
+				clip_to: "focus_clip";
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 255;
+				}
+
+				description {
+					state: "iconic" 0.0;
+					color: 200 200 200 255;
+				}
+			}
+
+			part {
+				name: "urgent_clip";
+				type: RECT;
+				clip_to: "iconic_clip";
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 255;
+				}
+				description {
+					state: "urgent" 0.0;
+					color: 255 180 180 255;
+				}
+			}
+
+			part {
+				name: "input_clip";
+				type: RECT;
+				clip_to: "urgent_clip";
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 255;
+				}
+				description {
+					state: "mouse_down" 0.0;
+					color: 200 200 200 255;
+				}
+			}
+
+			part {
+				name: "e.swallow.content";
+				type: SWALLOW;
+				clip_to: "input_clip";
+				description {
+					state: "default" 0.0;
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
+				}
+			}
 		}
 
-		program {
-			name: "go_label_hide";
-			signal: "e,state,label,hide";
-			source: "e";
-			action: STATE_SET "default" 0.0;
-			transition: ACCELERATE 0.25;
-			target: "label.clip";
+		programs {
+			program {
+				name: "go_show";
+				signal: "e,state,item,show";
+				source: "e";
+				action: STATE_SET "visible" 0.0;
+				transition: SINUSOIDAL 0.2;
+				target: "clip";
+			}
+
+			program {
+				name: "go_hide";
+				signal: "e,state,item,hide";
+				source: "e";
+				action: STATE_SET "default" 0.0;
+				transition: SINUSOIDAL 0.3;
+				target: "clip";
+			}
+
+			/* when minimizing an application */
+			program {
+				name: "go_iconic1";
+				signal: "e,state,taskbar,iconic,on";
+				source: "e";
+				action: STATE_SET "iconic" 0.0;
+				transition: LINEAR 0.3;
+				target: "iconic_clip";
+			}
+			program {
+				name: "go_iconic0";
+				signal: "e,state,taskbar,iconic,off";
+				source: "e";
+				action: STATE_SET "default" 0.0;
+				transition: LINEAR 0.3;
+				target: "iconic_clip";
+			}
+
+			/* when an application got focus */
+			program {
+				name: "go_focused1";
+				signal: "e,state,taskbar,focus,on";
+				source: "e";
+				action: STATE_SET "focused" 0.0;
+				transition: SINUSOIDAL 0.3;
+				target: "focus_clip";
+			}
+
+			program {
+				name: "go_focused0";
+				signal: "e,state,taskbar,focus,off";
+				source: "e";
+				action: STATE_SET "default" 0.0;
+				transition: SINUSOIDAL 0.3;
+				target: "focus_clip";
+			}
+
+			/* application is sending urgent signal  */
+			program {
+				name: "go_urgent";
+				signal: "e,state,taskbar,urgent,on";
+				source: "e";
+				action: ACTION_STOP;
+				target: "go_urgent1";
+				target: "go_urgent0";
+				after: "go_urgent1";
+			}
+
+			program {
+				name: "go_urgent1";
+				action: STATE_SET "urgent" 0.0;
+				transition: LINEAR 1.0;
+				target: "urgent_clip";
+				after: "go_urgent2";
+			}
+
+			program {
+				name: "go_urgent2";
+				action: STATE_SET "default" 0.0;
+				transition: LINEAR 1.0;
+				target: "urgent_clip";
+				after: "go_urgent1";
+			}
+
+			program {
+				name: "go_urgent0";
+				signal: "e,state,taskbar,urgent,off";
+				source: "e";
+				action: ACTION_STOP;
+				target: "go_urgent1";
+				target: "go_urgent0";
+				after: "go_urgent_end";
+			}
+
+			program {
+				name: "go_urgent_end";
+				action: STATE_SET "default" 0.0;
+				transition: LINEAR 0.2;
+				target: "urgent_clip";
+			}
+
+			program {
+				name: "go_mouse_down";
+				signal: "e,state,mouse,down";
+				source: "e";
+				action: STATE_SET "mouse_down" 0.0;
+				transition: LINEAR 0.2;
+				target: "input_clip";
+				after: "go_mouse_down2";
+			}
+			program {
+				name: "go_mouse_down2";
+				action: STATE_SET "default" 0.0;
+				transition: LINEAR 0.3;
+				target: "input_clip";
+			}
+			/* program {
+			 * 	name: "go_mouse_up";
+			 * 	signal: "e,state,mouse,up";
+			 * 	source: "e";
+			 * 	action: STATE_SET "mouse_up" 0.0;
+			 * 	transition: LINEAR 0.2;
+			 * 	target: "input_clip";
+			 * } */
+		}
+	}
+
+	group {
+		name: "e/modules/engage/icon_over_top";
+		alias: "e/modules/engage/icon_over_left";
+		alias: "e/modules/engage/icon_over_right";
+		alias: "e/modules/engage/icon_over_bottom";
+
+		parts {
+			part {
+				name: "icon_clip";
+				type: RECT;
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 255;
+					visible: 0;
+					rel1.offset: -256 -256;
+					rel2.offset: 256 256;
+				}
+			}
+			part {
+				name: "background";
+				type: RECT;
+				mouse_events: 0;
+
+				description {
+					state: "default" 0.0;
+					color: 255 255 255 0;
+					visible: 0;
+				}
+				description {
+					state: "visible" 0.0;
+					color: 255 255 255 255;
+				}
+				description {
+					state: "hidden" 0.0;
+					visible: 1;
+					rel1.relative: -0.5  -0.5;
+					rel2.relative: 1.5  1.5;
+
+					color: 255 255 255 0;
+				}
+				description {
+					state: "huge" 0.0;
+					color: 255 255 255 0;
+					rel1.relative: -1.5 -1.5;
+					rel2.relative: 2.5  2.5;
+				}
+			}
+
+			part {
+				name: "e.swallow.content";
+				type: SWALLOW;
+				clip_to: "background";
+
+				description {
+					state: "default" 0.0;
+					rel1.to: "background";
+					rel2.to: "background";
+				}
+			}
+		}
+
+		programs {
+
+			program {
+				name: "go_active";
+				signal: "e,state,animate,in";
+				source: "e";
+				action: STATE_SET "visible" 0.0;
+				target: "background";
+				after: "go_active2";
+			}
+			program {
+				name: "go_active2";
+				action: STATE_SET "hidden" 0.0;
+				transition: LINEAR 0.5;
+				target: "background";
+				after: "go_active";
+			}
+			program {
+				name: "go_passive";
+				signal: "e,state,animate,out";
+				source: "e";
+				action: ACTION_STOP;
+				target: "go_active";
+				target: "go_active2";
+				after: "go_passive2";
+			}
+			program {
+				name: "go_passive2";
+				action: STATE_SET "default" 0.0;
+				target: "background";
+			}
+
+			program {
+				name: "go_big";
+				action: STATE_SET "visible" 0.0;
+				target: "background";
+				after: "go_big2";
+			}
+
+			program {
+				name: "go_big2";
+				action: STATE_SET "huge" 0.0;
+				transition: DECELERATE 0.4;
+				target: "background";
+				after: "go_big3";
+			}
+
+			program {
+				name: "go_big3";
+				action: STATE_SET "default" 0.0;
+				target: "background";
+			}
+
+			program {
+				name: "exec_start";
+				signal: "e,action,start";
+				source: "e";
+				action: ACTION_STOP;
+				target: "go_big";
+				target: "go_big2";
+				target: "go_big3";
+				after: "go_big";
+			}
 		}
 	}
 }
 
-/* TODO needs to be supported in code */
-/* group {
- * 	name: "e/modules/engage/label_left";
- * 	alias: "e/modules/engage/label_right";
- * } */
-
-group {
-	name: "e/modules/engage/icon";
-	alias: "e/modules/engage/icon_top";
-	alias: "e/modules/engage/icon_left";
-	alias: "e/modules/engage/icon_right";
-	alias: "e/modules/engage/icon_bottom";
-
-	min: 32 32;
-	max: 128 128;
-
-	parts {
-		part {
-			name: "clip";
-			type: RECT;
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 128;
-			}
-			description {
-				state: "visible" 0.0;
-				color: 255 255 255 255;
-			}
-		}
-		part {
-			name: "focus_clip";
-			type: RECT;
-			clip_to: "clip";
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 255;
-			}
-
-			description {
-				state: "focused" 0.0;
-				color: 200 200 255 255;
-			}
-		}
-		part {
-			name: "iconic_clip";
-			type: RECT;
-			clip_to: "focus_clip";
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 255;
-			}
-
-			description {
-				state: "iconic" 0.0;
-				color: 200 200 200 255;
-			}
-		}
-
-		part {
-			name: "urgent_clip";
-			type: RECT;
-			clip_to: "iconic_clip";
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 255;
-			}
-			description {
-				state: "urgent" 0.0;
-				color: 255 180 180 255;
-			}
-		}
-
-		part {
-			name: "input_clip";
-			type: RECT;
-			clip_to: "urgent_clip";
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 255;
-			}
-			description {
-				state: "mouse_down" 0.0;
-				color: 200 200 200 255;
-			}
-		}
-
-		part {
-			name: "e.swallow.content";
-			type: SWALLOW;
-			clip_to: "input_clip";
-			description {
-				state: "default" 0.0;
-				aspect: 1.0 1.0;
-				aspect_preference: BOTH;
-			}
-		}
-	}
-
-	programs {
-		program {
-			name: "go_show";
-			signal: "e,state,item,show";
-			source: "e";
-			action: STATE_SET "visible" 0.0;
-			transition: SINUSOIDAL 0.2;
-			target: "clip";
-		}
-
-		program {
-			name: "go_hide";
-			signal: "e,state,item,hide";
-			source: "e";
-			action: STATE_SET "default" 0.0;
-			transition: SINUSOIDAL 0.3;
-			target: "clip";
-		}
-
-		/* when minimizing an application */
-		program {
-			name: "go_iconic1";
-			signal: "e,state,taskbar,iconic,on";
-			source: "e";
-			action: STATE_SET "iconic" 0.0;
-			transition: LINEAR 0.3;
-			target: "iconic_clip";
-		}
-		program {
-			name: "go_iconic0";
-			signal: "e,state,taskbar,iconic,off";
-			source: "e";
-			action: STATE_SET "default" 0.0;
-			transition: LINEAR 0.3;
-			target: "iconic_clip";
-		}
-
-		/* when an application got focus */
-		program {
-			name: "go_focused1";
-			signal: "e,state,taskbar,focus,on";
-			source: "e";
-			action: STATE_SET "focused" 0.0;
-			transition: SINUSOIDAL 0.3;
-			target: "focus_clip";
-		}
-
-		program {
-			name: "go_focused0";
-			signal: "e,state,taskbar,focus,off";
-			source: "e";
-			action: STATE_SET "default" 0.0;
-			transition: SINUSOIDAL 0.3;
-			target: "focus_clip";
-		}
-
-		/* application is sending urgent signal  */
-		program {
-			name: "go_urgent";
-			signal: "e,state,taskbar,urgent,on";
-			source: "e";
-			action: ACTION_STOP;
-			target: "go_urgent1";
-			target: "go_urgent0";
-			after: "go_urgent1";
-		}
-
-		program {
-			name: "go_urgent1";
-			action: STATE_SET "urgent" 0.0;
-			transition: LINEAR 1.0;
-			target: "urgent_clip";
-			after: "go_urgent2";
-		}
-
-		program {
-			name: "go_urgent2";
-			action: STATE_SET "default" 0.0;
-			transition: LINEAR 1.0;
-			target: "urgent_clip";
-			after: "go_urgent1";
-		}
-
-		program {
-			name: "go_urgent0";
-			signal: "e,state,taskbar,urgent,off";
-			source: "e";
-			action: ACTION_STOP;
-			target: "go_urgent1";
-			target: "go_urgent0";
-			after: "go_urgent_end";
-		}
-
-		program {
-			name: "go_urgent_end";
-			action: STATE_SET "default" 0.0;
-			transition: LINEAR 0.2;
-			target: "urgent_clip";
-		}
-
-		program {
-			name: "go_mouse_down";
-			signal: "e,state,mouse,down";
-			source: "e";
-			action: STATE_SET "mouse_down" 0.0;
-			transition: LINEAR 0.2;
-			target: "input_clip";
-			after: "go_mouse_down2";
-		}
-		program {
-			name: "go_mouse_down2";
-			action: STATE_SET "default" 0.0;
-			transition: LINEAR 0.3;
-			target: "input_clip";
-		}
-		/* program {
-		 * 	name: "go_mouse_up";
-		 * 	signal: "e,state,mouse,up";
-		 * 	source: "e";
-		 * 	action: STATE_SET "mouse_up" 0.0;
-		 * 	transition: LINEAR 0.2;
-		 * 	target: "input_clip";
-		 * } */
-	}
-}
-
-group {
-	name: "e/modules/engage/icon_over_top";
-	alias: "e/modules/engage/icon_over_left";
-	alias: "e/modules/engage/icon_over_right";
-	alias: "e/modules/engage/icon_over_bottom";
-
-	parts {
-		part {
-			name: "icon_clip";
-			type: RECT;
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 255;
-				visible: 0;
-				rel1.offset: -256 -256;
-				rel2.offset: 256 256;
-			}
-		}
-		part {
-			name: "background";
-			type: RECT;
-			mouse_events: 0;
-
-			description {
-				state: "default" 0.0;
-				color: 255 255 255 0;
-				visible: 0;
-			}
-			description {
-				state: "visible" 0.0;
-				color: 255 255 255 255;
-			}
-			description {
-				state: "hidden" 0.0;
-				visible: 1;
-				rel1.relative: -0.5  -0.5;
-				rel2.relative: 1.5  1.5;
-
-				color: 255 255 255 0;
-            }
-			description {
-				state: "huge" 0.0;
-				color: 255 255 255 0;
-				rel1.relative: -1.5 -1.5;
-				rel2.relative: 2.5  2.5;
-			}
-		}
-
-		part {
-			name: "e.swallow.content";
-			type: SWALLOW;
-			clip_to: "background";
-
-			description {
-				state: "default" 0.0;
-				rel1.to: "background";
-				rel2.to: "background";
-			}
-		}
-	}
-
-	programs {
-#if HOVER_EFFECT == 1
-		program {
-            name: "go_active";
-            signal: "e,state,mouse,in";
-            source: "e";
-            action: STATE_SET "visible" 0.0;
-            target: "background";
-            after: "go_active2";
-		}
-		program {
-            name: "go_active2";
-            action: STATE_SET "hidden" 0.0;
-            transition: LINEAR 0.5;
-            target: "background";
-            after: "go_active";
-		}
-		program {
-            name: "go_passive";
-            signal: "e,state,mouse,out";
-            source: "e";
-            action: ACTION_STOP;
-            target: "go_active";
-            target: "go_active2";
-            after: "go_passive2";
-		}
-		program {
-            name: "go_passive2";
-            action: STATE_SET "default" 0.0;
-            target: "background";
-		}
-#endif
-		program {
-			name: "go_big";
-			action: STATE_SET "visible" 0.0;
-			target: "background";
-			after: "go_big2";
-		}
-
-		program {
-			name: "go_big2";
-			action: STATE_SET "huge" 0.0;
-			transition: DECELERATE 0.4;
-			target: "background";
-			after: "go_big3";
-		}
-
-		program {
-			name: "go_big3";
-			action: STATE_SET "default" 0.0;
-			target: "background";
-		}
-
-		program {
-			name: "exec_start";
-			signal: "e,action,start";
-			source: "e";
-			action: ACTION_STOP;
-			target: "go_big";
-			target: "go_big2";
-			target: "go_big3";
-			after: "go_big";
-		}
-	}
-}
-}
-
diff --git a/src/ng_config.c b/src/ng_config.c
index bc8e18a..cc858c7 100644
--- a/src/ng_config.c
+++ b/src/ng_config.c
@@ -5,7 +5,7 @@ struct _E_Config_Dialog_Data
    int              show_label;
    int              show_background;
    int              orient;
-   int           size;
+   int              size;
    double           zoomfactor;
    int              autohide;
    int              autohide_show_urgent;
@@ -198,6 +198,9 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_check_add(evas, D_("Show Background Box"), &(cfdata->show_background));
    e_widget_framelist_object_append(of, ob);
 
+   ob = e_widget_check_add(evas, D_("Show Mouse-Over Animation"), &(cfdata->mouse_over_anim));
+   e_widget_framelist_object_append(of, ob);
+
    e_widget_list_object_append(ol, of, 1, 0, 0.0);
    
    of = e_widget_framelist_add(evas, D_("Orientation"), 0); 
diff --git a/src/ng_item.c b/src/ng_item.c
index 52acfde..57b6de3 100644
--- a/src/ng_item.c
+++ b/src/ng_item.c
@@ -174,6 +174,9 @@ ngi_item_mouse_in(Ngi_Item *it)
 
    ngi_item_signal_emit(it,"e,state,mouse,in");
 
+   if (it->box->ng->cfg->mouse_over_anim)
+     ngi_item_signal_emit(it,"e,state,animate,in");
+
    if (it->cb_mouse_in)
      it->cb_mouse_in(it);
 }
@@ -185,6 +188,9 @@ ngi_item_mouse_out(Ngi_Item *it)
 
    ngi_item_signal_emit(it,"e,state,mouse,out");
 
+   if (it->box->ng->cfg->mouse_over_anim)
+     ngi_item_signal_emit(it,"e,state,animate,out");
+
    if (it->cb_mouse_out)
      it->cb_mouse_out(it);
 }