diff --git a/data/themes/default/ephoto.edc b/data/themes/default/ephoto.edc
index f79e2b8..96294e7 100644
--- a/data/themes/default/ephoto.edc
+++ b/data/themes/default/ephoto.edc
@@ -7,123 +7,7 @@ collections
 {
 	images 
 	{
-		image: "background.png" COMP;
 		image: "thumb_shadow.png" COMP;
-		image: "move_right.png" COMP;
-		image: "move_left.png" COMP;
-	}
-	group 
-	{
-		name: "/ephoto/window/background";
-		parts 
-		{
-			part
-			{
-				name: "background";
-				type: IMAGE;
-				mouse_events: 0;
-				description 
-				{
-					state: "default" 0.0;
-					rel1.relative: 0.0 0.0;
-					rel1.offset: 0 0;
-					rel2.relative: 1.0 1.0;
-					rel2.offset: -1 -1;
-					image.normal: "background.png";
-					fill
-					{
-						smooth: 0;
-					}
-				}
-			}
-			part
-                        {
-                                name: "ephoto.move.left";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        visible: 0;
-					min: 27 42;
-					max: 27 42;
-					rel1.relative: 0.0 0.5;
-					rel1.offset: 30 0;
-					rel2.relative: 0.0 0.5;
-					rel2.offset: -1 -1;
-                                        image.normal: "move_left.png";
-                                }
-				description
-				{
-					state: "visible" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-                        }
-			part
-                        {
-                                name: "ephoto.move.right";
-                                type: IMAGE;
-                                mouse_events: 1;
-                                description
-                                {
-                                        state: "default" 0.0;
-                                        visible: 0;
-					min: 27 42;
-					max: 27 42;
-					rel1.relative: 1.0 0.5;
-					rel1.offset: 0 0;
-					rel2.relative: 1.0 0.5;
-					rel2.offset: -30 -1;
-                                        image.normal: "move_right.png";
-                                }
-				description
-				{
-					state: "visible" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-                        }
-		}
-		programs
-		{
-			program
-			{
-				name: "show_left";
-				signal: "ephoto.show.left";
-				source: "ephoto";
-				action: STATE_SET "visible" 0.0;
-				transition: LINEAR 0.3;
-				target: "ephoto.move.left";
-			}
-			program
-			{
-				name: "hide_left";
-				signal: "ephoto.hide.left";
-				source: "ephoto";
-				action: STATE_SET "default" 0.0;
-				transition: LINEAR 0.3;
-				target: "ephoto.move.left";
-			}
-			program
-			{
-				name: "show_right";
-				signal: "ephoto.show.right";
-				source: "ephoto";
-				action: STATE_SET "visible" 0.0;
-				transition: LINEAR 0.3;
-				target: "ephoto.move.right";
-			}
-			program
-			{
-				name: "hide_right";
-				signal: "ephoto.hide.right";
-				source: "ephoto";
-				action: STATE_SET "default" 0.0;
-				transition: LINEAR 0.3;
-				target: "ephoto.move.right";
-			}
-		}
 	}
 	group
 	{
@@ -225,265 +109,301 @@ collections
 			}
 		}
 	}
-	
-      group { name: "elm/gengrid/item/default/ephoto";
-      data.item: "labels" "elm.text";
-      data.item: "icons" "elm.swallow.icon elm.swallow.end";
-      images {
-         image: "bt_sm_base1.png" COMP;
-         image: "bt_sm_shine.png" COMP;
-         image: "bt_sm_hilight.png" COMP;
-      }
-      parts {
-         part {
-            name: "event";
-            type: RECT;
-            repeat_events: 1;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part {
-            name: "base_sh";
-            mouse_events: 0;
-	    type: RECT;
-            description {
-               state: "default" 0.0;
-               align: 0.0 0.0;
-               min: 0 10;
-               fixed: 1 1;
-               rel1 {
-                  to: "base";
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "base";
-                  relative: 1.0 1.0;
-                  offset: -1 0;
-               }
-               color: 255 255 255 0;
-            }
-         }
-         part {
-            name: "base";
-            mouse_events: 0;
-	    type: RECT;
-            description {
-               state: "default" 0.0;
-               color: 255 255 255 0;
-            }
-         }
-         part { name: "bg";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -5 -5;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 4 4;
-               }
-               image {
-                  normal: "bt_sm_base1.png";
-                  border: 6 6 6 6;
-               }
-               image.middle: SOLID;
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: -2 -2;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 1 1;
-               }
-            }
-         }
-         part { name: "elm.swallow.pad";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 0.0  1.0;
-                  offset:   0    -10;
-               }
-               rel2 {
-                  to_y: "elm.text";
-                  relative: 0.0  0.0;
-                  offset:   -1   -1;
-               }
-            }
-         }
-         part { name: "elm.swallow.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.5 0.5;
-               rel1 {
-                  relative: 0.0  0.0;
-                  offset:   -1    4;
-               }
-               rel2 {
-                  to_y: "elm.swallow.pad";
-                  relative: 1.0  0.0;
-                  offset:   -1   -5;
-               }
-            }
-         }
-         part { name: "elm.swallow.end";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 1.0 0.0;
-               aspect: 1.0 1.0;
-               aspect_preference: HORIZONTAL;
-               rel1 {
-                  relative: 1.0 0.0;
-                  offset: -5 -5;
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 5 5;
-               }
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            effect: SOFT_SHADOW;
-            mouse_events: 0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  relative: 0.0  1.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset: -5 -5;
-               }
-               color: 0 0 0 255;
-               color3: 0 0 0 0;
-               text {
-                  font: "Sans";
-                  size: 10;
-                  min: 0 1;
-                  align: 0.5 0.0;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: 224 224 224 255;
-               color3: 0 0 0 64;
-            }
-         }
-         part { name: "fg1";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.relative: 1.0 0.5;
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_hilight.png";
-                  border: 6 6 6 0;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-         }
-         part { name: "fg2";
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-               image {
-                  normal: "bt_sm_shine.png";
-                  border: 6 6 6 0;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-         }
-	 part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 64;
-            }
-         }
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program {
-            name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action:  STATE_SET "selected" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-         }
-         program {
-            name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "bg";
-            target:  "fg1";
-            target:  "fg2";
-            target:  "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program {
-            name:    "go_disabled";
-            signal:  "elm,state,disabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "disclip";
-         }
-         program {
-            name:    "go_enabled";
-            signal:  "elm,state,enabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "disclip";
-         }
-      }
-   }
+	group 
+	{
+		name: "elm/gengrid/item/default/ephoto";
+		data.item: "labels" "elm.text";
+		data.item: "icons" "elm.swallow.icon elm.swallow.end";
+		images 
+		{
+			image: "bt_sm_base1.png" COMP;
+			image: "bt_sm_shine.png" COMP;
+			image: "bt_sm_hilight.png" COMP;
+		}
+		parts 
+		{
+			part 
+			{
+				name: "event";
+				type: RECT;
+				repeat_events: 1;
+				description 
+				{
+					state: "default" 0.0;
+					color: 0 0 0 0;
+				}
+			}
+			part 
+			{ 
+				name: "bg";
+				clip_to: "disclip";
+				mouse_events: 0;
+				description 
+				{ 
+					state: "default" 0.0;
+					visible: 0;
+					color: 255 255 255 0;
+					rel1 
+					{
+						relative: 0.0 0.0;
+						offset: -5 -5;
+					}
+					rel2 
+					{
+						relative: 1.0 1.0;
+						offset: 4 4;
+					}
+					image 
+					{
+						normal: "bt_sm_base1.png";
+						border: 6 6 6 6;
+					}
+					image.middle: SOLID;
+				}
+				description 
+				{ 
+					state: "selected" 0.0;
+					inherit: "default" 0.0;
+					visible: 1;
+					color: 255 255 255 255;
+					rel1 
+					{
+						relative: 0.0 0.0;
+						offset: -2 -2;
+					}
+					rel2 
+					{
+						relative: 1.0 1.0;
+						offset: 1 1;
+					}
+				}
+			}
+			part 
+			{ 
+				name: "elm.swallow.pad";
+				type: SWALLOW;
+				description 
+				{ 
+					state: "default" 0.0;
+					fixed: 1 0;
+					align: 0.0 0.5;
+					rel1 
+					{
+						relative: 0.0  1.0;
+						offset:   0    -10;
+					}
+					rel2 
+					{
+						to_y: "elm.text";
+						relative: 0.0  0.0;
+						offset:   -1   -1;
+					}
+				}
+			}
+			part 
+			{ 
+				name: "elm.swallow.icon";
+				clip_to: "disclip";
+				type: SWALLOW;
+				description 
+				{ 
+					state: "default" 0.0;
+					fixed: 1 0;
+					align: 0.5 0.5;
+					rel1 
+					{
+						relative: 0.0  0.0;
+						offset:   -1    4;
+					}
+					rel2 
+					{
+						to_y: "elm.swallow.pad";
+						relative: 1.0  0.0;
+						offset:   -1   -5;
+					}
+				}
+			}
+			part 
+			{ 
+				name: "elm.swallow.end";
+				clip_to: "disclip";
+				type: SWALLOW;
+				description 
+				{ 
+					state: "default" 0.0;
+					fixed: 1 0;
+					align: 1.0 0.0;
+					aspect: 1.0 1.0;
+					aspect_preference: HORIZONTAL;
+					rel1 
+					{
+						relative: 1.0 0.0;
+						offset: -5 -5;
+					}
+					rel2 
+					{
+						relative: 1.0 1.0;
+						offset: 5 5;
+					}
+				}
+			}
+			part 
+			{ 
+				name: "elm.text";
+				clip_to: "disclip";
+				type: TEXT;
+				effect: SOFT_SHADOW;
+				mouse_events: 0;
+				scale: 1;
+				description 
+				{
+					state: "default" 0.0;
+					rel1 
+					{
+						relative: 0.0  1.0;
+						offset: 0 0;
+					}
+					rel2 
+					{
+						relative: 1.0  1.0;
+						offset: -5 -5;
+					}
+					color: 0 0 0 255;
+					color3: 0 0 0 0;
+					text 
+					{
+						font: "Sans";
+						size: 10;
+						min: 0 1;
+						align: 0.5 0.0;
+					}
+				}
+				description 
+				{
+					state: "selected" 0.0;
+					inherit: "default" 0.0;
+					color: 224 224 224 255;
+					color3: 0 0 0 64;
+				}
+			}
+			part 
+			{ 
+				name: "fg1";
+				clip_to: "disclip";
+				mouse_events: 0;
+				description 
+				{ 
+					state: "default" 0.0;
+					visible: 0;
+					color: 255 255 255 0;
+					rel1.to: "bg";
+					rel2.relative: 1.0 0.5;
+					rel2.to: "bg";
+					image 
+					{
+						normal: "bt_sm_hilight.png";
+						border: 6 6 6 0;
+					}
+				}
+				description 
+				{ 
+					state: "selected" 0.0;
+					inherit: "default" 0.0;
+					visible: 1;
+					color: 255 255 255 255;
+				}
+			}
+			part 
+			{
+				name: "fg2";
+				clip_to: "disclip";
+				mouse_events: 0;
+				description 
+				{ 
+					state: "default" 0.0;
+					visible: 0;
+					color: 255 255 255 0;
+					rel1.to: "bg";
+					rel2.to: "bg";
+					image 
+					{
+						normal: "bt_sm_shine.png";
+						border: 6 6 6 0;
+					}
+				}
+				description 
+				{ 
+					state: "selected" 0.0;
+					inherit: "default" 0.0;
+					visible: 1;
+					color: 255 255 255 255;
+				}
+			}
+			part 
+			{ 
+				name: "disclip";
+				type: RECT;
+				description 
+				{ 
+					state: "default" 0.0;
+					rel1.to: "bg";
+					rel2.to: "bg";
+				}
+				description 
+				{ 
+					state: "disabled" 0.0;
+					inherit: "default" 0.0;
+					color: 255 255 255 64;
+				}
+			}
+		}
+		programs 
+		{
+			// signal: elm,state,%s,active
+			//   a "check" item named %s went active
+			// signal: elm,state,%s,passive
+			//   a "check" item named %s went passive
+			// default is passive
+			program 
+			{
+				name:    "go_active";
+				signal:  "elm,state,selected";
+				source:  "elm";
+				action:  STATE_SET "selected" 0.0;
+				target:  "bg";
+				target:  "fg1";
+				target:  "fg2";
+				target:  "elm.text";
+			}
+			program 
+			{
+				name:    "go_passive";
+				signal:  "elm,state,unselected";
+				source:  "elm";
+				action:  STATE_SET "default" 0.0;
+				target:  "bg";
+				target:  "fg1";
+				target:  "fg2";
+				target:  "elm.text";
+				transition: LINEAR 0.1;
+			}
+			program 
+			{
+				name:    "go_disabled";
+				signal:  "elm,state,disabled";
+				source:  "elm";
+				action:  STATE_SET "disabled" 0.0;
+				target:  "disclip";
+			}
+			program 
+			{
+				name:    "go_enabled";
+				signal:  "elm,state,enabled";
+				source:  "elm";
+				action:  STATE_SET "default" 0.0;
+				target:  "disclip";
+			}
+		}
+	}
 }
 
diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index 3839cfb..c4f37c6 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -1,10 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = \
-background.png \
 thumb_shadow.png \
-move_left.png \
-move_right.png \
 bt_sm_base1.png \
 bt_sm_shine.png \
 bt_sm_hilight.png 
diff --git a/data/themes/default/images/arrow_down.png b/data/themes/default/images/arrow_down.png
deleted file mode 100644
index 86e5d07..0000000
Binary files a/data/themes/default/images/arrow_down.png and /dev/null differ
diff --git a/data/themes/default/images/arrow_left.png b/data/themes/default/images/arrow_left.png
deleted file mode 100644
index e942563..0000000
Binary files a/data/themes/default/images/arrow_left.png and /dev/null differ
diff --git a/data/themes/default/images/arrow_right.png b/data/themes/default/images/arrow_right.png
deleted file mode 100644
index 3b9f40a..0000000
Binary files a/data/themes/default/images/arrow_right.png and /dev/null differ
diff --git a/data/themes/default/images/arrow_up.png b/data/themes/default/images/arrow_up.png
deleted file mode 100644
index 818ef0d..0000000
Binary files a/data/themes/default/images/arrow_up.png and /dev/null differ
diff --git a/data/themes/default/images/background.png b/data/themes/default/images/background.png
deleted file mode 100644
index dce28d3..0000000
Binary files a/data/themes/default/images/background.png and /dev/null differ
diff --git a/data/themes/default/images/bt_sm_base1.png b/data/themes/default/images/bt_sm_base1.png
deleted file mode 100644
index c37e182..0000000
Binary files a/data/themes/default/images/bt_sm_base1.png and /dev/null differ
diff --git a/data/themes/default/images/bt_sm_base2.png b/data/themes/default/images/bt_sm_base2.png
deleted file mode 100644
index f159648..0000000
Binary files a/data/themes/default/images/bt_sm_base2.png and /dev/null differ
diff --git a/data/themes/default/images/bt_sm_hilight.png b/data/themes/default/images/bt_sm_hilight.png
deleted file mode 100644
index 63899ca..0000000
Binary files a/data/themes/default/images/bt_sm_hilight.png and /dev/null differ
diff --git a/data/themes/default/images/bt_sm_shine.png b/data/themes/default/images/bt_sm_shine.png
deleted file mode 100644
index 23bf311..0000000
Binary files a/data/themes/default/images/bt_sm_shine.png and /dev/null differ
diff --git a/data/themes/default/images/left_arrow.png b/data/themes/default/images/left_arrow.png
deleted file mode 100644
index cf56fe1..0000000
Binary files a/data/themes/default/images/left_arrow.png and /dev/null differ
diff --git a/data/themes/default/images/move_left.png b/data/themes/default/images/move_left.png
deleted file mode 100644
index 5ae7603..0000000
Binary files a/data/themes/default/images/move_left.png and /dev/null differ
diff --git a/data/themes/default/images/move_right.png b/data/themes/default/images/move_right.png
deleted file mode 100644
index 48df666..0000000
Binary files a/data/themes/default/images/move_right.png and /dev/null differ
diff --git a/data/themes/default/images/right_arrow.png b/data/themes/default/images/right_arrow.png
deleted file mode 100644
index 4211cde..0000000
Binary files a/data/themes/default/images/right_arrow.png and /dev/null differ
diff --git a/data/themes/default/images/sb_runnerh.png b/data/themes/default/images/sb_runnerh.png
deleted file mode 100644
index a483ce8..0000000
Binary files a/data/themes/default/images/sb_runnerh.png and /dev/null differ
diff --git a/data/themes/default/images/sb_runnerv.png b/data/themes/default/images/sb_runnerv.png
deleted file mode 100644
index cb2da6f..0000000
Binary files a/data/themes/default/images/sb_runnerv.png and /dev/null differ
diff --git a/data/themes/default/images/scroll_left.png b/data/themes/default/images/scroll_left.png
deleted file mode 100644
index 63024bc..0000000
Binary files a/data/themes/default/images/scroll_left.png and /dev/null differ
diff --git a/data/themes/default/images/scroll_right.png b/data/themes/default/images/scroll_right.png
deleted file mode 100644
index 2723fbb..0000000
Binary files a/data/themes/default/images/scroll_right.png and /dev/null differ
diff --git a/data/themes/default/images/selected.png b/data/themes/default/images/selected.png
deleted file mode 100644
index 61e4f94..0000000
Binary files a/data/themes/default/images/selected.png and /dev/null differ
diff --git a/data/themes/default/images/thumb_shadow.png b/data/themes/default/images/thumb_shadow.png
deleted file mode 100644
index b4519b5..0000000
Binary files a/data/themes/default/images/thumb_shadow.png and /dev/null differ
diff --git a/data/themes/default/images/window_fullscreen.png b/data/themes/default/images/window_fullscreen.png
deleted file mode 100644
index 00e6b83..0000000
Binary files a/data/themes/default/images/window_fullscreen.png and /dev/null differ
diff --git a/data/themes/default/images/x-office-presentation.png b/data/themes/default/images/x-office-presentation.png
deleted file mode 100644
index 9ffc383..0000000
Binary files a/data/themes/default/images/x-office-presentation.png and /dev/null differ