diff --git a/configure.ac b/configure.ac
index 4ee9948..a60322f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,8 +70,6 @@ Makefile
 data/Makefile
 data/desktop/Makefile
 data/desktop/extra.desktop
-data/themes/Makefile
-data/themes/default/Makefile
 doc/Makefile
 packaging/Makefile
 packaging/slackware/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 2d4e6c1..3351d18 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = themes desktop
+SUBDIRS = desktop
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
deleted file mode 100644
index 31a2b40..0000000
--- a/data/themes/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = default
-
diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am
deleted file mode 100644
index 2612ac0..0000000
--- a/data/themes/default/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = \
-default.edc \
-images/enlightenment.png \
-sounds/bell.wav
-
-include ../../../Makefile_Edje_Helper.am
-
-filesdir = $(datadir)/$(PACKAGE)/themes
-files_DATA = default.edj
-
-default.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	-id ${top_srcdir}/data/themes/default/images \
-	-sd ${top_srcdir}/data/themes/default/sounds \
-	$(top_srcdir)/data/themes/default/default.edc \
-	$(top_builddir)/data/themes/default/default.edj
-
-clean-local:
-	rm -f *.edj
diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
deleted file mode 100644
index b1bacd8..0000000
--- a/data/themes/default/default.edc
+++ /dev/null
@@ -1,21 +0,0 @@
-images.image: "enlightenment.png" COMP;
-
-collections {
-   sounds {
-      sample {
-         name: "bell" LOSSY 64;
-         source: "bell.wav";
-      }
-   }
-
-   group {
-      name: "test";
-      parts {
-      	 part { name: "main"; type: IMAGE;
-	    description {
-	       image.normal: "enlightenment.png";
-	    }
-	 }
-      }
-   }
-}
diff --git a/data/themes/default/images/enlightenment.png b/data/themes/default/images/enlightenment.png
deleted file mode 100644
index 759381d..0000000
Binary files a/data/themes/default/images/enlightenment.png and /dev/null differ
diff --git a/data/themes/default/sounds/bell.wav b/data/themes/default/sounds/bell.wav
deleted file mode 100644
index c052881..0000000
Binary files a/data/themes/default/sounds/bell.wav and /dev/null differ