diff --git a/data/themes/default.edc b/data/themes/default.edc
index 4576dc399..9ca7688ac 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -25673,6 +25673,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
    group { name: "e/conf/wallpaper/main/mini-theme";
       images {
 	 image: "e17_mini_button_shadow2.png" COMP;
+         image: "theme-label.png" COMP;
       }
       parts {
 	 part {	name: "icon_box_shadow";
@@ -25740,7 +25741,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
 		  relative: 1.0 1.0;
 		  offset:   -5  -5;
 	       }
-	       color: 100 100 100 255;
 	    }
 	    description { state: "visible" 0.0;
 	       inherit: "default" 0.0;
@@ -25786,6 +25786,23 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
 	       }
 	    }
 	 }
+	 part { name: "theme";
+	    mouse_events:  0;
+	    description { state: "default" 0.0;
+               aspect: 1.709677419 1.709677419;
+	       rel1 {
+                  to: "e.swallow.content";
+		  relative: 0.6 0.6;
+		  offset:   -1   -1;
+	       }
+	       rel2 {
+                  to: "e.swallow.content";
+		  relative: 1.0 1.0;
+		  offset:   -1  -1;
+	       }
+               image.normal: "theme-label.png";
+	    }
+	 }
 	 part { name: "events";
 	    type: RECT;
 	    description { state: "default" 0.0;
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index d4f49afa2..fb3621f57 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -558,5 +558,6 @@ wp-tb2.png \
 wp-bot2.png \
 wp-tb3.png \
 wp-tbs.png \
-systray_rounded_corners.png
+systray_rounded_corners.png \
+theme-label.png
 
diff --git a/data/themes/images/theme-label.png b/data/themes/images/theme-label.png
new file mode 100644
index 000000000..6dd6c1162
Binary files /dev/null and b/data/themes/images/theme-label.png differ
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
index f25a7a3fe..d0bb1671e 100644
--- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
@@ -5,20 +5,23 @@
 #include "e_mod_main.h"
 
 // FIXME:
-//   need a "add" button (to add exchange, image file or gradient)
+//   need single 'add' button
+//   need single 'delete' button
+//   need single "options' button
+//   need choice after add (file, gradient, online source)
+//   need delete select mode
+//   need after select on delete an ok/cancel if file or "ok to remove whole online source" if online
 //   need filename display
-//   need "theme wallpaper" image
 //   need to make thumb white rect better (shaded etc.)
-//   need to make "theme wallpaper" have different look
 //   need to make "exchange" wallpapers have a different look
 //   need indicator that sort is pending
+//   need to show busy info while loading files / generating thumbs
 //   need signal to emit for popping down slide-up panel
 //   bug: animated wp doesnt workon first show
+//   need options panel (this screen, this desktop, all desktops) if screens > 1 or desktops > 1
 //   need to disable "this screen" if multiple containers/zones dont exist
 //   need to disable "this desktop vs all desktops" if only 1 desk exists
-//   need to show busy info while loading files / generating thumbs
-//   need to delete/create objects as neede (not just hide/show)
-//   need to be able to "type name to search/filter
+//   need to be able to "type name to search/filter"
 
 typedef struct _Info Info;
 typedef struct _Smart_Data Smart_Data;