elementary: and now compile all left over data.

6 files changed, 261 insertions, 251 deletions

diff --git a/Makefile_Elm_Helpers.am b/Makefile_Elm_Helpers.am
index 9ca1822a01..be2b55ca33 100644
--- a/Makefile_Elm_Helpers.am
+++ b/Makefile_Elm_Helpers.am
@@ -1,19 +1,10 @@
 if HAVE_ELM_PREFS_CC
 ELM_PREFS_CC = @elm_prefs_cc@
 else
-ELM_PREFS_CC = $(top_builddir)/src/bin/elm_prefs_cc
+ELM_PREFS_CC = $(top_builddir)/src/bin/elementary/elm_prefs_cc
 endif
 
 AM_V_EPB = $(am__v_EPB_@AM_V@)
 am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@)
 am__v_EPB_0 = @echo "  EPB     " $@;
 
-EDJE_CC = @edje_cc@
-EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
-EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
-EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -fastdecomp -id $(srcdir) -fd $(srcdir)
-
-AM_V_EDJ = $(am__v_EDJ_@AM_V@)
-am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
-am__v_EDJ_0 = @echo "  EDJ     " $@;
diff --git a/data/Makefile.am b/data/Makefile.am
index 2270125963..be7b15fe45 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -119,7 +119,10 @@ EXTRA_DIST += $(eluafiles_DATA)
 
 #######################################################################
 # Elementary
-elementaryfilesdir = $(datadir)/themes
+
+# themes
+
+elementaryfilesdir = $(datadir)/elementary/themes
 elementaryfiles_DATA = elementary/themes/default.edj
 CLEANFILES += elementary/themes/default.edj
 
@@ -130,3 +133,114 @@ elementary/themes/default.edj: elementary/themes/default.edc
 	$(MKDIR_P) elementary/themes/; \
 	$(EDJE_CC) $(EDJE_CC_FLAGS) $(EDJE_CC_ELM_FLAGS) $< $@
 
+# desktop files
+
+elementarydesktopdir = $(datadir)/elementary/applications
+elementarydesktop_DATA = elementary/desktop/elementary_test.desktop elementary/desktop/elementary_config.desktop
+
+elementaryicondir = $(datadir)/elementary/icons
+elementaryicon_DATA = elementary/desktop/elementary.png
+
+EXTRA_DIST += $(elementarydesktop_DATA) $(elementaryicon_DATA)
+
+# edje_externals
+
+elementaryedje_externalsdir = $(datadir)/elementary/edje_externals
+elementaryedje_externals_DATA = elementary/edje_externals/icons.edj
+CLEANFILES += $(elementaryedje_externals_DATA)
+
+include elementary/edje_externals/Makefile.am
+
+elementary/edje_externals/icons.edj: elementary/edje_externals/icons.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/edje_externals/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+# images
+
+include elementary/images/Makefile.am
+
+elementaryimagesdir = $(datadir)/elementary/images
+elementaryimages_DATA = $(elementary_images_files)
+
+elementaryimages_glayerdir = $(datadir)/elementary/images
+elementaryimages_glayer_DATA = $(elementary_images_glayer_files)
+
+EXTRA_DIST += $(elementary_images_files) $(elementary_images_glayer_files)
+
+# objects
+
+include ../Makefile_Elm_Helpers.am
+
+elementaryobjectsdir = $(datadir)/elementary/object
+elementaryobjects_DATA = \
+elementary/objects/test.edj \
+elementary/objects/test_external.edj \
+elementary/objects/multip.edj \
+elementary/objects/cursors.edj \
+elementary/objects/combobox_multiple.edj \
+elementary/objects/font_preview.edj \
+elementary/objects/postit_ent.edj \
+elementary/objects/multibuttonentry.edj \
+elementary/objects/test_prefs.edj \
+elementary/objects/test_prefs.epb \
+elementary/objects/test_focus_style.edj
+CLEANFILES += $(elementaryobjects_DATA)
+
+include elementary/objects/Makefile.am
+
+elementary/objects/test.edj: elementary/objects/test.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_external.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multip.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/cursors.edj: elementary/objects/cursors.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/combobox_multiple.edj: elementary/objects/combobox_multiple.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/font_preview.edj: elementary/objects/font_preview.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/postit_ent.edj: elementary/objects/postit_ent.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multibuttonentry.edj: elementary/objects/multibuttonentry.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_prefs.edj: elementary/objects/test_prefs.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_focus_style.edj: elementary/objects/test_focus_style.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+
+elementary/objects/test_prefs.epb: elementary/objects/test_prefs.epc
+	$(AM_V_EPB) \
+	$(MKDIR_P) elementary/objects/; \
+	$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) $< $@
+
diff --git a/data/elementary/edje_externals/Makefile.am b/data/elementary/edje_externals/Makefile.am
index a4ae9066d2..7042035629 100644
--- a/data/elementary/edje_externals/Makefile.am
+++ b/data/elementary/edje_externals/Makefile.am
@@ -1,42 +1,26 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/edje_externals -fd $(top_srcdir)/data/elementary/edje_externals
 
-include ../../Makefile_Elm_Helpers.am
-
-EDJE_CC_FLAGS += -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals
-
-filesdir = $(datadir)/elementary/edje_externals
-files_DATA = icons.edj
-
-EXTRA_DIST = \
-icons.edc \
-ico_anchorblock.png \
-ico_anchorview.png \
-ico_bubble.png \
-ico_button.png \
-ico_check.png \
-ico_clock.png \
-ico_fileselector.png \
-ico_fileselector_button.png \
-ico_genlist.png \
-ico_hoversel.png \
-ico_list.png \
-ico_map.png \
-ico_notepad.png \
-ico_photocam.png \
-ico_progressbar.png \
-ico_radio.png \
-ico_scrolled_entry.png \
-ico_slider.png \
-ico_slideshow.png \
-ico_spinner.png \
-ico_thumb.png \
-ico_toolbar.png
-
-icons.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/edje_externals/icons.edc \
-	$(top_builddir)/data/edje_externals/icons.edj
-
-clean-local:
-	rm -f *.edj
+EXTRA_DIST += \
+	elementary/edje_externals/icons.edc \
+	elementary/edje_externals/ico_anchorblock.png \
+	elementary/edje_externals/ico_anchorview.png \
+	elementary/edje_externals/ico_bubble.png \
+	elementary/edje_externals/ico_button.png \
+	elementary/edje_externals/ico_check.png \
+	elementary/edje_externals/ico_clock.png \
+	elementary/edje_externals/ico_fileselector.png \
+	elementary/edje_externals/ico_fileselector_button.png \
+	elementary/edje_externals/ico_genlist.png \
+	elementary/edje_externals/ico_hoversel.png \
+	elementary/edje_externals/ico_list.png \
+	elementary/edje_externals/ico_map.png \
+	elementary/edje_externals/ico_notepad.png \
+	elementary/edje_externals/ico_photocam.png \
+	elementary/edje_externals/ico_progressbar.png \
+	elementary/edje_externals/ico_radio.png \
+	elementary/edje_externals/ico_scrolled_entry.png \
+	elementary/edje_externals/ico_slider.png \
+	elementary/edje_externals/ico_slideshow.png \
+	elementary/edje_externals/ico_spinner.png \
+	elementary/edje_externals/ico_thumb.png \
+	elementary/edje_externals/ico_toolbar.png
diff --git a/data/elementary/images/Makefile.am b/data/elementary/images/Makefile.am
index 0af41654a5..3fbe6ae801 100644
--- a/data/elementary/images/Makefile.am
+++ b/data/elementary/images/Makefile.am
@@ -1,98 +1,92 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
+elementary_images_files = \
+	elementary/images/insanely_huge_test_image.jpg \
+	elementary/images/panel_01.jpg \
+	elementary/images/plant_01.jpg \
+	elementary/images/pol_shadow.png \
+	elementary/images/pol_sky.png \
+	elementary/images/pol_twofish.png \
+	elementary/images/rock_01.jpg \
+	elementary/images/rock_02.jpg \
+	elementary/images/sky_01.jpg \
+	elementary/images/sky_02.jpg \
+	elementary/images/sky_03.jpg \
+	elementary/images/sky_04.jpg \
+	elementary/images/wood_01.jpg \
+	elementary/images/logo.png \
+	elementary/images/logo_small.png \
+	elementary/images/animated_logo.gif \
+	elementary/images/parking.png \
+	elementary/images/icon_00.png \
+	elementary/images/icon_01.png \
+	elementary/images/icon_02.png \
+	elementary/images/icon_03.png \
+	elementary/images/icon_04.png \
+	elementary/images/icon_05.png \
+	elementary/images/icon_06.png \
+	elementary/images/icon_07.png \
+	elementary/images/icon_08.png \
+	elementary/images/icon_09.png \
+	elementary/images/icon_10.png \
+	elementary/images/icon_11.png \
+	elementary/images/icon_12.png \
+	elementary/images/icon_13.png \
+	elementary/images/icon_14.png \
+	elementary/images/icon_15.png \
+	elementary/images/icon_16.png \
+	elementary/images/icon_17.png \
+	elementary/images/icon_18.png \
+	elementary/images/icon_19.png \
+	elementary/images/icon_20.png \
+	elementary/images/icon_21.png \
+	elementary/images/icon_22.png \
+	elementary/images/icon_23.png \
+	elementary/images/icon_right_arrow.png \
+	elementary/images/bubble.png \
+	elementary/images/bubble_sh.png \
+	elementary/images/mystrale.jpg \
+	elementary/images/mystrale_2.jpg \
+	elementary/images/twofish.jpg \
+	elementary/images/pt.png \
+	elementary/images/earth_normal.png \
+	elementary/images/space.png
 
-filesdir = $(datadir)/elementary/images
-files_DATA = \
-insanely_huge_test_image.jpg \
-panel_01.jpg \
-plant_01.jpg \
-pol_shadow.png \
-pol_sky.png \
-pol_twofish.png \
-rock_01.jpg \
-rock_02.jpg \
-sky_01.jpg \
-sky_02.jpg \
-sky_03.jpg \
-sky_04.jpg \
-wood_01.jpg \
-logo.png \
-logo_small.png \
-animated_logo.gif \
-parking.png \
-icon_00.png \
-icon_01.png \
-icon_02.png \
-icon_03.png \
-icon_04.png \
-icon_05.png \
-icon_06.png \
-icon_07.png \
-icon_08.png \
-icon_09.png \
-icon_10.png \
-icon_11.png \
-icon_12.png \
-icon_13.png \
-icon_14.png \
-icon_15.png \
-icon_16.png \
-icon_17.png \
-icon_18.png \
-icon_19.png \
-icon_20.png \
-icon_21.png \
-icon_22.png \
-icon_23.png \
-icon_right_arrow.png \
-bubble.png \
-bubble_sh.png \
-mystrale.jpg \
-mystrale_2.jpg \
-twofish.jpg \
-pt.png \
-earth_normal.png \
-space.png
+elementary_images_glayer_files = \
+	elementary/images/g_layer/double_tap_1.png \
+	elementary/images/g_layer/line_1.png \
+	elementary/images/g_layer/momentum_1.png \
+	elementary/images/g_layer/tap_5.png \
+	elementary/images/g_layer/double_tap_2.png \
+	elementary/images/g_layer/line_2.png \
+	elementary/images/g_layer/momentum_2.png \
+	elementary/images/g_layer/triple_tap_1.png \
+	elementary/images/g_layer/double_tap_3.png \
+	elementary/images/g_layer/line_3.png \
+	elementary/images/g_layer/momentum_3.png \
+	elementary/images/g_layer/triple_tap_2.png \
+	elementary/images/g_layer/double_tap_4.png \
+	elementary/images/g_layer/line_4.png \
+	elementary/images/g_layer/momentum_4.png \
+	elementary/images/g_layer/triple_tap_3.png \
+	elementary/images/g_layer/double_tap_5.png \
+	elementary/images/g_layer/line_5.png \
+	elementary/images/g_layer/momentum_5.png \
+	elementary/images/g_layer/triple_tap_4.png \
+	elementary/images/g_layer/flick_1.png \
+	elementary/images/g_layer/long_tap_1.png \
+	elementary/images/g_layer/rotate_1.png \
+	elementary/images/g_layer/triple_tap_5.png \
+	elementary/images/g_layer/flick_2.png \
+	elementary/images/g_layer/long_tap_2.png \
+	elementary/images/g_layer/tap_1.png \
+	elementary/images/g_layer/zoom_1.png \
+	elementary/images/g_layer/flick_3.png \
+	elementary/images/g_layer/long_tap_3.png \
+	elementary/images/g_layer/tap_2.png \
+	elementary/images/g_layer/flick_4.png \
+	elementary/images/g_layer/long_tap_4.png \
+	elementary/images/g_layer/tap_3.png \
+	elementary/images/g_layer/flick_5.png \
+	elementary/images/g_layer/long_tap_5.png \
+	elementary/images/g_layer/tap_4.png
 
-files_glayerdir = $(datadir)/elementary/images/g_layer
-files_glayer_DATA = \
-g_layer/double_tap_1.png \
-g_layer/line_1.png \
-g_layer/momentum_1.png \
-g_layer/tap_5.png \
-g_layer/double_tap_2.png \
-g_layer/line_2.png \
-g_layer/momentum_2.png \
-g_layer/triple_tap_1.png \
-g_layer/double_tap_3.png \
-g_layer/line_3.png \
-g_layer/momentum_3.png \
-g_layer/triple_tap_2.png \
-g_layer/double_tap_4.png \
-g_layer/line_4.png \
-g_layer/momentum_4.png \
-g_layer/triple_tap_3.png \
-g_layer/double_tap_5.png \
-g_layer/line_5.png \
-g_layer/momentum_5.png \
-g_layer/triple_tap_4.png \
-g_layer/flick_1.png \
-g_layer/long_tap_1.png \
-g_layer/rotate_1.png \
-g_layer/triple_tap_5.png \
-g_layer/flick_2.png \
-g_layer/long_tap_2.png \
-g_layer/tap_1.png \
-g_layer/zoom_1.png \
-g_layer/flick_3.png \
-g_layer/long_tap_3.png \
-g_layer/tap_2.png \
-g_layer/flick_4.png \
-g_layer/long_tap_4.png \
-g_layer/tap_3.png \
-g_layer/flick_5.png \
-g_layer/long_tap_5.png \
-g_layer/tap_4.png
-
-
-EXTRA_DIST = $(files_DATA) $(files_glayer_DATA)
+EXTRA_DIST += $(files_DATA) $(files_glayer_DATA)
diff --git a/data/elementary/objects/Makefile.am b/data/elementary/objects/Makefile.am
index 86593ca8a8..be9769ecfe 100644
--- a/data/elementary/objects/Makefile.am
+++ b/data/elementary/objects/Makefile.am
@@ -1,98 +1,25 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../../Makefile_Elm_Helpers.am
-
-EDJE_CC_FLAGS += -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
-
-filesdir = $(datadir)/elementary/objects
-
-files_DATA = test.edj test_external.edj multip.edj cursors.edj combobox_multiple.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_style.edj
-
-EXTRA_DIST = \
-test.edc \
-test_external.edc \
-test_prefs.edc \
-test_prefs.epc \
-multip.edc \
-cursors.edc \
-combobox_multiple.edc \
-font_preview.edc \
-postit_ent.edc \
-multibuttonentry.edc \
-test_focus_style.edc \
-over.png \
-under.png \
-sky.jpg \
-clo.png \
-cross.png \
-border.png \
-border2.png \
-border3.png \
-border4.png \
-border5.png \
-border6.png
-
-test.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/test.edc \
-	$(top_builddir)/data/objects/test.edj
-
-test_external.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/test_external.edc \
-	$(top_builddir)/data/objects/test_external.edj
-
-multip.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/multip.edc \
-	$(top_builddir)/data/objects/multip.edj
-
-colorpreview.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/colorpreview.edc \
-	$(top_builddir)/data/objects/colorpreview.edj
-
-cursors.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/cursors.edc \
-	$(top_builddir)/data/objects/cursors.edj
-
-combobox_multiple.edj: Makefile combobox_multiple.edc
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/combobox_multiple.edc \
-	$(top_builddir)/data/objects/combobox_multiple.edj
-
-font_preview.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/font_preview.edc \
-	$(top_builddir)/data/objects/font_preview.edj
-
-postit_ent.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/postit_ent.edc \
-	$(top_builddir)/data/objects/postit_ent.edj
-multibuttonentry.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/multibuttonentry.edc \
-	$(top_builddir)/data/objects/multibuttonentry.edj
-
-test_prefs.edj: Makefile test_prefs.edc
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	$(top_srcdir)/data/objects/test_prefs.edc \
-	$(top_builddir)/data/objects/test_prefs.edj
-
-test_prefs.epb: Makefile test_prefs.epc
-	$(AM_V_EPB)$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \
-	$(top_srcdir)/data/objects/test_prefs.epc \
-	$(top_builddir)/data/objects/test_prefs.epb
-
-test_focus_style.edj: Makefile test_focus_style.edc
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	-id $(top_srcdir)/data/themes/img \
-	$(top_srcdir)/data/objects/test_focus_style.edc \
-	$(top_builddir)/data/objects/test_focus_style.edj
-
-clean-local:
-	rm -f *.edj
-	rm -f test_prefs.epb
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/objects -fd $(top_srcdir)/data/elementary/objects
+
+EXTRA_DIST += \
+elementary/objects/test.edc \
+elementary/objects/test_external.edc \
+elementary/objects/test_prefs.edc \
+elementary/objects/test_prefs.epc \
+elementary/objects/multip.edc \
+elementary/objects/cursors.edc \
+elementary/objects/combobox_multiple.edc \
+elementary/objects/font_preview.edc \
+elementary/objects/postit_ent.edc \
+elementary/objects/multibuttonentry.edc \
+elementary/objects/test_focus_style.edc \
+elementary/objects/over.png \
+elementary/objects/under.png \
+elementary/objects/sky.jpg \
+elementary/objects/clo.png \
+elementary/objects/cross.png \
+elementary/objects/border.png \
+elementary/objects/border2.png \
+elementary/objects/border3.png \
+elementary/objects/border4.png \
+elementary/objects/border5.png \
+elementary/objects/border6.png
diff --git a/data/elementary/objects/test_focus_style.edc b/data/elementary/objects/test_focus_style.edc
index ac184c4ca6..4359b8046d 100644
--- a/data/elementary/objects/test_focus_style.edc
+++ b/data/elementary/objects/test_focus_style.edc
@@ -434,19 +434,19 @@ collections {
       }
    } //group ends
 
-#include "../../data/themes/macros.edc"
-#include "../../data/themes/fonts.edc"
-#include "../../data/themes/colorclasses.edc"
+#include "../../../data/elementary/themes/macros.edc"
+#include "../../../data/elementary/themes/fonts.edc"
+#include "../../../data/elementary/themes/colorclasses.edc"
 
 // to customize check default style
-#include "../../data/themes/edc/elm/check.edc"
+#include "../../../data/elementary/themes/edc/elm/check.edc"
    group { name: "elm/check/base/focus_text";
       data.item: "focus_part" "elm.text";
       inherit: "elm/check/base/default";
    }
 
 // to customize button default style
-#include "../../data/themes/edc/elm/button.edc"
+#include "../../../data/elementary/themes/edc/elm/button.edc"
    group { name: "elm/button/base/focus_icon";
       data.item: "focus_part" "elm.swallow.content";
       inherit: "elm/button/base/default";