And actually include new files, plus elementary libraries.

40 files changed, 8678 insertions, 0 deletions

diff --git a/libraries/elementary/src/edje_externals/Makefile.am b/libraries/elementary/src/edje_externals/Makefile.am
new file mode 100644
index 0000000..ba9c9c7
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/Makefile.am
@@ -0,0 +1,69 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib \
+-I$(top_builddir)/src/lib \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+@ELEMENTARY_CFLAGS@ \
+@ELEMENTARY_X_CFLAGS@ \
+@ELEMENTARY_FB_CFLAGS@ \
+@ELEMENTARY_WIN32_CFLAGS@ \
+@ELEMENTARY_WINCE_CFLAGS@ \
+@ELEMENTARY_EDBUS_CFLAGS@ \
+@ELEMENTARY_EFREET_CFLAGS@ \
+@ELEMENTARY_ETHUMB_CFLAGS@ \
+@ELEMENTARY_EMAP_CFLAGS@
+
+if ELEMENTARY_WINDOWS_BUILD
+AM_CPPFLAGS += -DELEMENTARY_BUILD
+endif
+
+pkgdir = $(libdir)/edje/modules/elm/$(MODULE_EDJE)
+pkg_LTLIBRARIES = module.la
+
+module_la_SOURCES = private.h \
+modules.inc \
+elm.c \
+elm_actionslider.c \
+elm_bubble.c \
+elm_button.c \
+elm_calendar.c \
+elm_check.c \
+elm_clock.c \
+elm_entry.c \
+elm_fileselector.c \
+elm_fileselector_button.c \
+elm_fileselector_entry.c \
+elm_frame.c \
+elm_gengrid.c \
+elm_genlist.c \
+elm_hoversel.c \
+elm_icon.c \
+elm_index.c \
+elm_label.c \
+elm_list.c \
+elm_map.c \
+elm_multibuttonentry.c \
+elm_naviframe.c \
+elm_notify.c \
+elm_panes.c \
+elm_photocam.c \
+elm_progressbar.c \
+elm_radio.c \
+elm_scroller.c \
+elm_segment_control.c \
+elm_slider.c \
+elm_slideshow.c \
+elm_spinner.c \
+elm_thumb.c \
+elm_toolbar.c \
+elm_video.c \
+elm_web.c
+
+module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
+module_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC
diff --git a/libraries/elementary/src/edje_externals/Makefile.in b/libraries/elementary/src/edje_externals/Makefile.in
new file mode 100644
index 0000000..ed6cc8f
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/Makefile.in
@@ -0,0 +1,739 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@ELEMENTARY_WINDOWS_BUILD_TRUE@am__append_1 = -DELEMENTARY_BUILD
+subdir = src/edje_externals
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
+        $(top_srcdir)/m4/efl_binary.m4 \
+        $(top_srcdir)/m4/efl_compiler_flag.m4 \
+        $(top_srcdir)/m4/efl_doxygen.m4 \
+        $(top_srcdir)/m4/efl_examples.m4 \
+        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/gettext.m4 \
+        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+        $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/elementary_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdir)"
+LTLIBRARIES = $(pkg_LTLIBRARIES)
+module_la_DEPENDENCIES = $(top_builddir)/src/lib/libelementary.la
+am_module_la_OBJECTS = elm.lo elm_actionslider.lo elm_bubble.lo \
+        elm_button.lo elm_calendar.lo elm_check.lo elm_clock.lo \
+        elm_entry.lo elm_fileselector.lo elm_fileselector_button.lo \
+        elm_fileselector_entry.lo elm_frame.lo elm_gengrid.lo \
+        elm_genlist.lo elm_hoversel.lo elm_icon.lo elm_index.lo \
+        elm_label.lo elm_list.lo elm_map.lo elm_multibuttonentry.lo \
+        elm_naviframe.lo elm_notify.lo elm_panes.lo elm_photocam.lo \
+        elm_progressbar.lo elm_radio.lo elm_scroller.lo \
+        elm_segment_control.lo elm_slider.lo elm_slideshow.lo \
+        elm_spinner.lo elm_thumb.lo elm_toolbar.lo elm_video.lo \
+        elm_web.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(module_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+        $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(module_la_SOURCES)
+DIST_SOURCES = $(module_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EIO_CFLAGS = @EIO_CFLAGS@
+EIO_LIBS = @EIO_LIBS@
+ELEMENTARY_CFLAGS = @ELEMENTARY_CFLAGS@
+ELEMENTARY_COCOA_CFLAGS = @ELEMENTARY_COCOA_CFLAGS@
+ELEMENTARY_COCOA_LIBS = @ELEMENTARY_COCOA_LIBS@
+ELEMENTARY_CONFIG_PRG = @ELEMENTARY_CONFIG_PRG@
+ELEMENTARY_ECORE_CON_CFLAGS = @ELEMENTARY_ECORE_CON_CFLAGS@
+ELEMENTARY_ECORE_CON_INC = @ELEMENTARY_ECORE_CON_INC@
+ELEMENTARY_ECORE_CON_LIBS = @ELEMENTARY_ECORE_CON_LIBS@
+ELEMENTARY_ECORE_IMF_CFLAGS = @ELEMENTARY_ECORE_IMF_CFLAGS@
+ELEMENTARY_ECORE_IMF_INC = @ELEMENTARY_ECORE_IMF_INC@
+ELEMENTARY_ECORE_IMF_LIBS = @ELEMENTARY_ECORE_IMF_LIBS@
+ELEMENTARY_EDBUS_CFLAGS = @ELEMENTARY_EDBUS_CFLAGS@
+ELEMENTARY_EDBUS_LIBS = @ELEMENTARY_EDBUS_LIBS@
+ELEMENTARY_EFREET_CFLAGS = @ELEMENTARY_EFREET_CFLAGS@
+ELEMENTARY_EFREET_LIBS = @ELEMENTARY_EFREET_LIBS@
+ELEMENTARY_EMAP_CFLAGS = @ELEMENTARY_EMAP_CFLAGS@
+ELEMENTARY_EMAP_LIBS = @ELEMENTARY_EMAP_LIBS@
+ELEMENTARY_ETHUMB_CFLAGS = @ELEMENTARY_ETHUMB_CFLAGS@
+ELEMENTARY_ETHUMB_LIBS = @ELEMENTARY_ETHUMB_LIBS@
+ELEMENTARY_EWEATHER_CFLAGS = @ELEMENTARY_EWEATHER_CFLAGS@
+ELEMENTARY_EWEATHER_LIBS = @ELEMENTARY_EWEATHER_LIBS@
+ELEMENTARY_FB_CFLAGS = @ELEMENTARY_FB_CFLAGS@
+ELEMENTARY_FB_LIBS = @ELEMENTARY_FB_LIBS@
+ELEMENTARY_LIBS = @ELEMENTARY_LIBS@
+ELEMENTARY_PSL1GHT_CFLAGS = @ELEMENTARY_PSL1GHT_CFLAGS@
+ELEMENTARY_PSL1GHT_LIBS = @ELEMENTARY_PSL1GHT_LIBS@
+ELEMENTARY_SDL_CFLAGS = @ELEMENTARY_SDL_CFLAGS@
+ELEMENTARY_SDL_LIBS = @ELEMENTARY_SDL_LIBS@
+ELEMENTARY_TEST_PRG = @ELEMENTARY_TEST_PRG@
+ELEMENTARY_WEB_CFLAGS = @ELEMENTARY_WEB_CFLAGS@
+ELEMENTARY_WEB_LIBS = @ELEMENTARY_WEB_LIBS@
+ELEMENTARY_WIN32_CFLAGS = @ELEMENTARY_WIN32_CFLAGS@
+ELEMENTARY_WIN32_LIBS = @ELEMENTARY_WIN32_LIBS@
+ELEMENTARY_WINCE_CFLAGS = @ELEMENTARY_WINCE_CFLAGS@
+ELEMENTARY_WINCE_LIBS = @ELEMENTARY_WINCE_LIBS@
+ELEMENTARY_X_CFLAGS = @ELEMENTARY_X_CFLAGS@
+ELEMENTARY_X_LIBS = @ELEMENTARY_X_LIBS@
+ELM_ALLOCA_H_DEF = @ELM_ALLOCA_H_DEF@
+ELM_DEBUG_DEF = @ELM_DEBUG_DEF@
+ELM_DIRENT_H_DEF = @ELM_DIRENT_H_DEF@
+ELM_EDBUS_DEF = @ELM_EDBUS_DEF@
+ELM_EFREET_DEF = @ELM_EFREET_DEF@
+ELM_EMAP_DEF = @ELM_EMAP_DEF@
+ELM_ETHUMB_DEF = @ELM_ETHUMB_DEF@
+ELM_EWEATHER_DEF = @ELM_EWEATHER_DEF@
+ELM_LIBINTL_H_DEF = @ELM_LIBINTL_H_DEF@
+ELM_UNIX_DEF = @ELM_UNIX_DEF@
+ELM_WEB_DEF = @ELM_WEB_DEF@
+ELM_WIN32_DEF = @ELM_WIN32_DEF@
+ELM_WINCE_DEF = @ELM_WINCE_DEF@
+EMOTION_CFLAGS = @EMOTION_CFLAGS@
+EMOTION_LIBS = @EMOTION_LIBS@
+EVIL_CFLAGS = @EVIL_CFLAGS@
+EVIL_LIBS = @EVIL_LIBS@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MODULE_ARCH = @MODULE_ARCH@
+MODULE_EDJE = @MODULE_EDJE@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VMAJ = @VMAJ@
+VMIN = @VMIN@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dlopen_libs = @dlopen_libs@
+docdir = @docdir@
+dvidir = @dvidir@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+efl_doxygen = @efl_doxygen@
+efl_have_doxygen = @efl_have_doxygen@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+lt_enable_auto_import = @lt_enable_auto_import@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+my_libs = @my_libs@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfig_requires_private = @pkgconfig_requires_private@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release_info = @release_info@
+requirement_elm = @requirement_elm@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = -DELM_INTERNAL_API_ARGESFSDFEFC=1 -I. -I$(top_builddir) \
+        -I$(top_srcdir) -I$(top_srcdir)/src/lib \
+        -I$(top_builddir)/src/lib \
+        -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+        -DPACKAGE_LIB_DIR=\"$(libdir)\" @ELEMENTARY_CFLAGS@ \
+        @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ \
+        @ELEMENTARY_WIN32_CFLAGS@ @ELEMENTARY_WINCE_CFLAGS@ \
+        @ELEMENTARY_EDBUS_CFLAGS@ @ELEMENTARY_EFREET_CFLAGS@ \
+        @ELEMENTARY_ETHUMB_CFLAGS@ @ELEMENTARY_EMAP_CFLAGS@ \
+        $(am__append_1)
+pkgdir = $(libdir)/edje/modules/elm/$(MODULE_EDJE)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = private.h \
+modules.inc \
+elm.c \
+elm_actionslider.c \
+elm_bubble.c \
+elm_button.c \
+elm_calendar.c \
+elm_check.c \
+elm_clock.c \
+elm_entry.c \
+elm_fileselector.c \
+elm_fileselector_button.c \
+elm_fileselector_entry.c \
+elm_frame.c \
+elm_gengrid.c \
+elm_genlist.c \
+elm_hoversel.c \
+elm_icon.c \
+elm_index.c \
+elm_label.c \
+elm_list.c \
+elm_map.c \
+elm_multibuttonentry.c \
+elm_naviframe.c \
+elm_notify.c \
+elm_panes.c \
+elm_photocam.c \
+elm_progressbar.c \
+elm_radio.c \
+elm_scroller.c \
+elm_segment_control.c \
+elm_slider.c \
+elm_slideshow.c \
+elm_spinner.c \
+elm_thumb.c \
+elm_toolbar.c \
+elm_video.c \
+elm_web.c
+
+module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
+module_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+        @for dep in $?; do \
+          case '$(am__configure_deps)' in \
+            *$$dep*) \
+              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+                && { if test -f $@; then exit 0; else break; fi; }; \
+              exit 1;; \
+          esac; \
+        done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/edje_externals/Makefile'; \
+        $(am__cd) $(top_srcdir) && \
+          $(AUTOMAKE) --gnu src/edje_externals/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+        @case '$?' in \
+          *config.status*) \
+            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+          *) \
+            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+        esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
+        @$(NORMAL_INSTALL)
+        test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
+        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
+        list2=; for p in $$list; do \
+          if test -f $$p; then \
+            list2="$$list2 $$p"; \
+          else :; fi; \
+        done; \
+        test -z "$$list2" || { \
+          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgdir)'"; \
+          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgdir)"; \
+        }
+
+uninstall-pkgLTLIBRARIES:
+        @$(NORMAL_UNINSTALL)
+        @list='$(pkg_LTLIBRARIES)'; test -n "$(pkgdir)" || list=; \
+        for p in $$list; do \
+          $(am__strip_dir) \
+          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$f'"; \
+          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgdir)/$$f"; \
+        done
+
+clean-pkgLTLIBRARIES:
+        -test -z "$(pkg_LTLIBRARIES)" || rm -f $(pkg_LTLIBRARIES)
+        @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+          test "$$dir" != "$$p" || dir=.; \
+          echo "rm -f \"$${dir}/so_locations\""; \
+          rm -f "$${dir}/so_locations"; \
+        done
+module.la: $(module_la_OBJECTS) $(module_la_DEPENDENCIES) 
+        $(AM_V_CCLD)$(module_la_LINK) -rpath $(pkgdir) $(module_la_OBJECTS) $(module_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+        -rm -f *.$(OBJEXT)
+
+distclean-compile:
+        -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_actionslider.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_bubble.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_button.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_calendar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_check.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_clock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_entry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_fileselector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_fileselector_button.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_fileselector_entry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_frame.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_gengrid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_genlist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_hoversel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_icon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_index.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_label.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_map.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_multibuttonentry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_naviframe.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_notify.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_panes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_photocam.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_progressbar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_radio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_scroller.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_segment_control.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_slider.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_slideshow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_spinner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_thumb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_toolbar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_video.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elm_web.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+        -rm -f *.lo
+
+clean-libtool:
+        -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        set x; \
+        here=`pwd`; \
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        shift; \
+        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          if test $$# -gt 0; then \
+            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+              "$$@" $$unique; \
+          else \
+            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+              $$unique; \
+          fi; \
+        fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+                $(TAGS_FILES) $(LISP)
+        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+        unique=`for i in $$list; do \
+            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+          done | \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
+        test -z "$(CTAGS_ARGS)$$unique" \
+          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+             $$unique
+
+GTAGS:
+        here=`$(am__cd) $(top_builddir) && pwd` \
+          && $(am__cd) $(top_srcdir) \
+          && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+        list='$(DISTFILES)'; \
+          dist_files=`for file in $$list; do echo $$file; done | \
+          sed -e "s|^$$srcdirstrip/||;t" \
+              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+        case $$dist_files in \
+          */*) $(MKDIR_P) `echo "$$dist_files" | \
+                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                           sort -u` ;; \
+        esac; \
+        for file in $$dist_files; do \
+          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+          if test -d $$d/$$file; then \
+            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+            if test -d "$(distdir)/$$file"; then \
+              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+            fi; \
+            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+            fi; \
+            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+          else \
+            test -f "$(distdir)/$$file" \
+            || cp -p $$d/$$file "$(distdir)/$$file" \
+            || exit 1; \
+          fi; \
+        done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+        for dir in "$(DESTDIR)$(pkgdir)"; do \
+          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+        done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+          `test -z '$(STRIP)' || \
+            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+        @echo "This command is intended for maintainers to use"
+        @echo "it deletes files that may require special tools to rebuild."
+        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
+        mostlyclean-am
+
+distclean: distclean-am
+        -rm -rf ./$(DEPDIR)
+        -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+        distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+        -rm -rf ./$(DEPDIR)
+        -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+        clean-libtool clean-pkgLTLIBRARIES ctags distclean \
+        distclean-compile distclean-generic distclean-libtool \
+        distclean-tags distdir dvi dvi-am html html-am info info-am \
+        install install-am install-data install-data-am install-dvi \
+        install-dvi-am install-exec install-exec-am install-html \
+        install-html-am install-info install-info-am install-man \
+        install-pdf install-pdf-am install-pkgLTLIBRARIES install-ps \
+        install-ps-am install-strip installcheck installcheck-am \
+        installdirs maintainer-clean maintainer-clean-generic \
+        mostlyclean mostlyclean-compile mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+        uninstall-am uninstall-pkgLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libraries/elementary/src/edje_externals/elm.c b/libraries/elementary/src/edje_externals/elm.c
new file mode 100644
index 0000000..ced69b8
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm.c
@@ -0,0 +1,319 @@
+#include "Elementary.h"
+#include "private.h"
+
+int _elm_ext_log_dom = -1;
+
+static int init_count = 0;
+
+void
+external_elm_init(void)
+{
+   int argc = 0;
+   char **argv = NULL;
+
+   init_count++;
+   DBG("elm_real_init\n");
+   if (init_count > 1) return;
+   ecore_app_args_get(&argc, &argv);
+   elm_init(argc, argv);
+}
+
+static void
+external_elm_shutdown(void)
+{
+   init_count--;
+   DBG("elm_real_shutdown\n");
+   if (init_count > 0) return;
+   elm_shutdown();
+}
+
+static void
+_external_obj_del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
+                                  _external_obj_del);
+   external_elm_shutdown();
+}
+
+void
+external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const char *source)
+{
+   char *_signal = strdup(sig);
+   char *p = _signal;
+   Evas_Object *content;
+
+   while ((*p!='\0') && (*p!=']'))
+     p++;
+
+
+   if ((*p=='\0') || (*(p+1)!=':'))
+     {
+        ERR("Invalid External Signal received: '%s' '%s'\n", sig, source);
+        free(_signal);
+        return ;
+     }
+
+   *p = '\0';
+   p+=2; //jump ']' and ':'
+
+   Edje_External_Type *type = evas_object_data_get(obj, "Edje_External_Type");
+   if (!type->content_get)
+     {
+        ERR("external type '%s' from module '%s' does not provide content_get()",
+            type->module_name, type->module);
+        free(_signal);
+        return ;
+     }
+
+   content = type->content_get(type->data, obj, _signal);
+   free(_signal);
+   if (content)
+     edje_object_signal_emit(content, sig + (p - _signal), source);
+}
+
+const char *
+external_translate(void *data __UNUSED__, const char *orig)
+{
+   // in future, mark all params as translatable and use dgettext()
+   // with "elementary" text domain here.
+   return orig;
+}
+
+typedef struct {
+   const char *emission;
+   const char *source;
+   Evas_Object *edje;
+} Elm_External_Signals_Proxy_Context;
+
+static void
+_external_signal_proxy_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_External_Signals_Proxy_Context *ctxt = data;
+   free(ctxt);
+}
+
+static void
+_external_signal_proxy_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Elm_External_Signals_Proxy_Context *ctxt = data;
+   // TODO: Is it worth to check Evas_Smart_Cb_Description and do something
+   // TODO: with event_info given its description?
+   edje_object_signal_emit(ctxt->edje, ctxt->emission, ctxt->source);
+}
+
+Eina_Bool
+external_common_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "style"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_style_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "disabled"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_object_disabled_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   return EINA_FALSE;
+}
+
+Eina_Bool
+external_common_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "style"))
+     {
+         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+           {
+              elm_object_style_set(obj, param->s);
+              return EINA_TRUE;
+           }
+     }
+   else if (!strcmp(param->name, "disabled"))
+     {
+         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+           {
+              elm_object_disabled_set(obj, param->i);
+              return EINA_TRUE;
+           }
+     }
+   return EINA_FALSE;
+}
+
+void
+external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_name)
+{
+   const Evas_Smart_Cb_Description **cls_descs, **inst_descs;
+   unsigned int cls_count, inst_count, total;
+   Elm_External_Signals_Proxy_Context *ctxt;
+
+   evas_object_smart_callbacks_descriptions_get
+     (obj, &cls_descs, &cls_count, &inst_descs, &inst_count);
+
+   total = cls_count + inst_count;
+   if (!total) return;
+   ctxt = malloc(sizeof(Elm_External_Signals_Proxy_Context) * total);
+   if (!ctxt) return;
+   evas_object_event_callback_add
+     (obj, EVAS_CALLBACK_FREE, _external_signal_proxy_free_cb, ctxt);
+
+   for (; cls_count > 0; cls_count--,  cls_descs++, ctxt++)
+     {
+        const Evas_Smart_Cb_Description *d = *cls_descs;
+        ctxt->emission = d->name;
+        ctxt->source = part_name;
+        ctxt->edje = edje;
+        evas_object_smart_callback_add
+          (obj, d->name, _external_signal_proxy_cb, ctxt);
+     }
+
+   for (; inst_count > 0; inst_count--,  inst_descs++, ctxt++)
+     {
+        const Evas_Smart_Cb_Description *d = *inst_descs;
+        ctxt->emission = d->name;
+        ctxt->source = part_name;
+        ctxt->edje = edje;
+        evas_object_smart_callback_add
+          (obj, d->name, _external_signal_proxy_cb, ctxt);
+     }
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
+                                  _external_obj_del, NULL);
+}
+
+void
+external_common_params_parse(void *mem, void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params *p;
+   const Eina_List *l;
+   Edje_External_Param *param;
+
+   p = mem;
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "style"))
+          p->style = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "disabled"))
+          {
+             p->disabled = param->i;
+             p->disabled_exists = EINA_TRUE;
+          }
+     }
+}
+
+void
+external_common_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params *p;
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->style)
+      elm_object_style_set(obj, p->style);
+   if (p->disabled_exists)
+     elm_object_disabled_set(obj, p->disabled);
+}
+
+Evas_Object *
+external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p)
+{
+   Evas_Object *edje, *parent_widget, *icon;
+   const char *file;
+
+   if ((!p) || (!p->s) || (p->type != EDJE_EXTERNAL_PARAM_TYPE_STRING))
+       return NULL;
+
+   edje = evas_object_smart_parent_get(obj);
+   edje_object_file_get(edje, &file, NULL);
+
+   parent_widget = elm_widget_parent_widget_get(obj);
+   if (!parent_widget)
+     parent_widget = edje;
+   icon = elm_icon_add(parent_widget);
+
+   if (elm_icon_file_set(icon, file, p->s))
+     return icon;
+   if (elm_icon_standard_set(icon, p->s))
+     return icon;
+
+   evas_object_del(icon);
+   return NULL;
+}
+
+void
+external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Eina_List *params)
+{
+   Edje_External_Param *p = edje_external_param_find(params, "icon");
+   *icon = external_common_param_icon_get(obj, p);
+}
+
+Evas_Object *
+external_common_param_edje_object_get(Evas_Object *obj, const Edje_External_Param *p)
+{
+   Evas_Object *edje, *parent_widget, *ret;
+   const char *file;
+
+   if ((!p) || (!p->s) || (p->type != EDJE_EXTERNAL_PARAM_TYPE_STRING))
+       return NULL;
+
+   edje = evas_object_smart_parent_get(obj);
+   edje_object_file_get(edje, &file, NULL);
+
+   parent_widget = elm_widget_parent_widget_get(obj);
+   if (!parent_widget)
+     parent_widget = edje;
+
+   ret = edje_object_add(evas_object_evas_get(parent_widget));
+
+   if (edje_object_file_set(ret, file, p->s))
+     return ret;
+
+   evas_object_del(ret);
+   return NULL;
+}
+
+void
+external_common_params_free(void *params)
+{
+   Elm_Params *p = params;
+   if (p->style)
+     eina_stringshare_del(p->style);
+}
+
+#define DEFINE_TYPE(type_name) \
+  extern const Edje_External_Type external_##type_name##_type;
+#include "modules.inc"
+#undef DEFINE_TYPE
+
+static Edje_External_Type_Info elm_external_types[] =
+{
+#define DEFINE_TYPE(type_name)              \
+  {"elm/"#type_name, &external_##type_name##_type},
+#include "modules.inc"
+#undef DEFINE_TYPE
+   {NULL, NULL}
+};
+
+static Eina_Bool
+elm_mod_init(void)
+{
+   _elm_ext_log_dom = eina_log_domain_register("elm-externals", EINA_COLOR_LIGHTBLUE);
+   edje_external_type_array_register(elm_external_types);
+   return EINA_TRUE;
+}
+
+static void
+elm_mod_shutdown(void)
+{
+   edje_external_type_array_unregister(elm_external_types);
+   if (_elm_ext_log_dom >= 0) eina_log_domain_unregister(_elm_ext_log_dom);
+   _elm_ext_log_dom = -1;
+}
+
+EINA_MODULE_INIT(elm_mod_init);
+EINA_MODULE_SHUTDOWN(elm_mod_shutdown);
diff --git a/libraries/elementary/src/edje_externals/elm_actionslider.c b/libraries/elementary/src/edje_externals/elm_actionslider.c
new file mode 100644
index 0000000..aeef27e
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_actionslider.c
@@ -0,0 +1,99 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Actionslider
+{
+   Elm_Params base;
+   const char *label;
+} Elm_Params_Actionslider;
+
+static void
+external_actionslider_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Actionslider *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+}
+
+static Eina_Bool
+external_actionslider_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
+{
+   if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+       && (!strcmp(param->name, "label")))
+     {
+        elm_object_text_set(obj, param->s);
+        return EINA_TRUE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_actionslider_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+{
+   if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+       && (!strcmp(param->name, "label")))
+     {
+        param->s = elm_object_text_get(obj);
+        return EINA_TRUE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_actionslider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Actionslider *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Actionslider);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "label"))
+          {
+             mem->label = eina_stringshare_add(param->s);
+             break;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_actionslider_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_actionslider_params_free(void *params)
+{
+   Elm_Params_Actionslider *mem = params;
+   if (mem->label)
+     eina_stringshare_del(mem->label);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_actionslider_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(actionslider, "actionslider")
+DEFINE_EXTERNAL_TYPE_SIMPLE(actionslider, "Actionslider");
diff --git a/libraries/elementary/src/edje_externals/elm_bubble.c b/libraries/elementary/src/edje_externals/elm_bubble.c
new file mode 100644
index 0000000..ee43e07
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_bubble.c
@@ -0,0 +1,168 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Bubble
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   const char *info;
+   Evas_Object *content; /* part name whose obj is to be set as content */
+} Elm_Params_Bubble;
+
+static void
+external_bubble_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Bubble *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label) elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->info) elm_object_part_text_set(obj, "info", p->info);
+   if (p->content) elm_object_content_set(obj, p->content);
+}
+
+static Eina_Bool
+external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+        return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "info"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_part_text_set(obj, "info", param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "content"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *content = \
+                    external_common_param_edje_object_get(obj, param);
+             if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
+             elm_object_content_set(obj, content);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_bubble_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "info"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_part_text_get(obj, "info");
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "content"))
+     {
+        /* not easy to get content name back from live object */
+        return EINA_FALSE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_bubble_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Bubble *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Bubble));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "info"))
+          mem->info = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "content"))
+          mem->content = external_common_param_edje_object_get(obj, param);
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_bubble_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   if (!strcmp(content, "content"))
+     return elm_object_content_get(obj);
+   ERR("unknown content '%s'", content);
+   return NULL;
+}
+
+static void
+external_bubble_params_free(void *params)
+{
+   Elm_Params_Bubble *mem = params;
+
+   if (mem->info)
+     eina_stringshare_del(mem->info);
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_bubble_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("info"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("content"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(bubble, "bubble");
+DEFINE_EXTERNAL_TYPE_SIMPLE(bubble, "Bubble");
diff --git a/libraries/elementary/src/edje_externals/elm_button.c b/libraries/elementary/src/edje_externals/elm_button.c
new file mode 100644
index 0000000..9d056df
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_button.c
@@ -0,0 +1,200 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Button
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   double autorepeat_initial;
+   double autorepeat_gap;
+   Eina_Bool autorepeat:1;
+   Eina_Bool autorepeat_exists:1;
+   Eina_Bool autorepeat_gap_exists:1;
+   Eina_Bool autorepeat_initial_exists:1;
+} Elm_Params_Button;
+
+static void
+external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Button *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->autorepeat_gap_exists)
+     elm_button_autorepeat_gap_timeout_set(obj, p->autorepeat_gap);
+   if (p->autorepeat_initial_exists)
+     elm_button_autorepeat_initial_timeout_set(obj, p->autorepeat_initial);
+   if (p->autorepeat_exists)
+     elm_button_autorepeat_set(obj, p->autorepeat);
+}
+
+static Eina_Bool
+external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "autorepeat_initial"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_button_autorepeat_initial_timeout_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "autorepeat_gap"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_button_autorepeat_gap_timeout_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "autorepeat"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_button_autorepeat_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "autorepeat_initial"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_button_autorepeat_initial_timeout_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "autorepeat_gap"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_button_autorepeat_gap_timeout_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "autorepeat"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_button_autorepeat_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Button *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Button);
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "autorepeat_initial"))
+          {
+             mem->autorepeat_initial = param->d;
+             mem->autorepeat_initial_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "autorepeat_gap"))
+          {
+             mem->autorepeat_gap = param->d;
+             mem->autorepeat_gap_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "autorepeat"))
+          {
+             mem->autorepeat = !!param->i;
+             mem->autorepeat_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_button_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_button_params_free(void *params)
+{
+   Elm_Params_Button *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_button_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("autorepeat_initial"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("autorepeat_gap"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("autorepeat"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(button, "button");
+DEFINE_EXTERNAL_TYPE_SIMPLE(button, "Button");
diff --git a/libraries/elementary/src/edje_externals/elm_calendar.c b/libraries/elementary/src/edje_externals/elm_calendar.c
new file mode 100644
index 0000000..d3a3ea2
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_calendar.c
@@ -0,0 +1,200 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Calendar
+{
+   Elm_Params base;
+   int year_min;
+   int year_max;
+   const char *select_mode;
+
+} Elm_Params_Calendar;
+
+#define SELECT_MODE_GET(CHOICES, STR)                                \
+   unsigned int i;                                              \
+   for (i = 0; i < (sizeof(CHOICES) / sizeof(CHOICES[0])); ++i) \
+     if (!strcmp(STR, CHOICES[i]))                              \
+       return i;
+
+
+static const char *_calendar_select_modes[] = {"default", "always", "none",
+                                               "ondemand", NULL};
+
+static Elm_Calendar_Select_Mode
+_calendar_select_mode_get(const char *select_mode)
+{
+   assert(sizeof(_calendar_select_modes) /
+          sizeof(_calendar_select_modes[0])
+          == ELM_CALENDAR_SELECT_MODE_ONDEMAND + 2);
+   SELECT_MODE_GET(_calendar_select_modes, select_mode);
+   return -1;
+}
+
+static void
+external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj,
+                            const void *from_params, const void *to_params,
+                            float pos __UNUSED__)
+{
+   const Elm_Params_Calendar *p;
+   Elm_Calendar_Select_Mode select_mode;
+   int min,max;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->year_min)
+     {
+        elm_calendar_min_max_year_get(obj, NULL, &max);
+        elm_calendar_min_max_year_set(obj, p->year_min, max);
+     }
+   if (p->year_max)
+     {
+        elm_calendar_min_max_year_get(obj, &min, NULL);
+        elm_calendar_min_max_year_set(obj, min, p->year_max);
+     }
+   if (p->select_mode)
+     {
+        select_mode = _calendar_select_mode_get(p->select_mode);
+        elm_calendar_select_mode_set(obj, select_mode);
+     }
+}
+
+static Eina_Bool
+external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj,
+                            const Edje_External_Param *param)
+{
+   int min,max;
+
+   if (!strcmp(param->name, "year_min"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_calendar_min_max_year_get(obj, NULL, &max);
+             elm_calendar_min_max_year_set(obj, param->i, max);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "year_max"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_calendar_min_max_year_get(obj, &min, NULL);
+             elm_calendar_min_max_year_set(obj, min,param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "select_mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Calendar_Select_Mode select_mode;
+             select_mode = _calendar_select_mode_get(param->s);
+             elm_calendar_select_mode_set(obj, select_mode);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj,
+                            Edje_External_Param *param)
+{
+   int min, max;
+
+   if (!strcmp(param->name, "year_min"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_calendar_min_max_year_get(obj, &(param->i) ,&max);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "year_max"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_calendar_min_max_year_get(obj, &min,&(param->i));
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "select_mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Calendar_Select_Mode mode;
+             mode = elm_calendar_select_mode_get(obj);
+             param->s = _calendar_select_modes[mode];
+             return EINA_TRUE;
+          }
+     }
+
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_calendar_params_parse(void *data __UNUSED__,
+                               Evas_Object *obj __UNUSED__,
+                               const Eina_List *params)
+{
+   Elm_Params_Calendar *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Calendar));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "year_min"))
+          mem->year_min = param->i;
+
+        else if (!strcmp(param->name, "year_max"))
+          mem->year_max = param->i;
+
+        else if (!strcmp(param->name, "select_mode"))
+          mem->select_mode = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *
+external_calendar_content_get(void *data __UNUSED__,
+                              const Evas_Object *obj __UNUSED__,
+                              const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_calendar_params_free(void *params)
+{
+   Elm_Params_Calendar *mem = params;
+   if (mem->select_mode)
+     eina_stringshare_del(mem->select_mode);
+   free(params);
+}
+
+static Edje_External_Param_Info external_calendar_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_INT("year_min"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("year_max"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("select_mode"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(calendar, "calendar");
+DEFINE_EXTERNAL_TYPE_SIMPLE(calendar, "Calendar");
diff --git a/libraries/elementary/src/edje_externals/elm_check.c b/libraries/elementary/src/edje_externals/elm_check.c
new file mode 100644
index 0000000..287b734
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_check.c
@@ -0,0 +1,148 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Check
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   Eina_Bool state:1;
+   Eina_Bool state_exists:1;
+} Elm_Params_Check;
+
+static void
+external_check_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Check *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->state_exists)
+     elm_check_state_set(obj, p->state);
+}
+
+static Eina_Bool
+external_check_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "state"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_check_state_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_check_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "state"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_check_state_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_check_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Check *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Check));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "state"))
+          {
+             mem->state = !!param->i;
+             mem->state_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "label"))
+           mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_check_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_check_params_free(void *params)
+{
+   Elm_Params_Check *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_check_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL_FULL("state", 0, "unchecked", "checked"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(check, "check")
+DEFINE_EXTERNAL_TYPE_SIMPLE(check, "Check")
diff --git a/libraries/elementary/src/edje_externals/elm_clock.c b/libraries/elementary/src/edje_externals/elm_clock.c
new file mode 100644
index 0000000..c4bf9d2
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_clock.c
@@ -0,0 +1,241 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Clock
+{
+   Elm_Params base;
+   int hrs, min, sec;
+   Eina_Bool hrs_exists:1;
+   Eina_Bool min_exists:1;
+   Eina_Bool sec_exists:1;
+   Eina_Bool edit:1;
+   Eina_Bool ampm:1;
+   Eina_Bool seconds:1;
+} Elm_Params_Clock;
+
+static void
+external_clock_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Clock *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if ((p->hrs_exists) && (p->min_exists) && (p->sec_exists))
+     elm_clock_time_set(obj, p->hrs, p->min, p->sec);
+   else if ((p->hrs_exists) || (p->min_exists) || (p->sec_exists))
+     {
+        int hrs, min, sec;
+        elm_clock_time_get(obj, &hrs, &min, &sec);
+        if (p->hrs_exists)
+          hrs = p->hrs;
+        if (p->min_exists)
+          min = p->min;
+        if (p->sec_exists)
+          sec = p->sec;
+        elm_clock_time_set(obj, hrs, min, sec);
+     }
+   if (p->edit)
+     elm_clock_edit_set(obj, p->edit);
+   if (p->ampm)
+     elm_clock_show_am_pm_set(obj, p->ampm);
+   if (p->seconds)
+     elm_clock_show_seconds_set(obj, p->seconds);
+}
+
+static Eina_Bool
+external_clock_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "hours"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int hrs, min, sec;
+             elm_clock_time_get(obj, &hrs, &min, &sec);
+             elm_clock_time_set(obj, param->d, min, sec);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "minutes"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int hrs, min, sec;
+             elm_clock_time_get(obj, &hrs, &min, &sec);
+             elm_clock_time_set(obj, hrs, param->d, sec);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "seconds"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int hrs, min, sec;
+             elm_clock_time_get(obj, &hrs, &min, &sec);
+             elm_clock_time_set(obj, hrs, min, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "editable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_clock_edit_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "am/pm"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_clock_show_am_pm_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "show seconds"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_clock_show_seconds_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_clock_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "hours"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int hrs, min, sec;
+             elm_clock_time_get(obj, &hrs, &min, &sec);
+             param->i = hrs;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "minutes"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int hrs, min, sec;
+             elm_clock_time_get(obj, &hrs, &min, &sec);
+             param->i = min;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "seconds"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int hrs, min, sec;
+             elm_clock_time_get(obj, &hrs, &min, &sec);
+             param->i = sec;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "editable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_clock_edit_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "am/pm"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_clock_show_am_pm_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "show seconds"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_clock_show_seconds_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_clock_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Clock *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Clock));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "hours"))
+          {
+             mem->hrs = param->i;
+             mem->hrs_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "minutes"))
+          {
+             mem->min = param->i;
+             mem->min_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "seconds"))
+          {
+             mem->sec = param->i;
+             mem->sec_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "editable"))
+          mem->edit = !!param->i;
+        else if (!strcmp(param->name, "am/pm"))
+          mem->ampm = !!param->i;
+        else if (!strcmp(param->name, "show seconds"))
+          mem->seconds = !!param->i;
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_clock_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_clock_params_free(void *params)
+{
+   Elm_Params_Clock *mem = params;
+
+   free(mem);
+}
+
+static Edje_External_Param_Info external_clock_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_INT("hours"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("minutes"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("seconds"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("editable"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("am/pm"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("show seconds"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(clock, "clock")
+DEFINE_EXTERNAL_TYPE_SIMPLE(clock, "Clock")
diff --git a/libraries/elementary/src/edje_externals/elm_entry.c b/libraries/elementary/src/edje_externals/elm_entry.c
new file mode 100644
index 0000000..910746f
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_entry.c
@@ -0,0 +1,376 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Entry
+{
+   Elm_Params base;
+   const char *label;
+   const char *entry;
+   Evas_Object *icon;
+   Eina_Bool scrollable:1;
+   Eina_Bool scrollable_exists:1;
+   Eina_Bool single_line:1;
+   Eina_Bool single_line_exists:1;
+   Eina_Bool password:1;
+   Eina_Bool password_exists:1;
+   Eina_Bool horizontal_bounce:1;
+   Eina_Bool horizontal_bounce_exists:1;
+   Eina_Bool vertical_bounce:1;
+   Eina_Bool vertical_bounce_exists:1;
+   Eina_Bool editable:1;
+   Eina_Bool editable_exists:1;
+   const char *line_wrap;
+} Elm_Params_Entry;
+
+#define CHOICE_GET(CHOICES, STR)                \
+  unsigned int i;                               \
+  for (i = 0; i < sizeof(CHOICES)/sizeof (CHOICES)[0]; i++)         \
+    if (strcmp((STR), (CHOICES)[i]) == 0)           \
+      return i
+
+
+static const char *entry_line_wrap_choices[] = {"none", "char", "word",
+                                          "mixed", NULL};
+
+static Elm_Wrap_Type
+_entry_line_wrap_choices_setting_get(const char *line_wrap_str)
+{
+   assert(sizeof(entry_line_wrap_choices)/
+          sizeof(entry_line_wrap_choices[0]) == ELM_WRAP_LAST + 1);
+   CHOICE_GET(entry_line_wrap_choices, line_wrap_str);
+   return ELM_WRAP_LAST;
+}
+
+static void
+external_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Entry *p;
+   Eina_Bool hbounce, vbounce;
+   Elm_Wrap_Type line_wrap;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->entry)
+     elm_object_text_set(obj, p->entry);
+   if (p->scrollable_exists)
+     elm_entry_scrollable_set(obj, p->scrollable);
+   if (p->single_line_exists)
+     elm_entry_single_line_set(obj, p->single_line);
+   if (p->password_exists)
+     elm_entry_password_set(obj, p->password);
+   if (p->horizontal_bounce_exists && p->vertical_bounce_exists)
+     elm_entry_bounce_set(obj, p->horizontal_bounce, p->vertical_bounce);
+   else if (p->horizontal_bounce_exists || p->vertical_bounce_exists)
+     {
+        elm_entry_bounce_get(obj, &hbounce, &vbounce);
+        if (p->horizontal_bounce_exists)
+          elm_entry_bounce_set(obj, p->horizontal_bounce, vbounce);
+        else
+          elm_entry_bounce_set(obj, hbounce, p->vertical_bounce);
+     }
+   if (p->editable_exists)
+     elm_entry_editable_set(obj, p->editable);
+   if (p->line_wrap)
+     {
+        line_wrap = _entry_line_wrap_choices_setting_get(p->line_wrap);
+        elm_entry_line_wrap_set(obj, line_wrap);
+     }
+}
+
+static Eina_Bool
+external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "entry"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "scrollable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_entry_scrollable_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "single line"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_entry_single_line_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "password"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_entry_password_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool hbounce, vbounce;
+             elm_entry_bounce_get(obj, NULL, &vbounce);
+             hbounce = !!param->i;
+             elm_entry_bounce_set(obj, hbounce, vbounce);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool hbounce, vbounce;
+             elm_entry_bounce_get(obj, &hbounce, NULL);
+             vbounce = !!param->i;
+             elm_entry_bounce_set(obj, hbounce, vbounce);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "editable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_entry_editable_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "line wrap"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Wrap_Type line_wrap;
+             line_wrap = _entry_line_wrap_choices_setting_get(param->s);
+             if (line_wrap == ELM_WRAP_LAST) return EINA_FALSE;
+             elm_entry_line_wrap_set(obj, line_wrap);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "entry"))
+     {
+        if (param->type ==  EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "scrollable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_entry_scrollable_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "single line"))
+     {
+        if (param->type ==  EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_entry_single_line_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "password"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_entry_password_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool hbounce;
+             elm_entry_bounce_get(obj, &hbounce, NULL);
+             param->i = hbounce;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool vbounce;
+             elm_entry_bounce_get(obj, NULL, &vbounce);
+             param->i = vbounce;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "editable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_entry_editable_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "line wrap"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Wrap_Type line_wrap;
+             line_wrap = elm_entry_line_wrap_get(obj);
+             param->s = entry_line_wrap_choices[line_wrap];
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_entry_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Entry *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Entry);
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "label"))
+          {
+             mem->label = eina_stringshare_add(param->s);
+          }
+        else if (!strcmp(param->name, "entry"))
+          {
+             mem->entry = eina_stringshare_add(param->s);
+          }
+        else if (!strcmp(param->name, "scrollable"))
+          {
+             mem->scrollable = !!param->i;
+             mem->scrollable_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "single line"))
+          {
+             mem->single_line = !!param->i;
+             mem->single_line_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "password"))
+          {
+             mem->password = !!param->i;
+             mem->password_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal bounce"))
+          {
+             mem->horizontal_bounce = !!param->i;
+             mem->horizontal_bounce_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "vertical bounce"))
+          {
+             mem->vertical_bounce = !!param->i;
+             mem->vertical_bounce_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "editable"))
+          {
+             mem->editable = !!param->i;
+             mem->editable_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "line wrap"))
+          mem->line_wrap = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_entry_content_get(void *data __UNUSED__,
+                                               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_entry_params_free(void *params)
+{
+   Elm_Params_Entry *mem = params;
+   if (mem->label)
+     eina_stringshare_del(mem->label);
+   if (mem->entry)
+     eina_stringshare_del(mem->entry);
+   if (mem->line_wrap)
+     eina_stringshare_del(mem->line_wrap);
+   free(params);
+}
+
+static Edje_External_Param_Info external_entry_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("entry"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("scrollable"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("single line"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("password"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal bounce"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("vertical bounce"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("editable"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("line_wrap"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(entry, "entry");
+DEFINE_EXTERNAL_TYPE_SIMPLE(entry, "Entry");
diff --git a/libraries/elementary/src/edje_externals/elm_fileselector.c b/libraries/elementary/src/edje_externals/elm_fileselector.c
new file mode 100644
index 0000000..246698c
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_fileselector.c
@@ -0,0 +1,185 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Fileselector
+{
+   Elm_Params base;
+   Eina_Bool is_save:1;
+   Eina_Bool is_save_set:1;
+   Eina_Bool folder_only:1;
+   Eina_Bool folder_only_set:1;
+   Eina_Bool show_buttons:1;
+   Eina_Bool show_buttons_set:1;
+   Eina_Bool expandable:1;
+   Eina_Bool expandable_set:1;
+} Elm_Params_Fileselector;
+
+static void
+external_fileselector_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Fileselector *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if ((p->is_save_set) && (p->is_save))
+     elm_fileselector_is_save_set(obj, p->is_save);
+   if (p->folder_only_set)
+     elm_fileselector_folder_only_set(obj, p->folder_only);
+   if (p->show_buttons_set)
+     elm_fileselector_buttons_ok_cancel_set(obj, p->show_buttons);
+   if (p->expandable_set)
+     elm_fileselector_expandable_set(obj, p->expandable);
+}
+
+static Eina_Bool
+external_fileselector_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "save"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_is_save_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "folder only"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_folder_only_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "show buttons"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_buttons_ok_cancel_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "expandable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_expandable_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_fileselector_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "save"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_is_save_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "folder only"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_folder_only_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "show buttons"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_buttons_ok_cancel_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "expandable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_expandable_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_fileselector_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Fileselector *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Fileselector));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "save"))
+          {
+             mem->is_save = !!param->i;
+             mem->is_save_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "folder only"))
+          {
+             mem->folder_only = !!param->i;
+             mem->folder_only_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "show buttons"))
+          {
+             mem->show_buttons = !!param->i;
+             mem->show_buttons_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "expandable"))
+          {
+             mem->expandable = !!param->i;
+             mem->expandable_set = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_fileselector_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_fileselector_params_free(void *params)
+{
+   Elm_Params_Fileselector *mem = params;
+   free(mem);
+}
+
+static Edje_External_Param_Info external_fileselector_params[] =
+  {
+    DEFINE_EXTERNAL_COMMON_PARAMS,
+    EDJE_EXTERNAL_PARAM_INFO_BOOL("save"),
+    EDJE_EXTERNAL_PARAM_INFO_BOOL("folder only"),
+    EDJE_EXTERNAL_PARAM_INFO_BOOL("show buttons"),
+    EDJE_EXTERNAL_PARAM_INFO_BOOL("expandable"),
+    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+  };
+
+DEFINE_EXTERNAL_ICON_ADD(fileselector, "fileselector")
+DEFINE_EXTERNAL_TYPE_SIMPLE(fileselector, "File Selector")
+
diff --git a/libraries/elementary/src/edje_externals/elm_fileselector_button.c b/libraries/elementary/src/edje_externals/elm_fileselector_button.c
new file mode 100644
index 0000000..53aad85
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_fileselector_button.c
@@ -0,0 +1,251 @@
+#include "private.h"
+
+typedef struct _Elm_Params_fileselector_button
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+
+   struct {
+      const char *path;
+      Eina_Bool is_save:1;
+      Eina_Bool is_save_set:1;
+      Eina_Bool folder_only:1;
+      Eina_Bool folder_only_set:1;
+      Eina_Bool expandable:1;
+      Eina_Bool expandable_set:1;
+      Eina_Bool inwin_mode:1;
+      Eina_Bool inwin_mode_set:1;
+   } fs;
+} Elm_Params_fileselector_button;
+
+static void
+external_fileselector_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_fileselector_button *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon) elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->fs.path) elm_fileselector_button_path_set(obj, p->fs.path);
+   if (p->fs.is_save_set)
+     elm_fileselector_button_is_save_set(obj, p->fs.is_save);
+   if (p->fs.folder_only_set)
+     elm_fileselector_button_folder_only_set(obj, p->fs.folder_only);
+   if (p->fs.expandable_set)
+     elm_fileselector_button_expandable_set(obj, p->fs.expandable);
+   if (p->fs.inwin_mode_set)
+     elm_fileselector_button_inwin_mode_set(obj, p->fs.inwin_mode);
+}
+
+static Eina_Bool
+external_fileselector_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "path"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_fileselector_button_path_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "save"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_button_is_save_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "folder only"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_button_folder_only_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "expandable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_button_expandable_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inwin mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_button_inwin_mode_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_fileselector_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "path"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_fileselector_button_path_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "save"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_button_is_save_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "folder only"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_button_folder_only_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "expandable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_button_expandable_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inwin mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_button_inwin_mode_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_fileselector_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_fileselector_button *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_fileselector_button));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "path"))
+          mem->fs.path = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "save"))
+          {
+             mem->fs.is_save = !!param->i;
+             mem->fs.is_save_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "folder only"))
+          {
+             mem->fs.folder_only = !!param->i;
+             mem->fs.folder_only_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "expandable"))
+          {
+             mem->fs.expandable = !!param->i;
+             mem->fs.expandable_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "inwin mode"))
+          {
+             mem->fs.inwin_mode = !!param->i;
+             mem->fs.inwin_mode_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_fileselector_button_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+ static void
+external_fileselector_button_params_free(void *params)
+{
+   Elm_Params_fileselector_button *mem = params;
+
+   if (mem->fs.path)
+     eina_stringshare_del(mem->fs.path);
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_fileselector_button_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("path"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("save"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("folder only"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("expandable"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("inwin mode"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(fileselector_button, "fileselector_button");
+DEFINE_EXTERNAL_TYPE_SIMPLE(fileselector_button, "File Selector Button");
diff --git a/libraries/elementary/src/edje_externals/elm_fileselector_entry.c b/libraries/elementary/src/edje_externals/elm_fileselector_entry.c
new file mode 100644
index 0000000..11bd1fe
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_fileselector_entry.c
@@ -0,0 +1,252 @@
+#include "private.h"
+
+typedef struct _Elm_Params_fileselector_entry
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+
+   struct {
+      const char *path;
+      Eina_Bool is_save:1;
+      Eina_Bool is_save_set:1;
+      Eina_Bool folder_only:1;
+      Eina_Bool folder_only_set:1;
+      Eina_Bool expandable:1;
+      Eina_Bool expandable_set:1;
+      Eina_Bool inwin_mode:1;
+      Eina_Bool inwin_mode_set:1;
+   } fs;
+} Elm_Params_fileselector_entry;
+
+static void
+external_fileselector_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_fileselector_entry *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon) elm_object_part_content_set(obj, "button icon", p->icon);
+   if (p->fs.path) elm_fileselector_entry_selected_set(obj, p->fs.path);
+   if (p->fs.is_save_set)
+     elm_fileselector_entry_is_save_set(obj, p->fs.is_save);
+   if (p->fs.folder_only_set)
+     elm_fileselector_entry_folder_only_set(obj, p->fs.folder_only);
+   if (p->fs.expandable_set)
+     elm_fileselector_entry_expandable_set(obj, p->fs.expandable);
+   if (p->fs.inwin_mode_set)
+     elm_fileselector_entry_inwin_mode_set(obj, p->fs.inwin_mode);
+}
+
+static Eina_Bool
+external_fileselector_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "button icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "path"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_fileselector_entry_selected_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "save"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_entry_is_save_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "folder only"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_entry_folder_only_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "expandable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_entry_expandable_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inwin mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_fileselector_entry_inwin_mode_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_fileselector_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "path"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_fileselector_entry_selected_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "save"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_entry_is_save_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "folder only"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_entry_folder_only_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "expandable"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_entry_expandable_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inwin mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_fileselector_entry_inwin_mode_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_fileselector_entry_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_fileselector_entry *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_fileselector_entry));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "path"))
+          mem->fs.path = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "save"))
+          {
+             mem->fs.is_save = !!param->i;
+             mem->fs.is_save_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "folder only"))
+          {
+             mem->fs.folder_only = !!param->i;
+             mem->fs.folder_only_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "expandable"))
+          {
+             mem->fs.expandable = !!param->i;
+             mem->fs.expandable_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "inwin mode"))
+          {
+             mem->fs.inwin_mode = !!param->i;
+             mem->fs.inwin_mode_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_fileselector_entry_content_get(void *data __UNUSED__,
+                                                            const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_fileselector_entry_params_free(void *params)
+{
+   Elm_Params_fileselector_entry *mem = params;
+
+   if (mem->fs.path)
+     eina_stringshare_del(mem->fs.path);
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_fileselector_entry_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("path"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("save"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("folder only"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("expandable"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("inwin mode"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(fileselector_entry, "fileselector_entry");
+DEFINE_EXTERNAL_TYPE_SIMPLE(fileselector_entry, "File Selector Entry");
diff --git a/libraries/elementary/src/edje_externals/elm_frame.c b/libraries/elementary/src/edje_externals/elm_frame.c
new file mode 100644
index 0000000..22a4b34
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_frame.c
@@ -0,0 +1,125 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Frame
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *content; /* part name whose obj is to be set as content */
+} Elm_Params_Frame;
+
+static void
+external_frame_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Frame *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label) elm_object_text_set(obj, p->label);
+   if (p->content) elm_object_content_set(obj, p->content);
+}
+
+static Eina_Bool
+external_frame_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "content"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *content =
+                external_common_param_edje_object_get(obj,param);
+             if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
+             elm_object_content_set(obj, content);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_frame_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "content"))
+     {
+        /* not easy to get content name back from live object */
+        return EINA_FALSE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_frame_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Frame *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Frame));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "content"))
+          mem->content = external_common_param_edje_object_get(obj, param);
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_frame_content_get(void *data __UNUSED__,
+                                               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   if (!strcmp(content, "content"))
+     return elm_object_content_get(obj);
+
+   ERR("unknown content '%s'", content);
+   return NULL;
+}
+
+static void
+external_frame_params_free(void *params)
+{
+   Elm_Params_Frame *mem = params;
+
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_frame_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("content"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(frame, "frame");
+DEFINE_EXTERNAL_TYPE_SIMPLE(frame, "Frame");
diff --git a/libraries/elementary/src/edje_externals/elm_gengrid.c b/libraries/elementary/src/edje_externals/elm_gengrid.c
new file mode 100644
index 0000000..9319d5e
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_gengrid.c
@@ -0,0 +1,468 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Gengrid
+{
+   Elm_Params base;
+   Eina_Bool multi : 1;
+   Eina_Bool multi_exists : 1;
+   Eina_Bool no_select : 1;
+   Eina_Bool no_select_exists : 1;
+   Eina_Bool always_select : 1;
+   Eina_Bool always_select_exists : 1;
+   Eina_Bool h_bounce:1;
+   Eina_Bool h_bounce_exists:1;
+   Eina_Bool v_bounce:1;
+   Eina_Bool v_bounce_exists:1;
+   double    h_pagerel;
+   Eina_Bool h_pagerel_exists : 1;
+   double    v_pagerel;
+   Eina_Bool v_pagerel_exists : 1;
+   int       h_itemsize;
+   Eina_Bool h_itemsize_exists : 1;
+   int       v_itemsize;
+   Eina_Bool v_itemsize_exists : 1;
+   Eina_Bool horizontal : 1;
+   Eina_Bool horizontal_exists : 1;
+   Eina_Bool align_x_exists;
+   double align_x;
+   Eina_Bool align_y_exists;
+   double align_y;
+} Elm_Params_Gengrid;
+
+static void
+external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Gengrid *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->multi_exists)
+     elm_gengrid_multi_select_set(obj, p->multi);
+   if (p->no_select_exists)
+     {
+        if (p->no_select)
+          elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
+        else
+          elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+   if (p->always_select_exists)
+     {
+        if (p->always_select)
+          elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+        else
+          elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+   if (p->h_bounce_exists)
+     {
+        Eina_Bool h_bounce, v_bounce;
+        elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
+        elm_gengrid_bounce_set(obj, p->h_bounce, v_bounce);
+     }
+   if (p->v_bounce_exists)
+     {
+        Eina_Bool h_bounce, v_bounce;
+        elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
+        elm_gengrid_bounce_set(obj, h_bounce, p->v_bounce);
+     }
+   if (p->h_pagerel_exists)
+     {
+        double h_pagerel, v_pagerel;
+        elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
+        elm_gengrid_page_relative_set(obj, h_pagerel, p->v_pagerel);
+     }
+   if (p->v_pagerel_exists)
+     {
+        double h_pagerel, v_pagerel;
+        elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
+        elm_gengrid_page_relative_set(obj, p->h_pagerel, v_pagerel);
+     }
+   if (p->h_itemsize_exists)
+     {
+        int h_itemsize, v_itemsize;
+        elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
+        elm_gengrid_item_size_set(obj, h_itemsize, p->v_itemsize);
+     }
+   if (p->v_itemsize_exists)
+     {
+        int h_itemsize, v_itemsize;
+        elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
+        elm_gengrid_item_size_set(obj, p->h_itemsize, v_itemsize);
+     }
+   else if (p->align_x_exists || p->align_y_exists)
+     {
+        double x, y;
+        elm_gengrid_align_get(obj, &x, &y);
+        if (p->align_x_exists)
+          elm_gengrid_align_set(obj, p->align_x, y);
+        else
+          elm_gengrid_align_set(obj, x, p->align_y);
+     }
+   if (p->horizontal_exists)
+     {
+        elm_gengrid_horizontal_set(obj, p->horizontal);
+     }
+}
+
+static Eina_Bool
+external_gengrid_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "multi select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_gengrid_multi_select_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "no selected"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
+             else
+               elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+             else
+               elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "height bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
+             elm_gengrid_bounce_set(obj, param->i, v_bounce);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "width bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
+             elm_gengrid_bounce_set(obj, h_bounce, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal page relative"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double h_pagerel, v_pagerel;
+             elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
+             elm_gengrid_page_relative_set(obj, param->d, v_pagerel);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical page relative"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double h_pagerel, v_pagerel;
+             elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
+             elm_gengrid_page_relative_set(obj, h_pagerel, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal item size"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int h_itemsize, v_itemsize;
+             elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
+             elm_gengrid_item_size_set(obj, param->i, v_itemsize);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical item size"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int h_itemsize, v_itemsize;
+             elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
+             elm_gengrid_item_size_set(obj, h_itemsize, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_gengrid_horizontal_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "align x")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+     {
+        double x, y;
+        elm_gengrid_align_get(obj, &x, &y);
+        elm_gengrid_align_set(obj, param->d, y);
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "align y")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+     {
+        double x, y;
+        elm_gengrid_align_get(obj, &x, &y);
+        elm_gengrid_align_set(obj, x, param->d);
+        return EINA_TRUE;
+     }
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_gengrid_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "multi select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_gengrid_multi_select_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "no selected"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_gengrid_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_NONE)
+               param->i = EINA_TRUE;
+             else
+               param->i = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_gengrid_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_ALWAYS)
+               param->i = EINA_TRUE;
+             else
+               param->i = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "height bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
+             param->i = h_bounce;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "width bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_gengrid_bounce_get(obj, &h_bounce, &v_bounce);
+             param->i = v_bounce;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal page relative"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double h_pagerel, v_pagerel;
+             elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
+             param->d = h_pagerel;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical page relative"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double h_pagerel, v_pagerel;
+             elm_gengrid_page_relative_get(obj, &h_pagerel, &v_pagerel);
+             param->d = v_pagerel;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal item size"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int h_itemsize, v_itemsize;
+             elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
+             param->i = h_itemsize;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical item size"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             int h_itemsize, v_itemsize;
+             elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
+             param->i = v_itemsize;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_gengrid_horizontal_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "align x")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+     {
+        double x, y;
+        elm_gengrid_align_get(obj, &x, &y);
+        param->d = x;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "align y")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+     {
+        double x, y;
+        elm_gengrid_align_get(obj, &x, &y);
+        param->d = y;
+        return EINA_TRUE;
+     }
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_gengrid_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Gengrid *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Gengrid);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "multi select"))
+          {
+             mem->multi = !!param->i;
+             mem->multi_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "no selected"))
+          {
+             mem->no_select = !!param->i;
+             mem->no_select_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "always select"))
+          {
+             mem->always_select = !!param->i;
+             mem->always_select_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "height bounce"))
+          {
+             mem->h_bounce = !!param->i;
+             mem->h_bounce_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "width bounce"))
+          {
+             mem->v_bounce = !!param->i;
+             mem->v_bounce_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal page relative"))
+          {
+             mem->h_pagerel = param->d;
+             mem->h_pagerel_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "vertical page relative"))
+          {
+             mem->v_pagerel = param->d;
+             mem->v_pagerel_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal item size"))
+          {
+             mem->h_itemsize = param->i;
+             mem->h_itemsize_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "vertical item size"))
+          {
+             mem->v_itemsize = param->i;
+             mem->v_itemsize_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal"))
+          {
+             mem->horizontal = !!param->i;
+             mem->horizontal_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "align x"))
+          {
+             mem->align_x = param->d;
+             mem->align_x_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "align y"))
+          {
+             mem->align_y = param->d;
+             mem->align_y_exists = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *
+external_gengrid_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_gengrid_params_free(void *params)
+{
+   Elm_Params_Gengrid *mem = params;
+   free(mem);
+}
+
+static Edje_External_Param_Info external_gengrid_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("multi select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("no select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("always select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("height bounce"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("width bounce"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("horizontal page relative"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("vertical page relative"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("horizontal item size"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("vertical item size"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("align x"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("align y"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(gengrid, "gengrid");
+DEFINE_EXTERNAL_TYPE_SIMPLE(gengrid, "Generic Grid");
diff --git a/libraries/elementary/src/edje_externals/elm_genlist.c b/libraries/elementary/src/edje_externals/elm_genlist.c
new file mode 100644
index 0000000..2ef2b96
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_genlist.c
@@ -0,0 +1,332 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Genlist
+{
+   Elm_Params base;
+   const char *horizontal;
+   Eina_Bool multi:1;
+   Eina_Bool multi_exists:1;
+   Eina_Bool always_select:1;
+   Eina_Bool always_select_exists:1;
+   Eina_Bool no_select:1;
+   Eina_Bool no_select_exists:1;
+   Eina_Bool compress_exists:1;
+   Eina_Bool homogeneous:1;
+   Eina_Bool homogeneous_exists:1;
+   Eina_Bool h_bounce:1;
+   Eina_Bool h_bounce_exists:1;
+   Eina_Bool v_bounce:1;
+   Eina_Bool v_bounce_exists:1;
+} Elm_Params_Genlist;
+
+static const char* list_horizontal_choices[] = {"compress", "scroll", "limit", "expand", NULL};
+
+static Elm_List_Mode
+_list_horizontal_setting_get(const char *horizontal_str)
+{
+   unsigned int i;
+
+   assert(sizeof(list_horizontal_choices)/sizeof(list_horizontal_choices[0]) == ELM_LIST_LAST + 1);
+
+   for (i = 0; i < ELM_LIST_LAST; i++)
+     {
+        if (!strcmp(horizontal_str, list_horizontal_choices[i]))
+          return i;
+     }
+   return ELM_LIST_LAST;
+}
+
+static void
+external_genlist_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Genlist *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->horizontal)
+     {
+        Elm_List_Mode set = _list_horizontal_setting_get(p->horizontal);
+
+        if (set != ELM_LIST_LAST)
+           elm_genlist_mode_set(obj, set);
+     }
+   if (p->multi_exists)
+     elm_genlist_multi_select_set(obj, p->multi);
+   if (p->no_select_exists)
+     {
+        if (p->no_select)
+          elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
+        else
+          elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+   if (p->always_select_exists)
+     {
+        if (p->always_select)
+          elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+        else
+          elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+   if (p->homogeneous_exists)
+     elm_genlist_homogeneous_set(obj, p->homogeneous);
+   if ((p->h_bounce_exists) && (p->v_bounce_exists))
+     elm_genlist_bounce_set(obj, p->h_bounce, p->v_bounce);
+   else if ((p->h_bounce_exists) || (p->v_bounce_exists))
+     {
+        Eina_Bool h_bounce, v_bounce;
+
+        elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
+        if (p->h_bounce_exists)
+          elm_genlist_bounce_set(obj, p->h_bounce, v_bounce);
+        else
+          elm_genlist_bounce_set(obj, h_bounce, p->v_bounce);
+     }
+}
+
+static Eina_Bool
+external_genlist_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "horizontal mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_List_Mode set = _list_horizontal_setting_get(param->s);
+
+             if (set == ELM_LIST_LAST) return EINA_FALSE;
+             elm_genlist_mode_set(obj, set);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "multi select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_genlist_multi_select_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+             else
+               elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "no select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
+             else
+               elm_genlist_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "homogeneous"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_genlist_homogeneous_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "height bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
+             elm_genlist_bounce_set(obj, param->i, v_bounce);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "width bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
+             elm_genlist_bounce_set(obj, h_bounce, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_genlist_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "horizontal mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_List_Mode list_horizontal_set = elm_genlist_mode_get(obj);
+
+             if (list_horizontal_set == ELM_LIST_LAST)
+               return EINA_FALSE;
+
+             param->s = list_horizontal_choices[list_horizontal_set];
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "multi select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_genlist_multi_select_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_genlist_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_ALWAYS)
+               param->i = EINA_TRUE;
+             else
+               param->i = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "no select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_genlist_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_NONE)
+               param->i = EINA_TRUE;
+             else
+               param->i = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "homogeneous"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_genlist_homogeneous_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "height bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
+             param->i = h_bounce;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "width bounce"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             Eina_Bool h_bounce, v_bounce;
+             elm_genlist_bounce_get(obj, &h_bounce, &v_bounce);
+             param->i = v_bounce;
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_genlist_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Genlist *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Genlist);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "horizontal mode"))
+             mem->horizontal = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "multi select"))
+          {
+             mem->multi = !!param->i;
+             mem->multi_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "always select"))
+          {
+             mem->always_select = !!param->i;
+             mem->always_select_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "no select"))
+          {
+             mem->no_select = !!param->i;
+             mem->no_select_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "homogeneous"))
+          {
+             mem->homogeneous = !!param->i;
+             mem->homogeneous_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "height bounce"))
+          {
+             mem->h_bounce = !!param->i;
+             mem->h_bounce_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "width bounce"))
+          {
+             mem->v_bounce = !!param->i;
+             mem->v_bounce_exists = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_genlist_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_genlist_params_free(void *params)
+{
+   Elm_Params_Genlist *mem = params;
+
+   if (mem->horizontal)
+     eina_stringshare_del(mem->horizontal);
+
+   free(mem);
+}
+
+static Edje_External_Param_Info external_genlist_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("horizontal mode", "scroll", list_horizontal_choices),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("multi select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("always select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("no select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("homogeneous"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("height bounce"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("width bounce"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(genlist, "genlist");
+DEFINE_EXTERNAL_TYPE_SIMPLE(genlist, "Generic List");
diff --git a/libraries/elementary/src/edje_externals/elm_hoversel.c b/libraries/elementary/src/edje_externals/elm_hoversel.c
new file mode 100644
index 0000000..d345316
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_hoversel.c
@@ -0,0 +1,148 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Hoversel
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   Eina_Bool horizontal:1;
+   Eina_Bool horizontal_exists:1;
+} Elm_Params_Hoversel;
+
+static void
+external_hoversel_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Hoversel *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->horizontal_exists)
+      elm_hoversel_horizontal_set(obj, p->horizontal);
+}
+
+static Eina_Bool
+external_hoversel_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_hoversel_horizontal_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_hoversel_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_hoversel_horizontal_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_hoversel_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Hoversel *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Hoversel));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "horizontal"))
+          {
+             mem->horizontal = !!param->i;
+             mem->horizontal_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_hoversel_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+ static void
+external_hoversel_params_free(void *params)
+{
+   Elm_Params_Hoversel *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_hoversel_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(hoversel, "hoversel");
+DEFINE_EXTERNAL_TYPE_SIMPLE(hoversel, "Hoversel");
diff --git a/libraries/elementary/src/edje_externals/elm_icon.c b/libraries/elementary/src/edje_externals/elm_icon.c
new file mode 100644
index 0000000..fbd1c5f
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_icon.c
@@ -0,0 +1,322 @@
+#include <assert.h>
+#include "private.h"
+
+typedef struct _Elm_Params_Icon
+{
+   const char *file;
+   Eina_Bool scale_up_exists;
+   Eina_Bool scale_up : 1;
+   Eina_Bool scale_down_exists;
+   Eina_Bool scale_down : 1;
+   Eina_Bool smooth_exists;
+   Eina_Bool smooth : 1;
+   Eina_Bool fill_outside_exists;
+   Eina_Bool fill_outside : 1;
+   Eina_Bool no_scale_exists;
+   Eina_Bool no_scale : 1;
+   Eina_Bool prescale_size_exists;
+   int prescale_size;
+   Elm_Params base;
+   const char *icon;
+} Elm_Params_Icon;
+
+static Elm_Params_Icon *param_icon;
+
+static void
+external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
+                        const void *from_params, const void *to_params,
+                        float pos __UNUSED__)
+{
+   const Elm_Params_Icon *p;
+   Evas_Object *edje;
+   const char *file;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->file)
+     {
+        elm_icon_file_set(obj, p->file, NULL);
+        param_icon->file = p->file;
+     }
+   if (p->smooth_exists)
+     {
+        elm_icon_smooth_set(obj, p->smooth);
+        param_icon->smooth = p->smooth;
+     }
+   if (p->no_scale_exists)
+     {
+        elm_icon_no_scale_set(obj, p->no_scale);
+        param_icon->no_scale = p->no_scale;
+     }
+   if (p->scale_up_exists && p->scale_down_exists)
+     {
+        elm_icon_resizable_set(obj, p->scale_up, p->scale_down);
+        param_icon->scale_up = p->scale_up;
+        param_icon->scale_down = p->scale_down;
+     }
+   else if (p->scale_up_exists || p->scale_down_exists)
+     {
+        if (p->scale_up_exists)
+          {
+             elm_icon_resizable_set(obj, p->scale_up, param_icon->scale_down);
+             param_icon->scale_up = p->scale_up;
+          }
+        else
+          {
+             elm_icon_resizable_set(obj, param_icon->scale_up, p->scale_down);
+             param_icon->scale_down = p->scale_down;
+          }
+     }
+   if (p->fill_outside_exists)
+     {
+        elm_icon_fill_outside_set(obj, p->fill_outside);
+        param_icon->fill_outside = p->fill_outside;
+     }
+   if (p->prescale_size_exists)
+     {
+        elm_icon_prescale_set(obj, p->prescale_size);
+        param_icon->prescale_size = p->prescale_size;
+     }
+   if (p->icon)
+     {
+        edje = evas_object_smart_parent_get(obj);
+        edje_object_file_get(edje, &file, NULL);
+
+        if (!elm_icon_file_set(obj, file, p->icon))
+          elm_icon_standard_set(obj, p->icon);
+     }
+}
+
+static Eina_Bool
+external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
+                        const Edje_External_Param *param)
+{
+   Evas_Object *edje;
+   const char *file;
+
+   if (!strcmp(param->name, "file")
+                   && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+     {
+        Eina_Bool ret = elm_icon_file_set(obj, param->s, NULL);
+        if (ret)
+          param_icon->file = param->s;
+        return ret;
+     }
+   else if (!strcmp(param->name, "smooth")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        elm_icon_smooth_set(obj, param->i);
+        param_icon->smooth = param->i;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "no scale")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        elm_icon_no_scale_set(obj, param->i);
+        param_icon->no_scale = param->i;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale up")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        elm_icon_resizable_set(obj, param->i, param_icon->scale_down);
+        param_icon->scale_up = param->i;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale down")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        elm_icon_resizable_set(obj, param_icon->scale_up, param->i);
+        param_icon->scale_down = param->i;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "fill outside")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        elm_icon_fill_outside_set(obj, param->i);
+        param_icon->fill_outside = param->i;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "prescale")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+     {
+        elm_icon_prescale_set(obj, param->i);
+        param_icon->prescale_size = param->i;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             edje = evas_object_smart_parent_get(obj);
+             edje_object_file_get(edje, &file, NULL);
+
+             if (!elm_icon_file_set(obj, file, param->s))
+               elm_icon_standard_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_icon_param_get(void *data __UNUSED__,
+                        const Evas_Object *obj __UNUSED__,
+                        Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "file")
+                   && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+     {
+        param->s = param_icon->file;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "smooth")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->smooth;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "no scale")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->no_scale;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale up")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->scale_up;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "scale down")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->scale_down;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "fill outside")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+     {
+        param->i = param_icon->fill_outside;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "prescale")
+            && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+     {
+        param->i = param_icon->prescale_size;
+        return EINA_TRUE;
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_icon_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+                           const Eina_List *params)
+{
+   Elm_Params_Icon *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+   param_icon = calloc(1, sizeof(Elm_Params_Icon));
+   mem = ELM_NEW(Elm_Params_Icon);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "file"))
+          mem->file = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "smooth"))
+          {
+             mem->smooth = param->i;
+             mem->smooth_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "no scale"))
+          {
+             mem->no_scale = param->i;
+             mem->no_scale_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "scale up"))
+          {
+             mem->scale_up = param->i;
+             mem->scale_up_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "scale down"))
+          {
+             mem->scale_down = param->i;
+             mem->scale_down_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "fill outside"))
+          {
+             mem->fill_outside = param->i;
+             mem->fill_outside_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "prescale"))
+          {
+             mem->prescale_size = param->i;
+             mem->prescale_size_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "icon"))
+          {
+             mem->icon = eina_stringshare_add(param->s);
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *
+external_icon_content_get(void *data __UNUSED__,
+                          const Evas_Object *obj __UNUSED__,
+                          const char *content __UNUSED__)
+{
+   ERR("no content");
+   return NULL;
+}
+
+static void
+external_icon_params_free(void *params)
+{
+   Elm_Params_Icon *mem = params;
+
+   if (mem->file)
+     eina_stringshare_del(mem->file);
+
+   if (param_icon->file)
+     eina_stringshare_del(param_icon->file);
+   free(param_icon);
+
+   if (mem->icon)
+     eina_stringshare_del(mem->icon);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_icon_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("smooth"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("no scale"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("scale up"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("scale down"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("fill outside"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("prescale"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(icon, "icon");
+DEFINE_EXTERNAL_TYPE_SIMPLE(icon, "Icon");
diff --git a/libraries/elementary/src/edje_externals/elm_index.c b/libraries/elementary/src/edje_externals/elm_index.c
new file mode 100644
index 0000000..b516602
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_index.c
@@ -0,0 +1,104 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Index
+{
+   Elm_Params base;
+   Eina_Bool active:1;
+   Eina_Bool active_exists:1;
+
+} Elm_Params_Index;
+
+static void
+external_index_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Index *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->active_exists)
+     elm_index_autohide_disabled_set(obj, p->active_exists);
+}
+
+static Eina_Bool
+external_index_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "active"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_index_autohide_disabled_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_index_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "active"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_index_autohide_disabled_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_index_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Index *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Index));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "active"))
+          {
+             mem->active = !!param->i;
+             mem->active_exists = EINA_TRUE;
+          }
+
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_index_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_index_params_free(void *params)
+{
+   Elm_Params_Index *mem = params;
+   free(mem);
+}
+
+static Edje_External_Param_Info external_index_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+    EDJE_EXTERNAL_PARAM_INFO_BOOL("active"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(index, "index");
+DEFINE_EXTERNAL_TYPE_SIMPLE(index, "index");
diff --git a/libraries/elementary/src/edje_externals/elm_label.c b/libraries/elementary/src/edje_externals/elm_label.c
new file mode 100644
index 0000000..39a3afe
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_label.c
@@ -0,0 +1,100 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Label
+{
+   Elm_Params base;
+   const char* label;
+} Elm_Params_Label;
+
+static void
+external_label_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Label *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label) elm_object_text_set(obj, p->label);
+}
+
+static Eina_Bool
+external_label_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_label_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_label_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params __UNUSED__)
+{
+   Elm_Params_Label *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Label);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "label"))
+           mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_label_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("no content");
+        return NULL;
+}
+
+static void
+external_label_params_free(void *params)
+{
+   Elm_Params_Label *mem = params;
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_label_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(label, "label");
+DEFINE_EXTERNAL_TYPE_SIMPLE(label, "label");
diff --git a/libraries/elementary/src/edje_externals/elm_list.c b/libraries/elementary/src/edje_externals/elm_list.c
new file mode 100644
index 0000000..25b38aa
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_list.c
@@ -0,0 +1,317 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_List
+{
+   Elm_Params base;
+   const char *policy_h;
+   const char *policy_v;
+   const char *mode;
+   Eina_Bool h_mode : 1;
+   Eina_Bool h_mode_exists : 1;
+   Eina_Bool multi : 1;
+   Eina_Bool multi_exists : 1;
+   Eina_Bool always_select : 1;
+   Eina_Bool always_select_exists : 1;
+} Elm_Params_List;
+
+#define CHOICE_GET(CHOICES, STR)                \
+  unsigned int i;                               \
+  for (i = 0; i < (sizeof(CHOICES)/sizeof(CHOICES[0])); i++)         \
+    if (strcmp(STR, CHOICES[i]) == 0)           \
+      return i
+
+static const char *scroller_policy_choices[] = {"auto", "on", "off", NULL};
+static const char *list_mode_choices[] = {"compress", "scroll", "limit",
+                                          "expand", NULL};
+
+static Elm_Scroller_Policy
+_scroller_policy_choices_setting_get(const char *policy_str)
+{
+   assert(sizeof(scroller_policy_choices)/
+          sizeof(scroller_policy_choices[0]) == ELM_SCROLLER_POLICY_LAST + 1);
+   CHOICE_GET(scroller_policy_choices, policy_str);
+   return ELM_SCROLLER_POLICY_LAST;
+}
+
+static Elm_List_Mode
+_list_mode_setting_get(const char *mode_str)
+{
+   assert(sizeof(list_mode_choices)/sizeof(list_mode_choices[0]) ==
+          ELM_LIST_LAST + 1);
+   CHOICE_GET(list_mode_choices, mode_str);
+   return ELM_LIST_LAST;
+}
+
+static void
+external_list_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_List *p;
+   Elm_Scroller_Policy policy_h, policy_v;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->mode)
+     {
+        Elm_List_Mode set = _list_mode_setting_get(p->mode);
+
+        if (set != ELM_LIST_LAST)
+          elm_list_mode_set(obj, set);
+     }
+
+   if ((p->policy_h) && (p->policy_v))
+     {
+        policy_h = _scroller_policy_choices_setting_get(p->policy_h);
+        policy_v = _scroller_policy_choices_setting_get(p->policy_v);
+        elm_list_scroller_policy_set(obj, policy_h, policy_v);
+     }
+   else if ((p->policy_h) || (p->policy_v))
+     {
+        elm_list_scroller_policy_get(obj, &policy_h, &policy_v);
+        if (p->policy_h)
+          {
+             policy_h = _scroller_policy_choices_setting_get(p->policy_h);
+             elm_list_scroller_policy_set(obj, policy_h, policy_v);
+          }
+        else
+          {
+             policy_v = _scroller_policy_choices_setting_get(p->policy_v);
+             elm_list_scroller_policy_set(obj, policy_h, policy_v);
+          }
+     }
+
+   if (p->h_mode_exists)
+     elm_list_horizontal_set(obj, p->h_mode);
+   if (p->multi_exists)
+     elm_list_multi_select_set(obj, p->multi);
+   if (p->always_select_exists)
+     {
+        if (p->always_select)
+          elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+        else
+          elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+}
+
+static Eina_Bool
+external_list_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "list mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_List_Mode set = _list_mode_setting_get(param->s);
+             if (set == ELM_LIST_LAST) return EINA_FALSE;
+             elm_list_mode_set(obj, set);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal scroll"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Scroller_Policy h, v;
+             elm_list_scroller_policy_get(obj, &h, &v);
+             h = _scroller_policy_choices_setting_get(param->s);
+             if (h == ELM_SCROLLER_POLICY_LAST) return EINA_FALSE;
+             elm_list_scroller_policy_set(obj, h, v);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical scroll"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Scroller_Policy h, v;
+             elm_list_scroller_policy_get(obj, &h, &v);
+             v = _scroller_policy_choices_setting_get(param->s);
+             if (v == ELM_SCROLLER_POLICY_LAST) return EINA_FALSE;
+             elm_list_scroller_policy_set(obj, h, v);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_list_horizontal_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "multi-select mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_list_multi_select_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always-select mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+             else
+               elm_list_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_list_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "horizontal mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_list_horizontal_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "multi-select mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_list_multi_select_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always-select mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_list_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_ALWAYS)
+               param->i = EINA_TRUE;
+             else
+               param->i = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal scroll"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Scroller_Policy h, v;
+             elm_list_scroller_policy_get(obj, &h, &v);
+
+             param->s = scroller_policy_choices[h];
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "vertical scroll"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Scroller_Policy h, v;
+             elm_list_scroller_policy_get(obj, &h, &v);
+
+             param->s = scroller_policy_choices[v];
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "list mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_List_Mode m = elm_list_mode_get(obj);
+
+             if (m == ELM_LIST_LAST)
+               return EINA_FALSE;
+
+             param->s = list_mode_choices[m];
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_list_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_List *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_List);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "horizontal mode"))
+          {
+             mem->h_mode = param->i;
+             mem->h_mode_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "multi-select mode"))
+          {
+             mem->multi = param->i;
+             mem->multi_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "always-select mode"))
+          {
+             mem->always_select = param->i;
+             mem->always_select_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal scroll"))
+          mem->policy_h = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "vertical scroll"))
+          mem->policy_v = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "list mode"))
+          mem->mode = eina_stringshare_add(param->s);
+     }
+   return mem;
+}
+
+static Evas_Object *external_list_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_list_params_free(void *params)
+{
+   Elm_Params_List *mem = params;
+
+   if (mem->mode)
+     eina_stringshare_del(mem->mode);
+   if (mem->policy_h)
+     eina_stringshare_del(mem->policy_h);
+   if (mem->policy_v)
+     eina_stringshare_del(mem->policy_v);
+
+   free(mem);
+}
+
+static Edje_External_Param_Info external_list_params[] = {
+  DEFINE_EXTERNAL_COMMON_PARAMS,
+  EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("list mode", "scroll",
+                                       list_mode_choices),
+  EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("horizontal scroll", "auto",
+                                       scroller_policy_choices),
+  EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("vertical scroll", "auto",
+                                       scroller_policy_choices),
+  EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal mode"),
+  EDJE_EXTERNAL_PARAM_INFO_BOOL("multi-select mode"),
+  EDJE_EXTERNAL_PARAM_INFO_BOOL("always-select mode"),
+  EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(list, "list")
+DEFINE_EXTERNAL_TYPE_SIMPLE(list, "List");
diff --git a/libraries/elementary/src/edje_externals/elm_map.c b/libraries/elementary/src/edje_externals/elm_map.c
new file mode 100644
index 0000000..11c0ece
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_map.c
@@ -0,0 +1,185 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Map
+{
+   Elm_Params base;
+   const char *map_source;
+   const char *zoom_mode;
+   double zoom;
+   Eina_Bool zoom_set:1;
+} Elm_Params_Map;
+
+static const char *zoom_choices[] = {"manual",  "auto fit", "auto fill", NULL};
+
+static const char *source_choices[] =
+  {"Mapnik", "Osmarender", "CycleMap", "Maplint"};
+
+static Elm_Map_Zoom_Mode
+_zoom_mode_get(const char *map_src)
+{
+   unsigned int i;
+
+   assert(sizeof(zoom_choices)/sizeof(zoom_choices[0]) ==
+          ELM_MAP_ZOOM_MODE_LAST + 1);
+
+   for (i = 0; i < ELM_MAP_ZOOM_MODE_LAST; i++)
+     if (!strcmp(map_src, zoom_choices[i])) return i;
+
+   return ELM_MAP_ZOOM_MODE_LAST;
+}
+
+static void
+external_map_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Map *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->map_source)
+     {
+            elm_map_source_set(obj, ELM_MAP_SOURCE_TYPE_TILE, p->map_source);
+     }
+   if (p->zoom_mode)
+     {
+            Elm_Map_Zoom_Mode set = _zoom_mode_get(p->zoom_mode);
+            if (set == ELM_MAP_ZOOM_MODE_LAST) return;
+            elm_map_zoom_mode_set(obj, set);
+     }
+   if (p->zoom_set) elm_map_zoom_set(obj, p->zoom);
+}
+
+static Eina_Bool
+external_map_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "map source"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             elm_map_source_set(obj, ELM_MAP_SOURCE_TYPE_TILE, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Map_Zoom_Mode set = _zoom_mode_get(param->s);
+             if (set == ELM_MAP_ZOOM_MODE_LAST) return EINA_FALSE;
+             elm_map_zoom_mode_set(obj, set);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom level"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_map_zoom_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_map_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "map source"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             const char *set = elm_map_source_get(obj, ELM_MAP_SOURCE_TYPE_TILE);
+             param->s = set;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Map_Zoom_Mode set = elm_map_zoom_mode_get(obj);
+             if (set == ELM_MAP_ZOOM_MODE_LAST) return EINA_FALSE;
+             param->s = zoom_choices[set];
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom level"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_map_zoom_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_map_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Map *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Map));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "map source"))
+          mem->map_source = eina_stringshare_add(param->s);
+        if (!strcmp(param->name, "zoom mode"))
+          mem->zoom_mode = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "zoom level"))
+          {
+             mem->zoom = param->d;
+             mem->zoom_set = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_map_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_map_params_free(void *params)
+{
+   Elm_Params_Map *mem = params;
+
+   if (mem->map_source)
+     eina_stringshare_del(mem->map_source);
+   if (mem->zoom_mode)
+     eina_stringshare_del(mem->zoom_mode);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_map_params[] =
+  {
+    DEFINE_EXTERNAL_COMMON_PARAMS,
+    EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("map source", "Mapnik", source_choices),
+    EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", zoom_choices),
+    EDJE_EXTERNAL_PARAM_INFO_DOUBLE("zoom level"),
+    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+  };
+
+DEFINE_EXTERNAL_ICON_ADD(map, "map")
+DEFINE_EXTERNAL_TYPE_SIMPLE(map, "Map")
+
diff --git a/libraries/elementary/src/edje_externals/elm_multibuttonentry.c b/libraries/elementary/src/edje_externals/elm_multibuttonentry.c
new file mode 100644
index 0000000..63ed57a
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_multibuttonentry.c
@@ -0,0 +1,125 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Multibuttonentry
+{
+   const char *label;
+   const char *guide_text;
+} Elm_Params_Multibuttonentry;
+
+static void
+external_multibuttonentry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Multibuttonentry *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->guide_text)
+     elm_object_part_text_set(obj, "guide", p->guide_text);
+}
+
+static Eina_Bool
+external_multibuttonentry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "guide text"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_part_text_set(obj, "guide", param->s);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_multibuttonentry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "guide text"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_part_text_get(obj, "guide");
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_multibuttonentry_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Multibuttonentry *mem = NULL;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   //mem = external_common_params_parse(Elm_Params_Multibuttonentry, data, obj, params);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "guide text"))
+          mem->guide_text = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_multibuttonentry_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("so content");
+   return NULL;
+}
+
+static void
+external_multibuttonentry_params_free(void *params)
+{
+   Elm_Params_Multibuttonentry *mem = params;
+
+   if (mem->label)
+     eina_stringshare_del(mem->label);
+   if (mem->guide_text)
+     eina_stringshare_del(mem->guide_text);
+   external_common_params_free(params);
+}
+
+static Edje_External_Param_Info external_multibuttonentry_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("guide text"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(multibuttonentry, "multibuttonentry")
+DEFINE_EXTERNAL_TYPE_SIMPLE(multibuttonentry, "Multibuttonentry")
+
diff --git a/libraries/elementary/src/edje_externals/elm_naviframe.c b/libraries/elementary/src/edje_externals/elm_naviframe.c
new file mode 100644
index 0000000..60211a8
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_naviframe.c
@@ -0,0 +1,133 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Naviframe
+{
+   Elm_Params base;
+   Eina_Bool preserve_on_pop:1;
+   Eina_Bool preserve_on_pop_exists:1;
+   Eina_Bool prev_btn_auto_push:1;
+   Eina_Bool prev_btn_auto_push_exists:1;
+} Elm_Params_Naviframe;
+
+static void
+external_naviframe_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params,
+                             const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Naviframe *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->preserve_on_pop_exists)
+     elm_naviframe_content_preserve_on_pop_set(obj, p->preserve_on_pop);
+   if (p->prev_btn_auto_push_exists)
+     elm_naviframe_prev_btn_auto_pushed_set(obj, p->prev_btn_auto_push);
+}
+
+static Eina_Bool
+external_naviframe_param_set(void *data __UNUSED__, Evas_Object *obj,
+                             const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "preserve on pop"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_naviframe_content_preserve_on_pop_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "prev btn auto push"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_naviframe_prev_btn_auto_pushed_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_naviframe_param_get(void *data __UNUSED__, const Evas_Object *obj,
+                             Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "preserve on pop"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_naviframe_content_preserve_on_pop_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "prev btn auto push"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_naviframe_prev_btn_auto_pushed_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_naviframe_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+                                const Eina_List *params)
+{
+   Elm_Params_Naviframe *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = ELM_NEW(Elm_Params_Naviframe);
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "preserve on pop"))
+          {
+             mem->preserve_on_pop = !!param->i;
+             mem->preserve_on_pop_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "prev btn auto push"))
+          {
+             mem->prev_btn_auto_push = !!param->i;
+             mem->prev_btn_auto_push_exists = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_naviframe_content_get(void *data __UNUSED__,
+      const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_naviframe_params_free(void *params)
+{
+   Elm_Params_Naviframe *mem = params;
+   free(mem);
+}
+
+static Edje_External_Param_Info external_naviframe_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("preserve on pop"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("prev btn auto push"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(naviframe, "naviframe");
+DEFINE_EXTERNAL_TYPE_SIMPLE(naviframe, "Naviframe");
diff --git a/libraries/elementary/src/edje_externals/elm_notify.c b/libraries/elementary/src/edje_externals/elm_notify.c
new file mode 100644
index 0000000..d44b3f3
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_notify.c
@@ -0,0 +1,199 @@
+#include "private.h"
+#include <assert.h>
+
+
+typedef struct _Elm_Params_Notify Elm_Params_Notify;
+
+struct _Elm_Params_Notify {
+        Elm_Params base;
+        Evas_Object *content; /* part name whose obj is to be set as content */
+        Eina_Bool allow_events_exists;
+        Eina_Bool allow_events;
+        Eina_Bool timeout_exists;
+        double timeout;
+
+        const char *orient;
+};
+
+
+static const char *orients[] = {
+                "top",
+                "center",
+                "bottom",
+                "left",
+                "right",
+                "top_left",
+                "top_right",
+                "bottom_left",
+                "bottom_right",
+                NULL
+};
+
+static Elm_Notify_Orient _orient_get(const char *orient)
+{
+   unsigned int i;
+
+   assert(sizeof(orients)/sizeof(orients[0]) ==
+          ELM_NOTIFY_ORIENT_LAST + 1);
+
+   for (i = 0; i < ELM_NOTIFY_ORIENT_LAST; i++)
+     if (!strcmp(orient, orients[i])) return i;
+
+   return ELM_NOTIFY_ORIENT_LAST;
+}
+
+static void external_notify_state_set(void *data __UNUSED__,
+                Evas_Object *obj, const void *from_params,
+                const void *to_params, float pos __UNUSED__)
+{
+        const Elm_Params_Notify *p;
+
+        if (to_params) p = to_params;
+        else if (from_params) p = from_params;
+        else return;
+
+        if (p->content) {
+                elm_object_content_set(obj, p->content);
+        }
+        if (p->allow_events_exists)
+                elm_notify_allow_events_set(obj, p->allow_events);
+        if (p->timeout_exists)
+                elm_notify_timeout_set(obj, p->timeout);
+        if (p->orient)
+        {
+                Elm_Notify_Orient set = _orient_get(p->orient);
+                if (set == ELM_NOTIFY_ORIENT_LAST) return;
+                elm_notify_orient_set(obj, set);
+        }
+}
+
+static Eina_Bool external_notify_param_set(void *data __UNUSED__,
+                Evas_Object *obj, const Edje_External_Param *param)
+{
+        if ((!strcmp(param->name, "content"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING))
+        {
+                Evas_Object *content = external_common_param_edje_object_get(obj, param);
+                if ((strcmp(param->s, "")) && (!content))
+                        return EINA_FALSE;
+                elm_object_content_set(obj, content);
+                return EINA_TRUE;
+        }
+        else if ((!strcmp(param->name, "allow_events"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL))
+        {
+                elm_notify_allow_events_set(obj, param->i);
+                return EINA_TRUE;
+        }
+        else if ((!strcmp(param->name, "timeout"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE))
+        {
+                elm_notify_timeout_set(obj, param->d);
+                return EINA_TRUE;
+        }
+        else if ((!strcmp(param->name, "orient"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE))
+        {
+                Elm_Notify_Orient set = _orient_get(param->s);
+                if (set == ELM_NOTIFY_ORIENT_LAST) return EINA_FALSE;
+                elm_notify_orient_set(obj, set);
+                return EINA_TRUE;
+        }
+
+        ERR("unknown parameter '%s' of type '%s'",
+                        param->name, edje_external_param_type_str(param->type));
+
+        return EINA_FALSE;
+}
+
+static Eina_Bool external_notify_param_get(void *data __UNUSED__,
+                const Evas_Object *obj, Edje_External_Param *param)
+{
+        if (!strcmp(param->name, "content"))
+        {
+                /* not easy to get content name back from live object */
+                return EINA_FALSE;
+        }
+        else if ((!strcmp(param->name, "allow_events"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL))
+        {
+                param->i = elm_notify_allow_events_get(obj);
+                return EINA_TRUE;
+        }
+        else if ((!strcmp(param->name, "timeout"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE))
+        {
+                param->d = elm_notify_timeout_get(obj);
+                return EINA_TRUE;
+        }
+        else if ((!strcmp(param->name, "orient"))
+                        && (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE))
+        {
+                Elm_Notify_Orient set = elm_notify_orient_get(obj);
+                if (set == ELM_NOTIFY_ORIENT_LAST) return EINA_FALSE;
+                param->s = orients[set];
+                return EINA_TRUE;
+        }
+
+        ERR("unknown parameter '%s' of type '%s'",
+                        param->name, edje_external_param_type_str(param->type));
+
+        return EINA_FALSE;
+}
+
+static void * external_notify_params_parse(void *data __UNUSED__, Evas_Object *obj,
+                const Eina_List *params) {
+        Elm_Params_Notify *mem;
+        Edje_External_Param *param;
+        const Eina_List *l;
+
+        mem = calloc(1, sizeof(Elm_Params_Notify));
+        if (!mem)
+                return NULL;
+
+        EINA_LIST_FOREACH(params, l, param)
+        {
+                if (!strcmp(param->name, "content"))
+                        mem->content = external_common_param_edje_object_get(obj, param);
+                else if (!strcmp(param->name, "timeout"))
+                {
+                        mem->timeout = param->d;
+                        mem->timeout_exists = EINA_TRUE;
+                }
+                else if (!strcmp(param->name, "allow_events"))
+                {
+                        mem->allow_events = param->i;
+                        mem->allow_events_exists = EINA_TRUE;
+                }
+                else if (!strcmp(param->name, "orient"))
+                          mem->orient = eina_stringshare_add(param->s);
+        }
+
+        return mem;
+}
+
+static Evas_Object *external_notify_content_get(void *data __UNUSED__,
+                const Evas_Object *obj, const char *content)
+{
+        if (!strcmp(content, "content"))
+                return elm_object_content_get(obj);
+
+        ERR("unknown content '%s'", content);
+        return NULL;
+}
+
+static void external_notify_params_free(void *params) {
+        free(params);
+}
+
+static Edje_External_Param_Info external_notify_params[] = {
+                DEFINE_EXTERNAL_COMMON_PARAMS,
+                EDJE_EXTERNAL_PARAM_INFO_STRING("content"),
+                EDJE_EXTERNAL_PARAM_INFO_BOOL("allow_events"),
+                EDJE_EXTERNAL_PARAM_INFO_DOUBLE("timeout"),
+                EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(notify, "notify");
+DEFINE_EXTERNAL_TYPE_SIMPLE(notify, "Notify")
+;
diff --git a/libraries/elementary/src/edje_externals/elm_panes.c b/libraries/elementary/src/edje_externals/elm_panes.c
new file mode 100644
index 0000000..3b96303
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_panes.c
@@ -0,0 +1,198 @@
+#include "private.h"
+#include <assert.h>
+
+
+typedef struct _Elm_Params_Panes Elm_Params_Panes;
+
+struct _Elm_Params_Panes {
+   Elm_Params base;
+   Evas_Object *content_left;
+   Evas_Object *content_right;
+   Eina_Bool is_horizontal;
+   Eina_Bool horizontal;
+   Eina_Bool is_left_size;
+   double left_size;
+   Eina_Bool is_fixed;
+   Eina_Bool fixed;
+};
+
+static void external_panes_state_set(void *data __UNUSED__,
+      Evas_Object *obj, const void *from_params,
+      const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Panes *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->content_left)
+     elm_object_part_content_set(obj, "left", p->content_left);
+
+   if (p->content_right)
+     elm_object_part_content_set(obj, "right", p->content_right);
+
+   if (p->is_left_size)
+     elm_panes_content_left_size_set(obj, p->left_size);
+
+   if (p->is_horizontal)
+     elm_panes_horizontal_set(obj, p->horizontal);
+
+   if (p->is_fixed)
+     elm_panes_fixed_set(obj, p->fixed);
+}
+
+static Eina_Bool external_panes_param_set(void *data __UNUSED__,
+      Evas_Object *obj, const Edje_External_Param *param)
+{
+   if ((!strcmp(param->name, "content left"))
+       && (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING))
+   {
+      Evas_Object *content = external_common_param_edje_object_get(obj, param);
+      if ((strcmp(param->s, "")) && (!content))
+         return EINA_FALSE;
+      elm_object_part_content_set(obj, "left", content);
+      return EINA_TRUE;
+   }
+   else if ((!strcmp(param->name, "content right"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING))
+   {
+      Evas_Object *content = external_common_param_edje_object_get(obj, param);
+      if ((strcmp(param->s, "")) && (!content))
+        return EINA_FALSE;
+      elm_object_part_content_set(obj, "right", content);
+      return EINA_TRUE;
+   }
+   else if ((!strcmp(param->name, "horizontal"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL))
+   {
+      elm_panes_horizontal_set(obj, param->i);
+      return EINA_TRUE;
+   }
+   else if ((!strcmp(param->name, "left size"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE))
+   {
+      elm_panes_content_left_size_set(obj, param->d);
+      return EINA_TRUE;
+   }
+   else if ((!strcmp(param->name, "fixed"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL))
+   {
+      elm_panes_fixed_set(obj, param->i);
+      return EINA_TRUE;
+   }
+
+   ERR("unknown parameter '%s' of type '%s'",
+         param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_panes_param_get(void *data __UNUSED__, const Evas_Object *obj,
+                         Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "content left"))
+     {
+        /* not easy to get content name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "content right"))
+     {
+        /* not easy to get content name back from live object */
+        return EINA_FALSE;
+     }
+   else if ((!strcmp(param->name, "horizontal"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL))
+     {
+        param->i = elm_panes_horizontal_get(obj);
+        return EINA_TRUE;
+     }
+   else if ((!strcmp(param->name, "left size"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE))
+     {
+        param->d = elm_panes_content_left_size_get(obj);
+        return EINA_TRUE;
+     }
+   else if ((!strcmp(param->name, "fixed"))
+            && (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL))
+     {
+        param->i = elm_panes_fixed_get(obj);
+        return EINA_TRUE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_panes_params_parse(void *data __UNUSED__, Evas_Object *obj,
+                            const Eina_List *params)
+{
+   Elm_Params_Panes *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Panes));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "content left"))
+          mem->content_left = external_common_param_edje_object_get(obj, param);
+        else if (!strcmp(param->name, "content right"))
+          mem->content_right = external_common_param_edje_object_get(obj, param);
+        else if (!strcmp(param->name, "horizontal"))
+          {
+             mem->is_horizontal = EINA_TRUE;
+             mem->horizontal = param->i;
+          }
+        else if (!strcmp(param->name, "left size"))
+          {
+             mem->is_left_size = EINA_TRUE;
+             mem->left_size = param->d;
+          }
+        else if (!strcmp(param->name, "fixed"))
+          {
+             mem->is_fixed = EINA_TRUE;
+             mem->fixed = param->i;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *
+external_panes_content_get(void *data __UNUSED__, const Evas_Object *obj,
+                           const char *content)
+{
+   if (!strcmp(content, "left"))
+     return elm_object_part_content_get(obj, "left");
+   else if (!strcmp(content, "right"))
+     return elm_object_part_content_get(obj, "right");
+
+   ERR("unknown content '%s'", content);
+
+   return NULL;
+}
+
+static void external_panes_params_free(void *params)
+{
+   free(params);
+}
+
+static Edje_External_Param_Info external_panes_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("content left"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("content right"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("left size"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("fixed"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(panes, "panes");
+DEFINE_EXTERNAL_TYPE_SIMPLE(panes, "panes");
diff --git a/libraries/elementary/src/edje_externals/elm_photocam.c b/libraries/elementary/src/edje_externals/elm_photocam.c
new file mode 100644
index 0000000..b4711c7
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_photocam.c
@@ -0,0 +1,208 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Photocam
+{
+   Elm_Params base;
+   const char *file;
+   double zoom;
+   const char *zoom_mode;
+   Eina_Bool paused:1;
+   Eina_Bool paused_exists:1;
+   Eina_Bool zoom_exists:1;
+} Elm_Params_Photocam;
+
+static const char* choices[] = {"manual", "auto fit", "auto fill", NULL};
+
+static Elm_Photocam_Zoom_Mode
+_zoom_mode_setting_get(const char *zoom_mode_str)
+{
+   unsigned int i;
+
+   assert(sizeof(choices)/sizeof(choices[0]) == ELM_PHOTOCAM_ZOOM_MODE_LAST + 1);
+
+   for (i = 0; i < ELM_PHOTOCAM_ZOOM_MODE_LAST; i++)
+     {
+        if (!strcmp(zoom_mode_str, choices[i]))
+          return i;
+     }
+   return ELM_PHOTOCAM_ZOOM_MODE_LAST;
+}
+
+static void
+external_photocam_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Photocam *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->file)
+     elm_photocam_file_set(obj, p->file);
+   if (p->zoom_exists)
+     elm_photocam_zoom_set(obj, p->zoom);
+   if (p->zoom_mode)
+     {
+        Elm_Photocam_Zoom_Mode set = _zoom_mode_setting_get(p->zoom_mode);
+        if (set == ELM_PHOTOCAM_ZOOM_MODE_LAST) return;
+        elm_photocam_zoom_mode_set(obj, set);
+     }
+   if (p->paused_exists)
+     elm_photocam_paused_set(obj, p->paused);
+}
+
+static Eina_Bool
+external_photocam_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "file"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_photocam_file_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_photocam_zoom_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Photocam_Zoom_Mode set = _zoom_mode_setting_get(param->s);
+             if (set == ELM_PHOTOCAM_ZOOM_MODE_LAST) return EINA_FALSE;
+             elm_photocam_zoom_mode_set(obj, set);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "paused"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_photocam_paused_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_photocam_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "file"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_photocam_file_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_photocam_zoom_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Photocam_Zoom_Mode zoom_mode_set = elm_photocam_zoom_mode_get(obj);
+
+             if (zoom_mode_set == ELM_PHOTOCAM_ZOOM_MODE_LAST)
+               return EINA_FALSE;
+
+             param->s = choices[zoom_mode_set];
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "paused"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_photocam_paused_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_photocam_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Photocam *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Photocam));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "file"))
+          mem->file = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "zoom"))
+          {
+             mem->zoom = param->d;
+             mem->zoom_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "zoom mode"))
+          mem->zoom_mode = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "paused"))
+          {
+             mem->paused = !!param->i;
+             mem->paused_exists = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_photocam_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_photocam_params_free(void *params)
+{
+   Elm_Params_Photocam *mem = params;
+
+   if (mem->file)
+     eina_stringshare_del(mem->file);
+   if (mem->zoom_mode)
+     eina_stringshare_del(mem->zoom_mode);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_photocam_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("zoom"),
+   EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", choices),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("paused"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(photocam, "photocam");
+DEFINE_EXTERNAL_TYPE_SIMPLE(photocam, "Photocam");
diff --git a/libraries/elementary/src/edje_externals/elm_progressbar.c b/libraries/elementary/src/edje_externals/elm_progressbar.c
new file mode 100644
index 0000000..c202fb4
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_progressbar.c
@@ -0,0 +1,251 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Progressbar
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   const char *unit;
+   double value;
+   Evas_Coord span;
+   Eina_Bool value_exists:1;
+   Eina_Bool span_exists:1;
+   Eina_Bool inverted:1;
+   Eina_Bool inverted_exists:1;
+   Eina_Bool horizontal:1;
+   Eina_Bool horizontal_exists:1;
+} Elm_Params_Progressbar;
+
+static void
+external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Progressbar *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->span_exists)
+     elm_progressbar_span_size_set(obj, p->span);
+   if (p->value_exists)
+     elm_progressbar_value_set(obj, p->value);
+   if (p->inverted_exists)
+     elm_progressbar_inverted_set(obj, p->inverted);
+   if (p->horizontal_exists)
+     elm_progressbar_horizontal_set(obj, p->horizontal);
+   if (p->unit)
+     elm_progressbar_unit_format_set(obj, p->unit);
+}
+
+static Eina_Bool
+external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_progressbar_value_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_progressbar_horizontal_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inverted"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_progressbar_inverted_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "span"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_progressbar_span_size_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "unit format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_progressbar_unit_format_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_progressbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_progressbar_value_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_progressbar_horizontal_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inverted"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_progressbar_inverted_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "span"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             param->i = elm_progressbar_span_size_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "unit format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_progressbar_unit_format_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_progressbar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Progressbar *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Progressbar));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "span"))
+          {
+             mem->span = param->i;
+             mem->span_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "value"))
+          {
+             mem->value = param->d;
+             mem->value_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "inverted"))
+          {
+             mem->inverted = !!param->i;
+             mem->inverted_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal"))
+          {
+              mem->horizontal = !!param->i;
+              mem->horizontal_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "unit format"))
+          mem->unit = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_progressbar_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_progressbar_params_free(void *params)
+{
+   Elm_Params_Progressbar *mem = params;
+
+   if (mem->unit)
+     eina_stringshare_del(mem->unit);
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_progressbar_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("inverted"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("span"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(progressbar, "progressbar")
+DEFINE_EXTERNAL_TYPE_SIMPLE(progressbar, "Progressbar")
diff --git a/libraries/elementary/src/edje_externals/elm_radio.c b/libraries/elementary/src/edje_externals/elm_radio.c
new file mode 100644
index 0000000..6d5ee5d
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_radio.c
@@ -0,0 +1,176 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Radio
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   const char* group_name;
+   int value;
+   Eina_Bool value_exists:1;
+} Elm_Params_Radio;
+
+static void
+external_radio_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Radio *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->value_exists)
+     elm_radio_state_value_set(obj, p->value);
+   if (p->group_name)
+     {
+        Evas_Object *ed = evas_object_smart_parent_get(obj);
+        Evas_Object *group = edje_object_part_swallow_get(ed, p->group_name);
+        elm_radio_group_add(obj, group);
+     }
+}
+
+static Eina_Bool
+external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_radio_value_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "group"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *ed = evas_object_smart_parent_get(obj);
+             Evas_Object *group = edje_object_part_swallow_get(ed, param->s);
+             elm_radio_group_add(obj, group);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_radio_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             param->i = elm_radio_value_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "group"))
+     {
+        /* not easy to get group name back from live object */
+        return EINA_FALSE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_radio_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_Radio *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Radio));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "group"))
+          mem->group_name = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "value"))
+          {
+             mem->value = param->i;
+             mem->value_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_radio_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_radio_params_free(void *params)
+{
+   Elm_Params_Radio *mem = params;
+
+   if (mem->group_name)
+     eina_stringshare_del(mem->group_name);
+   if (mem->label)
+      eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_radio_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("group"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("value"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(radio, "radio")
+DEFINE_EXTERNAL_TYPE_SIMPLE(radio, "Radio")
diff --git a/libraries/elementary/src/edje_externals/elm_scroller.c b/libraries/elementary/src/edje_externals/elm_scroller.c
new file mode 100644
index 0000000..2173e3c
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_scroller.c
@@ -0,0 +1,104 @@
+#include "private.h"
+#include <assert.h>
+
+
+typedef struct _Elm_Params_Scroller Elm_Params_Scroller;
+
+struct _Elm_Params_Scroller {
+        Elm_Params base;
+        Evas_Object *content;
+};
+
+
+
+static void external_scroller_state_set(void *data __UNUSED__,
+                Evas_Object *obj, const void *from_params,
+                const void *to_params, float pos __UNUSED__)
+{
+        const Elm_Params_Scroller *p;
+
+        if (to_params) p = to_params;
+        else if (from_params) p = from_params;
+        else return;
+
+        if (p->content) {
+                elm_object_content_set(obj, p->content);
+        }
+}
+
+static Eina_Bool external_scroller_param_set(void *data __UNUSED__,
+                Evas_Object *obj, const Edje_External_Param *param)
+{
+        if (!strcmp(param->name, "content")
+                        && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+        {
+                Evas_Object *content = external_common_param_edje_object_get(obj, param);
+                if ((strcmp(param->s, "")) && (!content))
+                        return EINA_FALSE;
+                elm_object_content_set(obj, content);
+                return EINA_TRUE;
+        }
+
+        ERR("unknown parameter '%s' of type '%s'",
+                        param->name, edje_external_param_type_str(param->type));
+
+        return EINA_FALSE;
+}
+
+static Eina_Bool external_scroller_param_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+{
+        if (!strcmp(param->name, "content"))
+        {
+                /* not easy to get content name back from live object */
+                return EINA_FALSE;
+        }
+
+        ERR("unknown parameter '%s' of type '%s'",
+                        param->name, edje_external_param_type_str(param->type));
+
+        return EINA_FALSE;
+}
+
+static void * external_scroller_params_parse(void *data __UNUSED__, Evas_Object *obj,
+                const Eina_List *params) {
+        Elm_Params_Scroller *mem;
+        Edje_External_Param *param;
+        const Eina_List *l;
+
+        mem = ELM_NEW(Elm_Params_Scroller);
+        if (!mem)
+                return NULL;
+
+        EINA_LIST_FOREACH(params, l, param)
+        {
+                if (!strcmp(param->name, "content"))
+                        mem->content = external_common_param_edje_object_get(obj, param);
+        }
+
+        return mem;
+}
+
+static Evas_Object *external_scroller_content_get(void *data __UNUSED__,
+                const Evas_Object *obj, const char *content)
+{
+        if (!strcmp(content, "content"))
+                return elm_object_content_get(obj);
+
+        ERR("unknown content '%s'", content);
+        return NULL;
+}
+
+static void external_scroller_params_free(void *params) {
+        external_common_params_free(params);
+}
+
+static Edje_External_Param_Info external_scroller_params[] = {
+                DEFINE_EXTERNAL_COMMON_PARAMS,
+                EDJE_EXTERNAL_PARAM_INFO_STRING("content"),
+                EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(scroller, "scroller");
+DEFINE_EXTERNAL_TYPE_SIMPLE(scroller, "Scroller")
+;
diff --git a/libraries/elementary/src/edje_externals/elm_segment_control.c b/libraries/elementary/src/edje_externals/elm_segment_control.c
new file mode 100644
index 0000000..953feb5
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_segment_control.c
@@ -0,0 +1,75 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Segment_Control
+{
+   Elm_Params base;
+} Elm_Params_Segment_Control;
+
+static void
+external_segment_control_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Segment_Control *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+}
+
+static Eina_Bool
+external_segment_control_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
+{
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_segment_control_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
+{
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_segment_control_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params __UNUSED__)
+{
+   Elm_Params_Segment_Control *mem;
+   //Edje_External_Param *param;
+   //const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Segment_Control));
+   if (!mem)
+     return NULL;
+
+   /*
+   EINA_LIST_FOREACH(params, l, param)
+     {
+     }
+   */
+   return mem;
+}
+
+static Evas_Object *external_segment_control_content_get(void *data __UNUSED__,
+                                                         const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void
+external_segment_control_params_free(void *params)
+{
+   Elm_Params_Segment_Control *mem = params;
+   free(mem);
+}
+
+static Edje_External_Param_Info external_segment_control_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(segment_control, "segment_control");
+DEFINE_EXTERNAL_TYPE_SIMPLE(segment_control, "segment_control");
diff --git a/libraries/elementary/src/edje_externals/elm_slider.c b/libraries/elementary/src/edje_externals/elm_slider.c
new file mode 100644
index 0000000..3b349ce
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_slider.c
@@ -0,0 +1,339 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Slider
+{
+   Elm_Params base;
+   const char *label;
+   Evas_Object *icon;
+   const char *indicator, *unit;
+   double min, max, value;
+   Eina_Bool min_exists:1;
+   Eina_Bool max_exists:1;
+   Eina_Bool value_exists:1;
+   Eina_Bool inverted:1;
+   Eina_Bool inverted_exists:1;
+   Eina_Bool span:1;
+   Eina_Bool span_exists:1;
+   Eina_Bool horizontal:1;
+   Eina_Bool horizontal_exists:1;
+} Elm_Params_Slider;
+
+static void
+external_slider_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Slider *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label)
+     elm_object_text_set(obj, p->label);
+   if (p->icon)
+     elm_object_part_content_set(obj, "icon", p->icon);
+   if (p->span_exists)
+     elm_slider_span_size_set(obj, p->span);
+   if ((p->min_exists) && (p->max_exists))
+     elm_slider_min_max_set(obj, p->min, p->max);
+   else if ((p->min_exists) || (p->max_exists))
+     {
+        double min, max;
+        elm_slider_min_max_get(obj, &min, &max);
+        if (p->min_exists)
+          elm_slider_min_max_set(obj, p->min, max);
+        else
+          elm_slider_min_max_set(obj, min, p->max);
+     }
+   if (p->value_exists)
+     elm_slider_value_set(obj, p->value);
+   if (p->inverted_exists)
+     elm_slider_inverted_set(obj, p->inverted);
+   if (p->horizontal_exists)
+     elm_slider_horizontal_set(obj, p->horizontal);
+   if (p->indicator)
+     elm_slider_indicator_format_set(obj, p->indicator);
+   if (p->unit)
+     elm_slider_unit_format_set(obj, p->unit);
+}
+
+static Eina_Bool
+external_slider_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_object_text_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Evas_Object *icon = external_common_param_icon_get(obj, param);
+             if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
+             elm_object_part_content_set(obj, "icon", icon);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "min"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double min, max;
+             elm_slider_min_max_get(obj, &min, &max);
+             elm_slider_min_max_set(obj, param->d, max);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "max"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double min, max;
+             elm_slider_min_max_get(obj, &min, &max);
+             elm_slider_min_max_set(obj, min, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_slider_value_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_slider_horizontal_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inverted"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_slider_inverted_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "span"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_slider_span_size_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "unit format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_slider_unit_format_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "indicator format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_slider_indicator_format_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_slider_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_object_text_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "icon"))
+     {
+        /* not easy to get icon name back from live object */
+        return EINA_FALSE;
+     }
+   else if (!strcmp(param->name, "min"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             double min, max;
+             elm_slider_min_max_get(obj, &min, &max);
+             param->d = min;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "max"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             double min, max;
+             elm_slider_min_max_get(obj, &min, &max);
+             param->d = max;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_slider_value_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_slider_horizontal_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inverted"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_slider_inverted_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "span"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             param->i = elm_slider_span_size_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "unit format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_slider_unit_format_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "indicator format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_slider_indicator_format_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_slider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Slider *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Slider));
+   if (!mem)
+     return NULL;
+
+   external_common_icon_param_parse(&mem->icon, obj, params);
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "span"))
+          {
+             mem->span = param->i;
+             mem->span_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "min"))
+          {
+             mem->min = param->d;
+             mem->min_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "max"))
+          {
+             mem->max = param->d;
+             mem->max_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "value"))
+          {
+             mem->value = param->d;
+             mem->value_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "inverted"))
+          {
+             mem->inverted = param->i;
+             mem->inverted_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal"))
+          {
+             mem->horizontal = param->i;
+             mem->horizontal_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "unit format"))
+          mem->unit = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "indicator format"))
+          mem->indicator = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "label"))
+          mem->label = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_slider_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_slider_params_free(void *params)
+{
+   Elm_Params_Slider *mem = params;
+
+   if (mem->unit)
+     eina_stringshare_del(mem->unit);
+   if (mem->indicator)
+     eina_stringshare_del(mem->indicator);
+   if (mem->label)
+     eina_stringshare_del(mem->label);
+   free(params);
+}
+
+static Edje_External_Param_Info external_slider_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 10.0),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("inverted"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("span"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("indicator format", "%1.2f"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(slider, "slider")
+DEFINE_EXTERNAL_TYPE_SIMPLE(slider, "Slider")
diff --git a/libraries/elementary/src/edje_externals/elm_slideshow.c b/libraries/elementary/src/edje_externals/elm_slideshow.c
new file mode 100644
index 0000000..ca4b7f9
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_slideshow.c
@@ -0,0 +1,182 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Slideshow
+{
+   Elm_Params base;
+   double timeout;
+   const char *transition;
+   const char *layout;
+   Eina_Bool loop:1;
+   Eina_Bool timeout_exists:1;
+   Eina_Bool loop_exists:1;
+} Elm_Params_Slideshow;
+
+static const char *transitions[] = { "fade", "black_fade", "horizontal",
+                                     "vertical", "square", NULL};
+static const char *layout[] = { "fullscreen", "not_fullscreen", NULL};
+
+static void
+external_slideshow_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Slideshow *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->timeout_exists)
+     elm_slideshow_timeout_set(obj , p->timeout);
+   if (p->loop_exists)
+     elm_slideshow_loop_set(obj, p->loop);
+   if (p->transition) {
+      elm_slideshow_transition_set(obj, p->transition);
+   }
+   if (p->layout) {
+         elm_slideshow_layout_set(obj, p->layout);
+   }
+}
+
+static Eina_Bool
+external_slideshow_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "timeout"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_slideshow_timeout_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "loop"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_slideshow_loop_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "transition"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_slideshow_transition_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "layout"))
+        {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_slideshow_layout_set(obj, param->s);
+             return EINA_TRUE;
+          }
+        }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_slideshow_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "timeout"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_slideshow_timeout_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "loop"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_slideshow_loop_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "transition"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_slideshow_transition_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "layout"))
+        {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_slideshow_layout_get(obj);
+             return EINA_TRUE;
+          }
+        }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_slideshow_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Slideshow *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Slideshow));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "timeout"))
+          {
+             mem->timeout = param->d;
+             mem->timeout_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "loop"))
+          {
+             mem->loop = param->i;
+             mem->loop_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "transition"))
+          {
+             mem->transition = param->s;
+          }
+    else if (!strcmp(param->name, "layout"))
+          {
+             mem->layout = param->s;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_slideshow_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_slideshow_params_free(void *params __UNUSED__)
+{
+   return;
+}
+
+static Edje_External_Param_Info external_slideshow_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("timeout"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("loop"),
+   EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("transition", "fade", transitions),
+   EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("layout", "fullscreen", layout),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(slideshow, "slideshow");
+DEFINE_EXTERNAL_TYPE_SIMPLE(slideshow, "Slideshow");
diff --git a/libraries/elementary/src/edje_externals/elm_spinner.c b/libraries/elementary/src/edje_externals/elm_spinner.c
new file mode 100644
index 0000000..8978cb6
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_spinner.c
@@ -0,0 +1,244 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Spinner
+{
+   Elm_Params base;
+   const char *label_format;
+   double min, max, step, value;
+   Eina_Bool min_exists:1;
+   Eina_Bool max_exists:1;
+   Eina_Bool step_exists:1;
+   Eina_Bool value_exists:1;
+   Eina_Bool wrap_exists:1;
+   Eina_Bool wrap:1;
+} Elm_Params_Spinner;
+
+static void
+external_spinner_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Spinner *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->label_format)
+     elm_spinner_label_format_set(obj, p->label_format);
+   if ((p->min_exists) && (p->max_exists))
+     elm_spinner_min_max_set(obj, p->min, p->max);
+   else if ((p->min_exists) || (p->max_exists))
+     {
+        double min, max;
+        elm_spinner_min_max_get(obj, &min, &max);
+        if (p->min_exists)
+          elm_spinner_min_max_set(obj, p->min, max);
+        else
+          elm_spinner_min_max_set(obj, min, p->max);
+     }
+   if (p->step_exists)
+     elm_spinner_step_set(obj, p->step);
+   if (p->value_exists)
+     elm_spinner_value_set(obj, p->value);
+   if (p->wrap_exists)
+     elm_spinner_wrap_set(obj, p->wrap);
+}
+
+static Eina_Bool
+external_spinner_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_spinner_label_format_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "min"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double min, max;
+             elm_spinner_min_max_get(obj, &min, &max);
+             elm_spinner_min_max_set(obj, param->d, max);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "max"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double min, max;
+             elm_spinner_min_max_get(obj, &min, &max);
+             elm_spinner_min_max_set(obj, min, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "step"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_spinner_step_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_spinner_value_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "wrap"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_spinner_wrap_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_spinner_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "label format"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_spinner_label_format_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "min"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double min, max;
+             elm_spinner_min_max_get(obj, &min, &max);
+             param->d = min;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "max"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             double min, max;
+             elm_spinner_min_max_get(obj, &min, &max);
+             param->d = max;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "step"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_spinner_step_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "value"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_spinner_value_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "wrap"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_spinner_value_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_spinner_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Spinner *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Spinner));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "label format"))
+          mem->label_format = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "min"))
+          {
+             mem->min = param->d;
+             mem->min_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "max"))
+          {
+             mem->max = param->d;
+             mem->max_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "step"))
+          {
+             mem->step = param->d;
+             mem->step_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "value"))
+          {
+             mem->value = param->d;
+             mem->value_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "wrap"))
+          {
+             mem->wrap = param->i;
+             mem->wrap_exists = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_spinner_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_spinner_params_free(void *params)
+{
+   Elm_Params_Spinner *mem = params;
+
+   if (mem->label_format)
+     eina_stringshare_del(mem->label_format);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_spinner_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label format", "%1.2f"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 100.0),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("step", 1.0),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("wrap"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(spinner, "spinner")
+DEFINE_EXTERNAL_TYPE_SIMPLE(spinner, "Spinner")
diff --git a/libraries/elementary/src/edje_externals/elm_thumb.c b/libraries/elementary/src/edje_externals/elm_thumb.c
new file mode 100644
index 0000000..08e3ee0
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_thumb.c
@@ -0,0 +1,146 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Thumb
+{
+   Elm_Params base;
+   const char *animate;
+} Elm_Params_Thumb;
+
+static const char* choices[] = {"loop", "start", "stop", NULL};
+
+static Elm_Thumb_Animation_Setting
+_anim_setting_get(const char *anim_str)
+{
+   unsigned int i;
+
+   assert(sizeof(choices)/sizeof(choices[0]) == ELM_THUMB_ANIMATION_LAST + 1);
+
+   for (i = 0; i < ELM_THUMB_ANIMATION_LAST; i++)
+     {
+        if (!strcmp(anim_str, choices[i]))
+          return i;
+     }
+   return ELM_THUMB_ANIMATION_LAST;
+}
+
+static void
+external_thumb_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Thumb *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->animate)
+     {
+        Elm_Thumb_Animation_Setting set = _anim_setting_get(p->animate);
+        if (set != ELM_THUMB_ANIMATION_LAST)
+           elm_thumb_animate_set(obj, set);
+     }
+}
+
+static Eina_Bool
+external_thumb_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "animate"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Thumb_Animation_Setting set = _anim_setting_get(param->s);
+             if (set == ELM_THUMB_ANIMATION_LAST) return EINA_FALSE;
+             elm_thumb_animate_set(obj, set);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_thumb_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "animate"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Thumb_Animation_Setting anim_set = elm_thumb_animate_get(obj);
+
+             if (anim_set == ELM_THUMB_ANIMATION_LAST)
+               return EINA_FALSE;
+
+             param->s = choices[anim_set];
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_thumb_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Thumb *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Thumb));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "animate"))
+          mem->animate = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_thumb_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_thumb_params_free(void *params)
+{
+   Elm_Params_Thumb *mem = params;
+
+   if (mem->animate)
+     eina_stringshare_del(mem->animate);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_thumb_params[] =
+  {
+    DEFINE_EXTERNAL_COMMON_PARAMS,
+    EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("animate", "loop", choices),
+    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+  };
+
+DEFINE_EXTERNAL_ICON_ADD(thumb, "thumb")
+
+static Evas_Object *
+external_thumb_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name)
+{
+   Evas_Object *parent, *obj;
+   external_elm_init();
+   parent = elm_widget_parent_widget_get(edje);
+   if (!parent) parent = edje;
+   elm_need_ethumb(); /* extra command needed */
+   obj = elm_thumb_add(parent);
+   external_signals_proxy(obj, edje, part_name);
+   return obj;
+}
+DEFINE_EXTERNAL_TYPE(thumb, "Thumbnail")
diff --git a/libraries/elementary/src/edje_externals/elm_toolbar.c b/libraries/elementary/src/edje_externals/elm_toolbar.c
new file mode 100644
index 0000000..a3fe781
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_toolbar.c
@@ -0,0 +1,311 @@
+#include <assert.h>
+
+#include "private.h"
+
+typedef struct _Elm_Params_Toolbar
+{
+   Elm_Params base;
+   int icon_size;
+   Eina_Bool icon_size_exists:1;
+   double align;
+   const char *shrink_mode;
+   Eina_Bool align_exists:1;
+   Eina_Bool always_select:1;
+   Eina_Bool always_select_exists:1;
+   Eina_Bool no_select:1;
+   Eina_Bool no_select_exists:1;
+   Eina_Bool horizontal:1;
+   Eina_Bool horizontal_exists:1;
+   Eina_Bool homogeneous:1;
+   Eina_Bool homogeneous_exists:1;
+} Elm_Params_Toolbar;
+
+#define SHRINK_GET(CHOICES, STR)         \
+   unsigned int i;                       \
+   for (i = 0; i < (sizeof(CHOICES) / sizeof(CHOICES[0])); ++i) \
+     if (!strcmp(STR, CHOICES[i]))       \
+       return i;
+
+static const char *_toolbar_shrink_modes[] = {"none", "hide",
+                                              "scroll", "menu", NULL};
+
+static Elm_Toolbar_Shrink_Mode
+_toolbar_shrink_choices_setting_get(const char *shrink_mode_str)
+{
+   assert(sizeof(_toolbar_shrink_modes) /
+          sizeof(_toolbar_shrink_modes[0]) == ELM_TOOLBAR_SHRINK_LAST + 1);
+   SHRINK_GET(_toolbar_shrink_modes, shrink_mode_str);
+   return ELM_TOOLBAR_SHRINK_LAST;
+}
+
+static void
+external_toolbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Toolbar *p;
+   Elm_Toolbar_Shrink_Mode shrink_mode;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->icon_size_exists)
+     elm_toolbar_icon_size_set(obj, p->icon_size);
+   if (p->align_exists)
+     elm_toolbar_align_set(obj, p->align);
+   if (p->no_select_exists)
+     {
+        if (p->no_select)
+          elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
+        else
+          elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+   if (p->always_select_exists)
+     {
+        if (p->always_select)
+          elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+        else
+          elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+     }
+   if (p->horizontal_exists)
+     elm_toolbar_horizontal_set(obj, p->horizontal);
+   if (p->homogeneous_exists)
+     elm_toolbar_homogeneous_set(obj, p->homogeneous);
+   if (p->shrink_mode)
+     {
+        shrink_mode = _toolbar_shrink_choices_setting_get(p->shrink_mode);
+        elm_toolbar_shrink_mode_set(obj, shrink_mode);
+     }
+}
+
+static Eina_Bool
+external_toolbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   Elm_Toolbar_Shrink_Mode shrink_mode;
+
+   if (!strcmp(param->name, "icon size"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             elm_toolbar_icon_size_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "align"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_toolbar_align_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
+             else
+               elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "no select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (param->i)
+               elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
+             else
+               elm_toolbar_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_toolbar_horizontal_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "homogeneous"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_toolbar_homogeneous_set(obj, param->i);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "shrink"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             shrink_mode = _toolbar_shrink_choices_setting_get(param->s);
+             elm_toolbar_shrink_mode_set(obj, shrink_mode);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_toolbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "icon size"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+          {
+             param->i = elm_toolbar_icon_size_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "align"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_toolbar_align_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "always select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_toolbar_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_ALWAYS)
+               param->d = EINA_TRUE;
+             else
+               param->d = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "no select"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             if (elm_toolbar_select_mode_get (obj) ==
+                 ELM_OBJECT_SELECT_MODE_NONE)
+               param->i = EINA_TRUE;
+             else
+               param->i = EINA_FALSE;
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "horizontal"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_toolbar_horizontal_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "homogeneous"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_toolbar_homogeneous_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "shrink"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             Elm_Toolbar_Shrink_Mode shrink_mode;
+             shrink_mode = elm_toolbar_shrink_mode_get(obj);
+             param->s = _toolbar_shrink_modes[shrink_mode];
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_toolbar_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Toolbar *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Toolbar));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "icon size"))
+          {
+             mem->icon_size = param->i;
+             mem->icon_size_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "align"))
+          {
+             mem->align = param->d;
+             mem->align_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "always select"))
+          {
+             mem->always_select = param->i;
+             mem->always_select_exists = param->i;
+          }
+        else if (!strcmp(param->name, "no select"))
+          {
+             mem->no_select = param->i;
+             mem->no_select_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "horizontal"))
+          {
+             mem->horizontal = param->i;
+             mem->horizontal_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "homogeneous"))
+          {
+             mem->homogeneous = param->i;
+             mem->homogeneous_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "shrink"))
+          mem->shrink_mode = eina_stringshare_add(param->s);
+     }
+
+   return mem;
+}
+
+static Evas_Object *external_toolbar_content_get(void *data __UNUSED__,
+                const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+        ERR("No content.");
+        return NULL;
+}
+
+static void
+external_toolbar_params_free(void *params)
+{
+   Elm_Params_Toolbar *mem = params;
+   if (mem->shrink_mode)
+     eina_stringshare_del(mem->shrink_mode);
+   free(mem);
+}
+
+static Edje_External_Param_Info external_toolbar_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_STRING("shrink"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("icon size"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("align"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("always select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("no select"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("horizontal"),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL("homogeneous"),
+
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(toolbar, "toolbar");
+DEFINE_EXTERNAL_TYPE_SIMPLE(toolbar, "Toolbar");
diff --git a/libraries/elementary/src/edje_externals/elm_video.c b/libraries/elementary/src/edje_externals/elm_video.c
new file mode 100644
index 0000000..e869afe
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_video.c
@@ -0,0 +1,261 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Video
+{
+   Elm_Params base;
+   const char *file;
+   const char *uri;
+   Eina_Bool play:1;
+   Eina_Bool play_exists:1;
+   Eina_Bool pause:1;
+   Eina_Bool pause_exists:1;
+   Eina_Bool stop:1;
+   Eina_Bool stop_exists:1;
+   Eina_Bool audio_mute:1;
+   Eina_Bool audio_mute_exists:1;
+   double audio_level;
+   Eina_Bool audio_level_exists:1;
+   double play_position;
+   Eina_Bool play_position_exists:1;
+   Eina_Bool remember_position:1;
+   Eina_Bool remember_position_exists:1;
+} Elm_Params_Video;
+
+static void
+external_video_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Video *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->file) elm_video_file_set(obj, p->file);
+   if (p->uri) elm_video_file_set(obj, p->uri);
+   if (p->play_exists && p->play) elm_video_play(obj);
+   if (p->pause_exists && p->pause) elm_video_pause(obj);
+   if (p->stop_exists && p->stop) elm_video_stop(obj);
+   if (p->audio_mute_exists) elm_video_audio_mute_set(obj, p->audio_mute);
+   if (p->audio_level_exists) elm_video_audio_level_set(obj, p->audio_level);
+   if (p->play_position_exists)
+     elm_video_play_position_set(obj, p->play_position);
+   if (p->remember_position_exists)
+     elm_video_remember_position_set(obj, p->remember_position);
+}
+
+static Eina_Bool
+external_video_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+       && (!strcmp(param->name, "file")))
+     {
+        elm_video_file_set(obj, param->s);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+       && (!strcmp(param->name, "uri")))
+     {
+        elm_video_file_set(obj, param->s);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+       && (!strcmp(param->name, "play")))
+     {
+        if (param->i)
+          elm_video_play(obj);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+       && (!strcmp(param->name, "pause")))
+     {
+        if (param->i)
+          elm_video_pause(obj);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+       && (!strcmp(param->name, "stop")))
+     {
+        if (param->i)
+          elm_video_stop(obj);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+       && (!strcmp(param->name, "audio mute")))
+     {
+        elm_video_audio_mute_set(obj, param->i);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+       && (!strcmp(param->name, "audio level")))
+     {
+        elm_video_audio_level_set(obj, param->d);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+       && (!strcmp(param->name, "play position")))
+     {
+        elm_video_play_position_set(obj, param->d);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+       && (!strcmp(param->name, "remember position")))
+     {
+        elm_video_remember_position_set(obj, param->i);
+        return EINA_TRUE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_video_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+       && (!strcmp(param->name, "file")))
+     {
+        //        param->s = elm_video_file_get(obj);
+        //        return EINA_TRUE;
+        return EINA_FALSE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+                && (!strcmp(param->name, "uri")))
+     {
+        //        elm_video_uri_get(obj, param->s);
+        //        return EINA_TRUE;
+        return EINA_FALSE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+            && (!strcmp(param->name, "play")))
+     {
+        //        param->i = elm_video_play_get(obj); return EINA_TRUE;
+        return EINA_FALSE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+            && (!strcmp(param->name, "pause")))
+     {
+             //        param->i = elm_video_pause_get(obj); return EINA_TRUE;
+        return EINA_FALSE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+            && (!strcmp(param->name, "stop")))
+     {
+        //        param->i = elm_video_stop_get(obj); return EINA_TRUE;
+        return EINA_FALSE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+            && (!strcmp(param->name, "audio mute")))
+     {
+        param->i = elm_video_audio_mute_get(obj);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) &&
+            (!strcmp(param->name, "audio level")))
+     {
+        param->d = elm_video_audio_level_get(obj);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+            && (!strcmp(param->name, "play position")))
+     {
+        param->d = elm_video_play_position_get(obj);
+        return EINA_TRUE;
+     }
+   else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+            && (!strcmp(param->name, "remember position")))
+     {
+        param->i = elm_video_remember_position_get(obj);
+        return EINA_TRUE;
+     }
+
+   ERR("unknown parameter '%s' of type '%s'", param->name,
+       edje_external_param_type_str(param->type));
+
+   return EINA_FALSE; }
+
+static void * external_video_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Video *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Video));
+   if (!mem) return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "file"))
+          mem->file = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "uri"))
+          mem->uri = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "play"))
+          {
+             mem->play = param->i;
+             mem->play_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "pause"))
+          {
+             mem->pause = param->i;
+             mem->pause_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "stop"))
+          {
+             mem->stop = param->i;
+             mem->stop_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "audio mute"))
+          {
+             mem->audio_mute = param->i;
+             mem->audio_mute_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "audio level"))
+          {
+             mem->audio_level = param->d;
+             mem->audio_level_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "play position"))
+          {
+             mem->play_position = param->d;
+             mem->play_position_exists = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "remember position"))
+          {
+             mem->remember_position = param->i;
+             mem->remember_position = EINA_TRUE;
+          }
+     }
+   return mem;
+}
+
+static Evas_Object *external_video_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   ERR("No content.");
+   return NULL;
+}
+
+static void external_video_params_free(void *params)
+{
+   Elm_Params_Video *mem = params;
+
+   if (mem->file) eina_stringshare_del(mem->file);
+   if (mem->uri) eina_stringshare_del(mem->uri);
+   free(params);
+}
+
+static Edje_External_Param_Info external_video_params[] = {
+     DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
+     EDJE_EXTERNAL_PARAM_INFO_STRING("uri"),
+     EDJE_EXTERNAL_PARAM_INFO_BOOL("play"),
+     EDJE_EXTERNAL_PARAM_INFO_BOOL("pause"),
+     EDJE_EXTERNAL_PARAM_INFO_BOOL("stop"),
+     EDJE_EXTERNAL_PARAM_INFO_BOOL("audio mute"),
+     EDJE_EXTERNAL_PARAM_INFO_DOUBLE("audio level"),
+     EDJE_EXTERNAL_PARAM_INFO_DOUBLE("play position"),
+     EDJE_EXTERNAL_PARAM_INFO_BOOL("remember position"),
+     EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(video, "video");
+DEFINE_EXTERNAL_TYPE_SIMPLE(video, "Video");
diff --git a/libraries/elementary/src/edje_externals/elm_web.c b/libraries/elementary/src/edje_externals/elm_web.c
new file mode 100644
index 0000000..64fd373
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/elm_web.c
@@ -0,0 +1,208 @@
+#include "private.h"
+
+typedef struct _Elm_Params_Web
+{
+   Elm_Params base;
+   const char *uri;
+   double zoom;
+   Elm_Web_Zoom_Mode zoom_mode;
+   Eina_Bool inwin_mode;
+   Eina_Bool zoom_set:1;
+   Eina_Bool inwin_mode_set:1;
+} Elm_Params_Web;
+
+static const char *zoom_choices[] = {"manual", "auto fit", "auto fill", NULL};
+
+static Elm_Web_Zoom_Mode
+_zoom_mode_get(const char *zoom)
+{
+   unsigned int i;
+
+   for (i = 0; i < ELM_WEB_ZOOM_MODE_LAST; i++)
+     if (!strcmp(zoom, zoom_choices[i])) return i;
+
+   return ELM_WEB_ZOOM_MODE_LAST;
+}
+
+static void
+external_web_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_Web *p;
+
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if (p->uri)
+     elm_web_uri_set(obj, p->uri);
+   if (p->zoom_mode < ELM_WEB_ZOOM_MODE_LAST)
+     elm_web_zoom_mode_set(obj, p->zoom_mode);
+   if (p->zoom_set)
+     elm_web_zoom_set(obj, p->zoom);
+   if (p->inwin_mode_set)
+     elm_web_inwin_mode_set(obj, p->inwin_mode);
+}
+
+static Eina_Bool
+external_web_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "uri"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             elm_web_uri_set(obj, param->s);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom level"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             elm_web_zoom_set(obj, param->d);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Web_Zoom_Mode mode = _zoom_mode_get(param->s);
+             if (mode == ELM_WEB_ZOOM_MODE_LAST)
+               return EINA_FALSE;
+             elm_web_zoom_mode_set(obj, mode);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inwin mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             elm_web_inwin_mode_set(obj, !!param->i);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_web_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "uri"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+          {
+             param->s = elm_web_uri_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom level"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
+          {
+             param->d = elm_web_zoom_get(obj);
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "zoom mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
+          {
+             Elm_Web_Zoom_Mode mode = elm_web_zoom_mode_get(obj);
+             if (mode == ELM_WEB_ZOOM_MODE_LAST)
+               return EINA_FALSE;
+             param->s = zoom_choices[mode];
+             return EINA_TRUE;
+          }
+     }
+   else if (!strcmp(param->name, "inwin mode"))
+     {
+        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
+          {
+             param->i = elm_web_inwin_mode_get(obj);
+             return EINA_TRUE;
+          }
+     }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_web_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+{
+   Elm_Params_Web *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+
+   mem = calloc(1, sizeof(Elm_Params_Web));
+   if (!mem) return NULL;
+
+   mem->zoom_mode = ELM_WEB_ZOOM_MODE_LAST;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "zoom level"))
+          {
+             mem->zoom = param->d;
+             mem->zoom_set = EINA_TRUE;
+          }
+        else if (!strcmp(param->name, "zoom mode"))
+          mem->zoom_mode = _zoom_mode_get(param->s);
+        else if (!strcmp(param->name, "uri"))
+          mem->uri = eina_stringshare_add(param->s);
+        else if (!strcmp(param->name, "inwin mode"))
+          {
+             mem->inwin_mode = !!param->i;
+             mem->inwin_mode_set = EINA_TRUE;
+          }
+     }
+
+   return mem;
+}
+
+static void
+external_web_params_free(void *params)
+{
+   Elm_Params_Web *mem = params;
+
+   if (mem->uri)
+     eina_stringshare_del(mem->uri);
+   free(mem);
+}
+
+static Evas_Object *
+external_web_content_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+   return NULL;
+}
+
+static Edje_External_Param_Info external_web_params[] =
+{
+   EDJE_EXTERNAL_PARAM_INFO_STRING("uri"),
+   EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("zoom level", 1.0),
+   EDJE_EXTERNAL_PARAM_INFO_CHOICE_FULL("zoom mode", "manual", zoom_choices),
+   EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("inwin mode", EINA_FALSE),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+static Evas_Object *
+external_web_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name)
+{
+   Evas_Object *parent, *obj;
+   external_elm_init();
+   parent = elm_widget_parent_widget_get(edje);
+   if (!parent) parent = edje;
+   elm_need_web(); /* extra command needed */
+   obj = elm_web_add(parent);
+   external_signals_proxy(obj, edje, part_name);
+   return obj;
+}
+
+DEFINE_EXTERNAL_ICON_ADD(web, "web")
+DEFINE_EXTERNAL_TYPE(web, "Web")
diff --git a/libraries/elementary/src/edje_externals/modules.inc b/libraries/elementary/src/edje_externals/modules.inc
new file mode 100644
index 0000000..81e804d
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/modules.inc
@@ -0,0 +1,35 @@
+DEFINE_TYPE(actionslider)
+DEFINE_TYPE(bubble)
+DEFINE_TYPE(button)
+DEFINE_TYPE(calendar)
+DEFINE_TYPE(check)
+DEFINE_TYPE(clock)
+DEFINE_TYPE(entry)
+DEFINE_TYPE(fileselector)
+DEFINE_TYPE(fileselector_button)
+DEFINE_TYPE(fileselector_entry)
+DEFINE_TYPE(frame)
+DEFINE_TYPE(gengrid)
+DEFINE_TYPE(genlist)
+DEFINE_TYPE(hoversel)
+DEFINE_TYPE(icon)
+DEFINE_TYPE(index)
+DEFINE_TYPE(label)
+DEFINE_TYPE(list)
+DEFINE_TYPE(map)
+DEFINE_TYPE(multibuttonentry)
+DEFINE_TYPE(naviframe)
+DEFINE_TYPE(notify)
+DEFINE_TYPE(panes)
+DEFINE_TYPE(photocam)
+DEFINE_TYPE(progressbar)
+DEFINE_TYPE(radio)
+DEFINE_TYPE(scroller)
+DEFINE_TYPE(segment_control)
+DEFINE_TYPE(slider)
+DEFINE_TYPE(slideshow)
+DEFINE_TYPE(spinner)
+DEFINE_TYPE(thumb)
+DEFINE_TYPE(toolbar)
+DEFINE_TYPE(video)
+DEFINE_TYPE(web)
diff --git a/libraries/elementary/src/edje_externals/private.h b/libraries/elementary/src/edje_externals/private.h
new file mode 100644
index 0000000..4d63b0c
--- /dev/null
+++ b/libraries/elementary/src/edje_externals/private.h
@@ -0,0 +1,135 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#include "Elementary.h"
+#include "elm_priv.h"
+
+#undef CRITICAL
+#undef ERR
+#undef WRN
+#undef INF
+#undef DBG
+
+#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_ext_log_dom, __VA_ARGS__)
+#define ERR(...)      EINA_LOG_DOM_ERR (_elm_ext_log_dom, __VA_ARGS__)
+#define WRN(...)      EINA_LOG_DOM_WARN(_elm_ext_log_dom, __VA_ARGS__)
+#define INF(...)      EINA_LOG_DOM_INFO(_elm_ext_log_dom, __VA_ARGS__)
+#define DBG(...)      EINA_LOG_DOM_DBG (_elm_ext_log_dom, __VA_ARGS__)
+
+typedef struct {
+    const char *style;
+    Eina_Bool disabled:1;
+    Eina_Bool disabled_exists:1;
+} Elm_Params;
+
+extern int _elm_ext_log_dom;
+
+void external_elm_init(void);
+void external_signal(void *data, Evas_Object *obj, const char *signal, const char *source);
+void external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_name);
+const char *external_translate(void *data, const char *orig);
+void external_common_params_free(void *params);
+void *external_common_params_parse_internal(size_t params_size, void *data, Evas_Object *obj, const Eina_List *params);
+Evas_Object *external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *param);
+Evas_Object *external_common_param_edje_object_get(Evas_Object *obj, const Edje_External_Param *p);
+void external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Eina_List *params);
+Eina_Bool external_common_param_get(void *data, const Evas_Object *obj, Edje_External_Param *param);
+Eina_Bool external_common_param_set(void *data, Evas_Object *obj, const Edje_External_Param *param);
+void external_common_state_set(void *data, Evas_Object *obj, const void *from_params, const void *to_params, float pos);
+void external_common_params_parse(void *mem, void *data, Evas_Object *obj, const Eina_List *params);
+
+#define DEFINE_EXTERNAL_TYPE(type_name, name)           \
+static Eina_Bool                                        \
+_external_##type_name##_param_set(void *data, Evas_Object *obj, const Edje_External_Param *param) \
+{                                                       \
+   if (external_common_param_set(data, obj, param))     \
+      return EINA_TRUE;                                 \
+   return external_##type_name##_param_set(data, obj, param); \
+}                                                       \
+static Eina_Bool                                        \
+_external_##type_name##_param_get(void *data, const Evas_Object *obj, Edje_External_Param *param) \
+{                                                       \
+   if (external_common_param_get(data, obj, param))     \
+      return EINA_TRUE;                                 \
+   return external_##type_name##_param_get(data, obj, param); \
+}                                                       \
+static const char *                                     \
+external_##type_name##_label_get(void *data __UNUSED__) \
+{                                                       \
+    return name;                                        \
+}                                                       \
+                                                        \
+static void                                             \
+_external_##type_name##_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__) \
+{                                                       \
+   external_common_state_set(data, obj, from_params, to_params, pos); \
+   external_##type_name##_state_set(data, obj, from_params, to_params, pos); \
+}                                                       \
+                                                        \
+static void *                                           \
+_external_##type_name##_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params) \
+{                                                       \
+   void *mem = external_##type_name##_params_parse(data, obj, params); \
+   external_common_params_parse(mem, data, obj, params); \
+   return mem;                                          \
+}                                                       \
+static void                                             \
+_external_##type_name##_params_free(void *params)       \
+{                                                       \
+   external_common_params_free(params);                 \
+   external_##type_name##_params_free(params);          \
+}                                                       \
+                                                        \
+const Edje_External_Type external_##type_name##_type = {\
+    .abi_version = EDJE_EXTERNAL_TYPE_ABI_VERSION,      \
+    .module = "elm",                                    \
+    .module_name = "Elementary",                        \
+    .add = external_##type_name##_add,                  \
+    .state_set = _external_##type_name##_state_set,     \
+    .signal_emit = external_signal,                     \
+    .param_set = _external_##type_name##_param_set,     \
+    .param_get = _external_##type_name##_param_get,     \
+    .params_parse = _external_##type_name##_params_parse,\
+    .params_free = _external_##type_name##_params_free, \
+    .label_get = external_##type_name##_label_get,      \
+    .content_get = external_##type_name##_content_get,  \
+    .description_get = NULL,                            \
+    .icon_add = external_##type_name##_icon_add,        \
+    .preview_add = NULL,                                \
+    .translate = external_translate,                    \
+    .parameters_info = external_##type_name##_params,   \
+    .data = NULL                                        \
+};
+
+#define DEFINE_EXTERNAL_TYPE_SIMPLE(type_name, name)    \
+static Evas_Object *                                \
+external_##type_name##_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name) \
+{                                                                       \
+   Evas_Object *parent, *obj;                                           \
+   external_elm_init();                                                 \
+   parent = elm_widget_parent_widget_get(edje);                 \
+   if (!parent) parent = edje;                                          \
+   obj = elm_##type_name##_add(parent);                         \
+   external_signals_proxy(obj, edje, part_name);                        \
+   return obj;                                                          \
+}                                                                       \
+                                                                        \
+DEFINE_EXTERNAL_TYPE(type_name, name)
+
+#define DEFINE_EXTERNAL_ICON_ADD(type_name, name)                   \
+Evas_Object *                                                       \
+external_##type_name##_icon_add(void *data __UNUSED__, Evas *e) {   \
+   Evas_Object *ic;                                                 \
+   int w = 20, h = 10;                                              \
+                                                                    \
+   ic = edje_object_add(e);                                         \
+   edje_object_file_set(ic, PACKAGE_DATA_DIR"/edje_externals/icons.edj", "ico_"name);\
+   evas_object_size_hint_min_set(ic, w, h);                         \
+   evas_object_size_hint_max_set(ic, w, h);                         \
+                                                                    \
+   return ic;                                                       \
+}
+
+#define DEFINE_EXTERNAL_COMMON_PARAMS           \
+    EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("style", "default"), \
+    EDJE_EXTERNAL_PARAM_INFO_BOOL_DEFAULT("disabled", EINA_FALSE)