diff --git a/epydial/compile_theme b/epydial/compile_theme
index 82099c8..8807296 100755
--- a/epydial/compile_theme
+++ b/epydial/compile_theme
@@ -2,8 +2,22 @@
 
 cd data/themes
 
-for filename in *.edc
+for theme in *
 do
-	/opt/e17/bin/edje_cc -id ../images -fd ../fonts $filename
-done
+	if [[ ! -d "$theme" ]]
+	then
+		continue
+	fi
+
+	echo "Compiling theme $theme"
+
+	cd $theme
+	data_path="../../themes_data/"$theme"/"
 
+	for filename in *.edc
+	do
+		/opt/e17/bin/edje_cc -id $data_path/images -fd $data_path/fonts $filename
+	done
+
+	cd ..
+done
diff --git a/epydial/data/themes/dialer_incall.edc b/epydial/data/themes/default/dialer_incall.edc
similarity index 100%
rename from epydial/data/themes/dialer_incall.edc
rename to epydial/data/themes/default/dialer_incall.edc
diff --git a/epydial/data/themes/dialer_incall.edj b/epydial/data/themes/default/dialer_incall.edj
similarity index 100%
rename from epydial/data/themes/dialer_incall.edj
rename to epydial/data/themes/default/dialer_incall.edj
diff --git a/epydial/data/themes/dialer_main.edc b/epydial/data/themes/default/dialer_main.edc
similarity index 100%
rename from epydial/data/themes/dialer_main.edc
rename to epydial/data/themes/default/dialer_main.edc
diff --git a/epydial/data/themes/dialer_main.edj b/epydial/data/themes/default/dialer_main.edj
similarity index 100%
rename from epydial/data/themes/dialer_main.edj
rename to epydial/data/themes/default/dialer_main.edj
diff --git a/epydial/epydial.py b/epydial/epydial.py
index e536d2f..40ad753 100755
--- a/epydial/epydial.py
+++ b/epydial/epydial.py
@@ -12,7 +12,7 @@ FULLSCREEN = True
 TITLE = "epydial"
 WM_INFO = ("epydial", "epydial")
 
-EDJE_FILE_PATH = "data/themes/"
+EDJE_FILE_PATH = "data/themes/default/"
 
 MAIN_SCREEN_NAME = "pyneo/dialer/main"
 INCALL_SCREEN_NAME = "pyneo/dialer/incall"