diff --git a/epydial/data/themes/blackwhite/dialer_incall.edc b/epydial/data/themes/blackwhite/dialer_incall.edc
index e8be484..694ab4a 100644
--- a/epydial/data/themes/blackwhite/dialer_incall.edc
+++ b/epydial/data/themes/blackwhite/dialer_incall.edc
@@ -10,7 +10,7 @@
 data {
 	item: "author" "thomasg [thomas (a) gstaedtner (.) net]";
 	item: "version" "prototype";
-	item: "name" "epydial_default";
+	item: "name" "epydial_blackwhite";
 }
 
 images {
@@ -40,139 +40,6 @@ color_classes {
 	}
 }
 
-spectra {
-	spectrum {
-		name: "background";
-		color: 80 80 80 255 1;
-		color: 210 210 210 255 1;
-	}
-	spectrum {
-		name: "button";
-		color: 5 5 5 255 1;
-		color: 110 110 110 255 1;
-		color: 10 10 10 255 1;
-	}
-	spectrum {
-		name: "button_active";
-		color: 15 170 0 255 1;
-		color: 130 255 0 255 1;
-		color: 20 200 0 255 1;
-	}
-}
-
-#define BUTTON(button_number, rel1x, rel1y, rel2x, rel2y, button_caption) \
-part { \
-	name: "button_"button_number; \
-	type: GRADIENT; \
-	description { \
-		state: "default" 0; \
-		gradient { \
-			spectrum: "button"; \
-			rel1 { relative: 0 0; offset: 0 0; }; \
-			rel2 { relative: 0 0.75; offset: 0 0; }; \
-		} \
-		fill { \
-			spread: 1; \
-			angle: 1; \
-			size { relative: 1 0; offset: 0 0; }; \
-		} \
-		rel1 { relative: rel1x rel1y; offset: 0 0; }; \
-		rel2 { relative: rel2x rel2y; offset: 0 0; }; \
-	} \
-	description { \
-		state: "default" 0.5; \
-		inherit: "default" 0; \
-		gradient.spectrum: "button_active"; \
-		rel1.offset: 0 -5; \
-		rel2.offset: 0 5; \
-	} \
-	description { \
-		state: "default" 1; \
-		inherit: "default" 0; \
-	} \
-} \
-part { \
-	name: "button_accent_"button_number; \
-	type: RECT; \
-	description { \
-		state: "default" 0; \
-		color: 25 215 0 255; \
-		rel1 { \
-			to: "button_"button_number; \
-			relative: 0 0.95; \
-		} \
-		rel2.to: "button_"button_number; \
-	} \
-} \
-part { \
-	name: "button_"button_number"_caption"; \
-	type: TEXT; \
-	mouse_events: 0; \
-	effect: GLOW; \
-	description { \
-		state: "default" 0; \
-		color_class: "button_inactive"; \
-		rel1 { \
-			to: "button_"button_number; \
-			relative: 0 0; \
-		} \
-		rel2 { \
-			to: "button_"button_number; \
-			relative: 1 1; \
-		} \
-		text { \
-			text: button_caption; \
-			size: 18; \
-			font: "Sans:style=Bold,Edje-Vera"; \
-		} \
-	} \
-} \
-program { \
-	name: "button_"button_number"_signal_emit"; \
-	signal: "mouse,down,*"; \
-	source: "button_"button_number; \
-	action: SIGNAL_EMIT "dialer_send" button_caption; \
-} \
-program { \
-	name: "button_"button_number"_animation"; \
-	signal: "mouse,down,*"; \
-	source: "button_"button_number; \
-	action: STATE_SET "default" 0.5; \
-	target: "button_"button_number; \
-} \
-program { \
-	name: "button_"button_number"_animation_end"; \
-	signal: "mouse,up,*"; \
-	source: "button_"button_number; \
-	action: STATE_SET "default" 1; \
-	target: "button_"button_number; \
-	transition: DECELERATE 0.1; \
-}
-
-#define DESIGN_STRIPE(stripe_number, rel1x, rel1y, rel2x, rel2y) \
-part { \
-	name: "design_stripe_"stripe_number; \
-	type: RECT; \
-	description { \
-		state: "default" 0; \
-		color: 0 0 0 255; \
-		rel1 { relative: rel1x rel1y; offset: 0 0; }; \
-		rel2 { relative: rel2x rel2y; offset: 0 0; }; \
-	} \
-}
-
-#define DESIGN_SEPERATOR(seperator_number, rel1x, rel1y, rel2x, rel2y) \
-part { \
-	name: "design_seperator_"seperator_number; \
-	type: RECT; \
-	description { \
-		state: "defeault" 0; \
-		color: 255 255 255 100; \
-		rel1 { relative: rel1x rel1y; offset: -0.5 7; }; \
-		rel2 { relative: rel2x rel2y; offset: 0.5 -9; }; \
-	} \
-}
-
 collections {
 	group {
 		name: "pyneo/dialer/incall";
@@ -190,7 +57,7 @@ collections {
 				}
 			}
 			part {
-				name: "number_incall_text";
+				name: "incall_number_text";
 				type: TEXT;
 				description {
 					color_class: "button_inactive";
@@ -201,7 +68,7 @@ collections {
    				}
 			}
 			part {
-				name: "image_incall";
+				name: "incall_image";
 				type: IMAGE;
 				description {
 					rel1 {	relative: 1/2 1/2; 
@@ -214,7 +81,7 @@ collections {
 				}
 			}
 			part {
-				name: "incall_yes";
+				name: "incall_accept_call";
 				type: IMAGE;
 				description {
 					rel1 {
@@ -229,13 +96,13 @@ collections {
 				}
 			}
 			program { \
-				name: "button_incall_yes_signal_emit"; \
+				name: "button_incall_accept_call_signal_emit"; \
 				signal: "mouse,down,*"; \
-				source: "incall_yes"; \
+				source: "incall_accept_call"; \
 				action: SIGNAL_EMIT "dialer_incall_send" "Accept Call"; \
 			} \
 			part {
-				name: "incall_no";
+				name: "incall_hangup_call";
 				type: IMAGE;
 				description {
 					rel1 {
@@ -247,21 +114,14 @@ collections {
 						offset: 50 -10;
 						}
 					image { normal: "no.png"; }
-				}
+					}
 			}
 			program { \
-				name: "button_incall_no_signal_emit"; \
+				name: "button_incall_hangup_call_signal_emit"; \
 				signal: "mouse,down,*"; \
-				source: "incall_no"; \
+				source: "incall_hangup_call"; \
 				action: SIGNAL_EMIT "dialer_incall_send" "Hangup Call"; \
 			} \
-
-/*  
-			BUTTON(1, 0.1, 0.2, 0.9, 0.4, "End Call");
-			BUTTON(2, 0.1, 0.45, 0.9, 0.65, "Back To Dialer");
-			BUTTON(3, 0.1, 0.7, 0.9, 0.9, "Hold Call");
-			DESIGN_SEPERATOR(1, 1/3, 25/70, 1/3, 35/70);
-			DESIGN_SEPERATOR(2, 2/3, 25/70, 2/3, 35/70); */
 		}
 	}
-}	
+}
diff --git a/epydial/data/themes/blackwhite/dialer_incall.edj b/epydial/data/themes/blackwhite/dialer_incall.edj
index 77b1ff3..98597b7 100644
Binary files a/epydial/data/themes/blackwhite/dialer_incall.edj and b/epydial/data/themes/blackwhite/dialer_incall.edj differ