diff --git a/epydial/clean_theme b/epydial/clean_theme
new file mode 100755
index 0000000..3e422ba
--- /dev/null
+++ b/epydial/clean_theme
@@ -0,0 +1,2 @@
+#!/bin/sh -e
+rm -v data/themes/*/*.edj
diff --git a/epydial/compile_theme b/epydial/compile_theme
index 20d3f49..3535404 100755
--- a/epydial/compile_theme
+++ b/epydial/compile_theme
@@ -1,23 +1,16 @@
-#!/bin/bash -e
-
-cd data/themes
-
-for theme in *
-do
-	if [[ ! -d "$theme" ]]
-	then
-		continue
+#!/bin/sh -e
+for theme in data/themes/*; do
+	if [ -d "$theme" ]; then
+		cd "$theme"
+		theme=`basename "$theme"`
+		echo "Compiling theme $theme"
+		data_path="../../themes_data/$theme"
+		for filename in *.edc; do
+			edje_cc \
+				-id "$data_path/images" \
+				-fd "$data_path/fonts" \
+				$filename
+		done
+		cd - > /dev/null
 	fi
-
-	echo "Compiling theme $theme"
-
-	cd $theme
-	data_path="../../themes_data/"$theme"/"
-
-	for filename in *.edc
-	do
-		edje_cc -id $data_path/images -fd $data_path/fonts $filename
-	done
-
-	cd ..
 done
diff --git a/epydial/data/themes/blackwhite/dialer_incall.edj b/epydial/data/themes/blackwhite/dialer_incall.edj
deleted file mode 100644
index 7086872..0000000
Binary files a/epydial/data/themes/blackwhite/dialer_incall.edj and /dev/null differ
diff --git a/epydial/data/themes/blackwhite/dialer_main.edj b/epydial/data/themes/blackwhite/dialer_main.edj
deleted file mode 100644
index c4936d6..0000000
Binary files a/epydial/data/themes/blackwhite/dialer_main.edj and /dev/null differ
diff --git a/epydial/data/themes/blackwhite/gps_status.edj b/epydial/data/themes/blackwhite/gps_status.edj
deleted file mode 100644
index 8df71d5..0000000
Binary files a/epydial/data/themes/blackwhite/gps_status.edj and /dev/null differ
diff --git a/epydial/data/themes/default/dialer_incall.edj b/epydial/data/themes/default/dialer_incall.edj
deleted file mode 100644
index f8f99e0..0000000
Binary files a/epydial/data/themes/default/dialer_incall.edj and /dev/null differ
diff --git a/epydial/data/themes/default/dialer_main.edj b/epydial/data/themes/default/dialer_main.edj
deleted file mode 100644
index b32d4ac..0000000
Binary files a/epydial/data/themes/default/dialer_main.edj and /dev/null differ