diff --git a/build.sh b/build.sh
deleted file mode 100755
index 1fc535f..0000000
--- a/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-make clean
-make
-sudo make install
diff --git a/configure.ac b/configure.ac
index 3dad487..99fadb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ src/bin/Makefile
 data/Makefile
 data/images/Makefile
 data/theme/Makefile
-data/theme/images/Makefile
+data/.proto/Makefile
 ])
 
 AC_OUTPUT
diff --git a/data/.proto/Makefile.am b/data/.proto/Makefile.am
new file mode 100644
index 0000000..eab93de
--- /dev/null
+++ b/data/.proto/Makefile.am
@@ -0,0 +1,4 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+filesdir = $(datadir)/$(PACKAGE)/.proto
+files_DATA = proto.edc
diff --git a/data/Makefile.am b/data/Makefile.am
index e00fead..ddcbe49 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = images theme
+SUBDIRS = images theme .proto
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index a8d0c51..a31cb33 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,3 +1,4 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = logo.png
+filesdir = $(datadir)/$(PACKAGE)/images
+files_DATA = logo.png
diff --git a/data/theme/Makefile.am b/data/theme/Makefile.am
index 9f2e0ba..f5aae18 100644
--- a/data/theme/Makefile.am
+++ b/data/theme/Makefile.am
@@ -1,11 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = images
-
 EDJE_CC = @edje_cc@
 EDJE_FLAGS = -id $(top_srcdir)/data/theme/images
 
-filesdir = $(datadir)/$(PACKAGE)/themes
+filesdir = $(datadir)/$(PACKAGE)/theme
 files_DATA = enventor.edj
 
 EXTRA_DIST = enventor.edc
diff --git a/data/theme/images/Makefile.am b/data/theme/images/Makefile.am
deleted file mode 100644
index c30ada1..0000000
--- a/data/theme/images/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = arrow_down.png \
-	arrow_left.png \
-	arrow_right.png \
-	arrow_up.png \
-	bt_base1.png \
-	bt_base2.png \
-	bt_dis_base.png \
-	bt_dis_hilight.png \
-	bt_glow.png \
-	bt_hilight.png \
-	bt_shine.png \
-	bt_sm_base2.png \
-	bt_sm_hilight.png \
-	bt_sm_shine.png \
-	content_glow.png \
-	cur_box.png \
-	cur_glow.png \
-	cur_hi.png \
-	cur_shad.png \
-	cur_shine.png \
-	folder.png \
-	menu_layout.png \
-	minus.png \
-	part_highlight.png \
-	plus.png \
-	preference.png \
-	sb_runnerh.png \
-	sb_runnerv.png \
-	shelf_inset.png \
-	sl_bt2_2.png \
-	swallow.png \
-	warning.png
diff --git a/src/bin/main.c b/src/bin/main.c
index 54fdff3..501354c 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -429,7 +429,7 @@ elm_setup()
    elm_app_info_set("/usr/local/bin", "enventor",
                     "/usr/local/share/enventor");
 
-   snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/edj/enventor.edj",
+   snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/theme/enventor.edj",
             elm_app_data_dir_get());
 
    elm_theme_extension_add(NULL, EDJE_PATH);