4 files changed, 312 insertions, 126 deletions

diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 6387652d6fcf..9dad8dc5644b 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	efl
-PORTVERSION=	1.19.2
-PORTREVISION=	2
+DISTVERSION=	1.20.7
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 DIST_SUBDIR=	enlightenment
@@ -20,40 +19,49 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdbus-1.so:devel/dbus \
-		libsndfile.so:audio/libsndfile
+		libsndfile.so:audio/libsndfile \
+		libunwind.so:devel/libunwind
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf compiler:c++14-lang gettext-tools gmake iconv jpeg \
 		libtool pathfix pkgconfig python:2.7,run shared-mime-info \
 		shebangfix tar:xz
 SHEBANG_FILES=	src/scripts/eina/eina-bench-cmp
-USE_XORG=	x11 xcursor xcomposite xdamage xext xfixes xi xinerama xp \
+USE_XORG=	x11 xcb xcursor xcomposite xdamage xext xfixes xi xinerama xp \
 		xrandr xrender xtst xscrnsaver
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--with-profile=release \
+		--enable-multisense \
+		--disable-systemd \
+		--disable-elput \
+		--disable-cserve \
 		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALLS_ICONS=	yes
 
 PLIST_SUB=	BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS PHYSICS PULSEAUDIO SSL
+OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS PHYSICS PULSEAUDIO SSL WAYLAND WAYLAND_EGL
 OPTIONS_GROUP=		EMOTION INPUT LOADER
 OPTIONS_GROUP_EMOTION=	GSTREAMER LIBXINE V4L VLC
 OPTIONS_GROUP_INPUT=	IBUS SCIM
 OPTIONS_GROUP_LOADER=	OPENJPEG PDF PS RAW SVG WEBP XCF
 OPTIONS_RADIO=		ENGINE
-OPTIONS_RADIO_ENGINE=	OPENGL SDL
-OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS SSL GSTREAMER PDF SVG OPENGL
+OPTIONS_RADIO_ENGINE=	OPENGL OPENGLES SDL
+OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO SSL GSTREAMER PDF SVG OPENGL
 OPTIONS_SUB=		yes
 
 HARFBUZZ_DESC=		OpenType text shaping engine
 PHYSICS_DESC=		Physics effects
+WAYLAND_DESC=		Wayland backend support
+WAYLAND_EGL_DESC=	Wayland-EGL backend support
 VLC_DESC=		Multimedia support by VLC
 IBUS_DESC=		Intelligent Input Bus
 SCIM_DESC=		Smart Common Input Method
 XCF_DESC=		Gimp image format support
+OPENGLES_DESC=		2D/3D rendering support via OpenGL ES
 
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=		avahi
@@ -73,6 +81,20 @@ PHYSICS_CONFIGURE_ENABLE=	physics
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
+WAYLAND_BROKEN=			WAYLAND option is broken: https://phab.enlightenment.org/T7116
+WAYLAND_LIB_DEPENDS=		libepoll-shim.so:devel/libepoll-shim \
+				libxkbcommon.so:x11/libxkbcommon \
+				libwayland-client.so:graphics/wayland \
+				libwayland-cursor.so:graphics/wayland
+WAYLAND_CFLAGS=			-I${LOCALBASE}/include/libepoll-shim
+WAYLAND_LDFLAGS=		-lepoll-shim
+WAYLAND_CONFIGURE_ENABLE=	wayland
+
+WAYLAND_EGL_LIB_DEPENDS=	libwayland-egl.so:graphics/mesa-libs
+WAYLAND_EGL_CONFIGURE_ENABLE=	egl
+WAYLANG_EGL_USE=		GL=egl
+WAYLAND_EGL_IMPLIES=		WAYLAND OPENGLES
+
 GSTREAMER_USE=			GSTREAMER1=core
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer1
 
@@ -112,6 +134,9 @@ XCF_CONFIGURE_ENABLE=		xcf
 
 OPENGL_USE=			GL=gl
 
+OPENGLES_USE=			GL=glesv2
+OPENGLES_CONFIGURE_ON=		--with-opengl=es --enable-egl
+
 SDL_USE=			SDL=sdl2
 SDL_CONFIGURE_ENABLE=		sdl
 
@@ -120,7 +145,7 @@ SDL_CONFIGURE_ENABLE=		sdl
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 PLIST_SUB+=			AUDIO=""
 .else
-CONFIGURE_ARGS+=		--disable-audio
+CONFIGURE_ARGS+=		--disable-pulseaudio
 PLIST_SUB+=			AUDIO="@comment "
 .endif
 
@@ -136,7 +161,7 @@ CONFIGURE_ARGS+=		--with-glib=yes
 CONFIGURE_ARGS+=		--disable-ibus --with-glib=no
 .endif
 
-.if empty(PORT_OPTIONS:MOPENGL)
+.if empty(PORT_OPTIONS:MOPENGL) && empty(PORT_OPTIONS:MOPENGLES)
 CONFIGURE_ARGS+=		--with-opengl=none
 .endif
 
@@ -150,9 +175,13 @@ PLIST_SUB+=			ELUA=""
 .endif
 
 post-install:
-	${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
-	for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
+	@for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
 	    if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \
 	done
+	# workaround for https://phab.enlightenment.org/T6783 : it leaves an empty directory
+	@if [ -d ${STAGEDIR}${PREFIX}/lib/evas/utils -a -z "$$(ls -A ${STAGEDIR}${PREFIX}/lib/evas/utils)" ]; then \
+	    ${RMDIR} ${STAGEDIR}${PREFIX}/lib/evas/utils; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/devel/efl/distinfo b/devel/efl/distinfo
index 935e20efe8ef..85ab1164fa57 100644
--- a/devel/efl/distinfo
+++ b/devel/efl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503931204
-SHA256 (enlightenment/efl-1.19.2.tar.xz) = f901f7e272a767d339815c8f77bc164d3afd42ef21143716bf6f3fa2ea3eb1c8
-SIZE (enlightenment/efl-1.19.2.tar.xz) = 65412208
+TIMESTAMP = 1520808862
+SHA256 (enlightenment/efl-1.20.7.tar.xz) = b0a9b765bcd7b012f1072da1d491fc8671aa089473f746901d93f5807a2c76fe
+SIZE (enlightenment/efl-1.20.7.tar.xz) = 65509444
diff --git a/devel/efl/files/patch-src_Makefile.am b/devel/efl/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..5a2b6e4290d2
--- /dev/null
+++ b/devel/efl/files/patch-src_Makefile.am
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2018-03-11 23:21:21 UTC
++++ src/Makefile.am
+@@ -207,7 +207,7 @@ $(if $(findstring unstable,$1),unstable,stable)
+ endef
+ 
+ define protoname
+-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
++$(shell echo $1 | gsed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
+ endef
+ 
+ #rules for generating protocol from wayland_protocols
diff --git a/devel/efl/pkg-plist b/devel/efl/pkg-plist
index 3d78750b0efc..3cd812f41286 100644
--- a/devel/efl/pkg-plist
+++ b/devel/efl/pkg-plist
@@ -13,6 +13,8 @@ bin/eet
 bin/eetpack
 bin/efl_debug
 bin/efl_debugd
+%%WAYLAND%%bin/efl_wl_test
+%%WAYLAND%%bin/efl_wl_test_stack
 bin/efreetd
 bin/eina-bench-cmp
 bin/eina_btlog
@@ -40,9 +42,6 @@ include/ecore-1/Ecore_Getopt.h
 include/ecore-1/Ecore_Legacy.h
 include/ecore-1/ecore_exe.eo.h
 include/ecore-1/ecore_exe.eo.legacy.h
-include/ecore-1/ecore_poller.eo.h
-include/ecore-1/ecore_poller.eo.legacy.h
-include/ecore-1/ecore_types.eot.h
 include/ecore-1/efl_io_buffered_stream.eo.h
 include/ecore-1/efl_io_closer_fd.eo.h
 include/ecore-1/efl_io_copier.eo.h
@@ -192,8 +191,9 @@ include/ecore-imf-1/Ecore_IMF.h
 include/ecore-imf-evas-1/Ecore_IMF_Evas.h
 include/ecore-input-1/Ecore_Input.h
 include/ecore-input-evas-1/Ecore_Input_Evas.h
-include/ecore-ipc-1/Ecore_Ipc.h
 %%SDL%%include/ecore-sdl-1/Ecore_Sdl.h
+include/ecore-ipc-1/Ecore_Ipc.h
+%%WAYLAND%%include/ecore-wl2-1/Ecore_Wl2.h
 include/ecore-x-1/Ecore_X.h
 include/ecore-x-1/Ecore_X_Atoms.h
 include/ecore-x-1/Ecore_X_Cursor.h
@@ -207,12 +207,36 @@ include/edje-1/edje_edit.eo.legacy.h
 include/edje-1/edje_object.eo.h
 include/edje-1/edje_object.eo.legacy.h
 include/edje-1/edje_types.eot.h
+include/edje-1/efl_canvas_layout_external.eo.h
+include/edje-1/efl_canvas_layout_external.eo.legacy.h
+include/edje-1/efl_canvas_layout_internal.eo.h
+include/edje-1/efl_canvas_layout_internal.eo.legacy.h
+include/edje-1/efl_canvas_layout_internal_box.eo.h
+include/edje-1/efl_canvas_layout_internal_box.eo.legacy.h
+include/edje-1/efl_canvas_layout_internal_swallow.eo.h
+include/edje-1/efl_canvas_layout_internal_swallow.eo.legacy.h
+include/edje-1/efl_canvas_layout_internal_table.eo.h
+include/edje-1/efl_canvas_layout_internal_table.eo.legacy.h
+include/edje-1/efl_canvas_layout_internal_text.eo.h
+include/edje-1/efl_canvas_layout_internal_text.eo.legacy.h
 include/edje-cxx-1/Edje.eo.hh
 include/edje-cxx-1/Edje.hh
 include/edje-cxx-1/edje_edit.eo.hh
 include/edje-cxx-1/edje_edit.eo.impl.hh
 include/edje-cxx-1/edje_object.eo.hh
 include/edje-cxx-1/edje_object.eo.impl.hh
+include/edje-cxx-1/efl_canvas_layout_external.eo.hh
+include/edje-cxx-1/efl_canvas_layout_external.eo.impl.hh
+include/edje-cxx-1/efl_canvas_layout_internal.eo.hh
+include/edje-cxx-1/efl_canvas_layout_internal.eo.impl.hh
+include/edje-cxx-1/efl_canvas_layout_internal_box.eo.hh
+include/edje-cxx-1/efl_canvas_layout_internal_box.eo.impl.hh
+include/edje-cxx-1/efl_canvas_layout_internal_swallow.eo.hh
+include/edje-cxx-1/efl_canvas_layout_internal_swallow.eo.impl.hh
+include/edje-cxx-1/efl_canvas_layout_internal_table.eo.hh
+include/edje-cxx-1/efl_canvas_layout_internal_table.eo.impl.hh
+include/edje-cxx-1/efl_canvas_layout_internal_text.eo.hh
+include/edje-cxx-1/efl_canvas_layout_internal_text.eo.impl.hh
 include/eet-1/Eet.h
 include/eet-cxx-1/Eet.hh
 include/eet-cxx-1/eet_composite.hh
@@ -270,16 +294,25 @@ include/efl-1/interfaces/efl_part.eo.h
 include/efl-1/interfaces/efl_player.eo.h
 include/efl-1/interfaces/efl_screen.eo.h
 include/efl-1/interfaces/efl_text.eo.h
+include/efl-1/interfaces/efl_text_annotate.eo.h
+include/efl-1/interfaces/efl_text_cursor.eo.h
+include/efl-1/interfaces/efl_text_font.eo.h
+include/efl-1/interfaces/efl_text_format.eo.h
 include/efl-1/interfaces/efl_text_properties.eo.h
+include/efl-1/interfaces/efl_text_style.eo.h
 include/efl-1/interfaces/efl_text_types.eot.h
 include/efl-1/interfaces/efl_types.eot.h
+include/efl-1/interfaces/efl_ui_autorepeat.eo.h
+include/efl-1/interfaces/efl_ui_base.eo.h
+include/efl-1/interfaces/efl_ui_drag.eo.h
 include/efl-1/interfaces/efl_ui_factory.eo.h
 include/efl-1/interfaces/efl_ui_item.eo.h
 include/efl-1/interfaces/efl_ui_menu.eo.h
 include/efl-1/interfaces/efl_ui_model_connect.eo.h
 include/efl-1/interfaces/efl_ui_model_factory_connect.eo.h
-include/efl-1/interfaces/efl_ui_progress.eo.h
+include/efl-1/interfaces/efl_ui_range.eo.h
 include/efl-1/interfaces/efl_ui_spin.eo.h
+include/efl-1/interfaces/efl_ui_types.eot.h
 include/efl-1/interfaces/efl_ui_view.eo.h
 include/efl-1/interfaces/efl_vpath.eo.h
 include/efl-1/interfaces/efl_vpath_core.eo.h
@@ -372,8 +405,24 @@ include/efl-cxx-1/efl_screen.eo.hh
 include/efl-cxx-1/efl_screen.eo.impl.hh
 include/efl-cxx-1/efl_text.eo.hh
 include/efl-cxx-1/efl_text.eo.impl.hh
+include/efl-cxx-1/efl_text_annotate.eo.hh
+include/efl-cxx-1/efl_text_annotate.eo.impl.hh
+include/efl-cxx-1/efl_text_cursor.eo.hh
+include/efl-cxx-1/efl_text_cursor.eo.impl.hh
+include/efl-cxx-1/efl_text_font.eo.hh
+include/efl-cxx-1/efl_text_font.eo.impl.hh
+include/efl-cxx-1/efl_text_format.eo.hh
+include/efl-cxx-1/efl_text_format.eo.impl.hh
 include/efl-cxx-1/efl_text_properties.eo.hh
 include/efl-cxx-1/efl_text_properties.eo.impl.hh
+include/efl-cxx-1/efl_text_style.eo.hh
+include/efl-cxx-1/efl_text_style.eo.impl.hh
+include/efl-cxx-1/efl_ui_autorepeat.eo.hh
+include/efl-cxx-1/efl_ui_autorepeat.eo.impl.hh
+include/efl-cxx-1/efl_ui_base.eo.hh
+include/efl-cxx-1/efl_ui_base.eo.impl.hh
+include/efl-cxx-1/efl_ui_drag.eo.hh
+include/efl-cxx-1/efl_ui_drag.eo.impl.hh
 include/efl-cxx-1/efl_ui_factory.eo.hh
 include/efl-cxx-1/efl_ui_factory.eo.impl.hh
 include/efl-cxx-1/efl_ui_item.eo.hh
@@ -384,8 +433,8 @@ include/efl-cxx-1/efl_ui_model_connect.eo.hh
 include/efl-cxx-1/efl_ui_model_connect.eo.impl.hh
 include/efl-cxx-1/efl_ui_model_factory_connect.eo.hh
 include/efl-cxx-1/efl_ui_model_factory_connect.eo.impl.hh
-include/efl-cxx-1/efl_ui_progress.eo.hh
-include/efl-cxx-1/efl_ui_progress.eo.impl.hh
+include/efl-cxx-1/efl_ui_range.eo.hh
+include/efl-cxx-1/efl_ui_range.eo.impl.hh
 include/efl-cxx-1/efl_ui_spin.eo.hh
 include/efl-cxx-1/efl_ui_spin.eo.impl.hh
 include/efl-cxx-1/efl_ui_view.eo.hh
@@ -400,6 +449,7 @@ include/efl-cxx-1/efl_vpath_file_core.eo.hh
 include/efl-cxx-1/efl_vpath_file_core.eo.impl.hh
 include/efl-cxx-1/efl_vpath_manager.eo.hh
 include/efl-cxx-1/efl_vpath_manager.eo.impl.hh
+%%WAYLAND%%include/efl-wl-1/Efl_Wl.h
 include/efreet-1/Efreet.h
 include/efreet-1/Efreet_Mime.h
 include/efreet-1/Efreet_Trash.h
@@ -424,6 +474,8 @@ include/eina-1/eina/eina_counter.h
 include/eina-1/eina/eina_cow.h
 include/eina-1/eina/eina_cpu.h
 include/eina-1/eina/eina_crc.h
+include/eina-1/eina/eina_debug.h
+include/eina-1/eina/eina_debug_private.h
 include/eina-1/eina/eina_error.h
 include/eina-1/eina/eina_evlog.h
 include/eina-1/eina/eina_file.h
@@ -609,6 +661,16 @@ include/elementary-1/efl_ui_box_flow.eo.h
 include/elementary-1/efl_ui_box_flow.eo.legacy.h
 include/elementary-1/efl_ui_box_stack.eo.h
 include/elementary-1/efl_ui_box_stack.eo.legacy.h
+include/elementary-1/efl_ui_button.eo.h
+include/elementary-1/efl_ui_button.eo.legacy.h
+include/elementary-1/efl_ui_button_eo.h
+include/elementary-1/efl_ui_button_internal_part.eo.h
+include/elementary-1/efl_ui_button_internal_part.eo.legacy.h
+include/elementary-1/efl_ui_button_private.h
+include/elementary-1/efl_ui_check.eo.h
+include/elementary-1/efl_ui_check.eo.legacy.h
+include/elementary-1/efl_ui_check_eo.h
+include/elementary-1/efl_ui_check_private.h
 include/elementary-1/efl_ui_clock.eo.h
 include/elementary-1/efl_ui_clock.eo.legacy.h
 include/elementary-1/efl_ui_clock.h
@@ -618,6 +680,16 @@ include/elementary-1/efl_ui_flip_eo.h
 include/elementary-1/efl_ui_flip_internal_part.eo.h
 include/elementary-1/efl_ui_flip_internal_part.eo.legacy.h
 include/elementary-1/efl_ui_flip_legacy.h
+include/elementary-1/efl_ui_focus_manager.eo.h
+include/elementary-1/efl_ui_focus_manager.eo.legacy.h
+include/elementary-1/efl_ui_focus_manager_root_focus.eo.h
+include/elementary-1/efl_ui_focus_manager_root_focus.eo.legacy.h
+include/elementary-1/efl_ui_focus_manager_sub.eo.h
+include/elementary-1/efl_ui_focus_manager_sub.eo.legacy.h
+include/elementary-1/efl_ui_focus_object.eo.h
+include/elementary-1/efl_ui_focus_object.eo.legacy.h
+include/elementary-1/efl_ui_focus_user.eo.h
+include/elementary-1/efl_ui_focus_user.eo.legacy.h
 include/elementary-1/efl_ui_frame.eo.h
 include/elementary-1/efl_ui_frame.eo.legacy.h
 include/elementary-1/efl_ui_frame_eo.h
@@ -630,6 +702,12 @@ include/elementary-1/efl_ui_image.eo.h
 include/elementary-1/efl_ui_image.eo.legacy.h
 include/elementary-1/efl_ui_image_factory.eo.h
 include/elementary-1/efl_ui_image_factory.eo.legacy.h
+include/elementary-1/efl_ui_image_zoomable.eo.h
+include/elementary-1/efl_ui_image_zoomable.eo.legacy.h
+include/elementary-1/efl_ui_image_zoomable_eo.h
+include/elementary-1/efl_ui_image_zoomable_pan.eo.h
+include/elementary-1/efl_ui_image_zoomable_pan.eo.legacy.h
+include/elementary-1/efl_ui_image_zoomable_private.h
 include/elementary-1/efl_ui_layout_internal_box.eo.h
 include/elementary-1/efl_ui_layout_internal_box.eo.legacy.h
 include/elementary-1/efl_ui_layout_internal_table.eo.h
@@ -637,6 +715,22 @@ include/elementary-1/efl_ui_layout_internal_table.eo.legacy.h
 include/elementary-1/efl_ui_nstate.eo.h
 include/elementary-1/efl_ui_nstate.eo.legacy.h
 include/elementary-1/efl_ui_nstate.h
+include/elementary-1/efl_ui_progressbar.eo.h
+include/elementary-1/efl_ui_progressbar.eo.legacy.h
+include/elementary-1/efl_ui_progressbar_eo.h
+include/elementary-1/efl_ui_progressbar_internal_part.eo.h
+include/elementary-1/efl_ui_progressbar_internal_part.eo.legacy.h
+include/elementary-1/efl_ui_progressbar_private.h
+include/elementary-1/efl_ui_radio.eo.h
+include/elementary-1/efl_ui_radio.eo.legacy.h
+include/elementary-1/efl_ui_radio_eo.h
+include/elementary-1/efl_ui_radio_private.h
+include/elementary-1/efl_ui_slider.eo.h
+include/elementary-1/efl_ui_slider.eo.legacy.h
+include/elementary-1/efl_ui_slider_eo.h
+include/elementary-1/efl_ui_slider_internal_part.eo.h
+include/elementary-1/efl_ui_slider_internal_part.eo.legacy.h
+include/elementary-1/efl_ui_slider_private.h
 include/elementary-1/efl_ui_text.eo.h
 include/elementary-1/efl_ui_text.eo.legacy.h
 include/elementary-1/efl_ui_text_editable.eo.h
@@ -654,8 +748,6 @@ include/elementary-1/efl_ui_widget_frame.h
 include/elementary-1/efl_ui_widget_image.h
 include/elementary-1/efl_ui_win.eo.h
 include/elementary-1/efl_ui_win.eo.legacy.h
-include/elementary-1/efl_ui_win_standard.eo.h
-include/elementary-1/efl_ui_win_standard.eo.legacy.h
 include/elementary-1/elc_combobox.h
 include/elementary-1/elc_combobox_legacy.h
 include/elementary-1/elc_ctxpopup.h
@@ -685,6 +777,8 @@ include/elementary-1/elm_access.eo.legacy.h
 include/elementary-1/elm_access.h
 include/elementary-1/elm_actionslider.eo.legacy.h
 include/elementary-1/elm_actionslider.h
+include/elementary-1/elm_actionslider_internal_part.eo.h
+include/elementary-1/elm_actionslider_internal_part.eo.legacy.h
 include/elementary-1/elm_actionslider_legacy.h
 include/elementary-1/elm_app.h
 include/elementary-1/elm_atspi_app_object.eo.h
@@ -705,13 +799,10 @@ include/elementary-1/elm_box_common.h
 include/elementary-1/elm_box_legacy.h
 include/elementary-1/elm_bubble.eo.legacy.h
 include/elementary-1/elm_bubble.h
+include/elementary-1/elm_bubble_internal_part.eo.h
+include/elementary-1/elm_bubble_internal_part.eo.legacy.h
 include/elementary-1/elm_bubble_legacy.h
-include/elementary-1/elm_button.eo.h
-include/elementary-1/elm_button.eo.legacy.h
 include/elementary-1/elm_button.h
-include/elementary-1/elm_button_eo.h
-include/elementary-1/elm_button_internal_part.eo.h
-include/elementary-1/elm_button_internal_part.eo.legacy.h
 include/elementary-1/elm_button_legacy.h
 include/elementary-1/elm_cache.h
 include/elementary-1/elm_calendar.eo.h
@@ -720,10 +811,7 @@ include/elementary-1/elm_calendar.h
 include/elementary-1/elm_calendar_common.h
 include/elementary-1/elm_calendar_eo.h
 include/elementary-1/elm_calendar_legacy.h
-include/elementary-1/elm_check.eo.h
-include/elementary-1/elm_check.eo.legacy.h
 include/elementary-1/elm_check.h
-include/elementary-1/elm_check_eo.h
 include/elementary-1/elm_check_legacy.h
 include/elementary-1/elm_clock.eo.h
 include/elementary-1/elm_clock.eo.legacy.h
@@ -799,6 +887,8 @@ include/elementary-1/elm_fileselector_button.eo.legacy.h
 include/elementary-1/elm_fileselector_entry.eo.legacy.h
 include/elementary-1/elm_fileselector_entry_internal_part.eo.h
 include/elementary-1/elm_fileselector_entry_internal_part.eo.legacy.h
+include/elementary-1/elm_fileselector_internal_part.eo.h
+include/elementary-1/elm_fileselector_internal_part.eo.legacy.h
 include/elementary-1/elm_finger.h
 include/elementary-1/elm_flip.h
 include/elementary-1/elm_flip_internal_part.eo.h
@@ -914,6 +1004,8 @@ include/elementary-1/elm_label.eo.h
 include/elementary-1/elm_label.eo.legacy.h
 include/elementary-1/elm_label.h
 include/elementary-1/elm_label_eo.h
+include/elementary-1/elm_label_internal_part.eo.h
+include/elementary-1/elm_label_internal_part.eo.legacy.h
 include/elementary-1/elm_label_legacy.h
 include/elementary-1/elm_layout.eo.h
 include/elementary-1/elm_layout.eo.legacy.h
@@ -954,6 +1046,8 @@ include/elementary-1/elm_menu_legacy.h
 include/elementary-1/elm_mirroring.h
 include/elementary-1/elm_multibuttonentry.eo.h
 include/elementary-1/elm_multibuttonentry.eo.legacy.h
+include/elementary-1/elm_multibuttonentry_internal_part.eo.h
+include/elementary-1/elm_multibuttonentry_internal_part.eo.legacy.h
 include/elementary-1/elm_multibuttonentry_item.eo.h
 include/elementary-1/elm_multibuttonentry_item.eo.legacy.h
 include/elementary-1/elm_naviframe.eo.legacy.h
@@ -990,13 +1084,8 @@ include/elementary-1/elm_part_helper.h
 include/elementary-1/elm_photo.eo.legacy.h
 include/elementary-1/elm_photo.h
 include/elementary-1/elm_photo_legacy.h
-include/elementary-1/elm_photocam.eo.h
-include/elementary-1/elm_photocam.eo.legacy.h
 include/elementary-1/elm_photocam.h
-include/elementary-1/elm_photocam_eo.h
 include/elementary-1/elm_photocam_legacy.h
-include/elementary-1/elm_photocam_pan.eo.h
-include/elementary-1/elm_photocam_pan.eo.legacy.h
 include/elementary-1/elm_player.eo.h
 include/elementary-1/elm_player.eo.legacy.h
 include/elementary-1/elm_player_internal_part.eo.h
@@ -1017,18 +1106,10 @@ include/elementary-1/elm_prefs.h
 include/elementary-1/elm_prefs_common.h
 include/elementary-1/elm_prefs_data.h
 include/elementary-1/elm_prefs_legacy.h
-include/elementary-1/elm_progressbar.eo.h
-include/elementary-1/elm_progressbar.eo.legacy.h
 include/elementary-1/elm_progressbar.h
 include/elementary-1/elm_progressbar_common.h
-include/elementary-1/elm_progressbar_eo.h
-include/elementary-1/elm_progressbar_internal_part.eo.h
-include/elementary-1/elm_progressbar_internal_part.eo.legacy.h
 include/elementary-1/elm_progressbar_legacy.h
-include/elementary-1/elm_radio.eo.h
-include/elementary-1/elm_radio.eo.legacy.h
 include/elementary-1/elm_radio.h
-include/elementary-1/elm_radio_eo.h
 include/elementary-1/elm_radio_legacy.h
 include/elementary-1/elm_route.eo.h
 include/elementary-1/elm_route.eo.legacy.h
@@ -1051,11 +1132,8 @@ include/elementary-1/elm_segment_control_legacy.h
 include/elementary-1/elm_separator.eo.legacy.h
 include/elementary-1/elm_separator.h
 include/elementary-1/elm_separator_legacy.h
-include/elementary-1/elm_slider.eo.h
-include/elementary-1/elm_slider.eo.legacy.h
 include/elementary-1/elm_slider.h
 include/elementary-1/elm_slider_common.h
-include/elementary-1/elm_slider_eo.h
 include/elementary-1/elm_slider_legacy.h
 include/elementary-1/elm_slideshow.eo.legacy.h
 include/elementary-1/elm_slideshow.h
@@ -1118,9 +1196,7 @@ include/elementary-1/elm_widget_actionslider.h
 include/elementary-1/elm_widget_bg.h
 include/elementary-1/elm_widget_box.h
 include/elementary-1/elm_widget_bubble.h
-include/elementary-1/elm_widget_button.h
 include/elementary-1/elm_widget_calendar.h
-include/elementary-1/elm_widget_check.h
 include/elementary-1/elm_widget_clock.h
 include/elementary-1/elm_widget_colorselector.h
 include/elementary-1/elm_widget_combobox.h
@@ -1157,18 +1233,14 @@ include/elementary-1/elm_widget_notify.h
 include/elementary-1/elm_widget_panel.h
 include/elementary-1/elm_widget_panes.h
 include/elementary-1/elm_widget_photo.h
-include/elementary-1/elm_widget_photocam.h
 include/elementary-1/elm_widget_player.h
 include/elementary-1/elm_widget_plug.h
 include/elementary-1/elm_widget_popup.h
 include/elementary-1/elm_widget_prefs.h
-include/elementary-1/elm_widget_progressbar.h
-include/elementary-1/elm_widget_radio.h
 include/elementary-1/elm_widget_route.h
 include/elementary-1/elm_widget_scroller.h
 include/elementary-1/elm_widget_segment_control.h
 include/elementary-1/elm_widget_separator.h
-include/elementary-1/elm_widget_slider.h
 include/elementary-1/elm_widget_slideshow.h
 include/elementary-1/elm_widget_spinner.h
 include/elementary-1/elm_widget_table.h
@@ -1179,7 +1251,6 @@ include/elementary-1/elm_win.h
 include/elementary-1/elm_win_common.h
 include/elementary-1/elm_win_eo.h
 include/elementary-1/elm_win_legacy.h
-include/elementary-1/elm_win_standard.h
 include/elementary-cxx-1/Elementary.eo.hh
 include/elementary-cxx-1/Elementary.hh
 include/elementary-cxx-1/efl_config_global.eo.hh
@@ -1190,12 +1261,28 @@ include/elementary-cxx-1/efl_ui_box_flow.eo.hh
 include/elementary-cxx-1/efl_ui_box_flow.eo.impl.hh
 include/elementary-cxx-1/efl_ui_box_stack.eo.hh
 include/elementary-cxx-1/efl_ui_box_stack.eo.impl.hh
+include/elementary-cxx-1/efl_ui_button.eo.hh
+include/elementary-cxx-1/efl_ui_button.eo.impl.hh
+include/elementary-cxx-1/efl_ui_button_internal_part.eo.hh
+include/elementary-cxx-1/efl_ui_button_internal_part.eo.impl.hh
+include/elementary-cxx-1/efl_ui_check.eo.hh
+include/elementary-cxx-1/efl_ui_check.eo.impl.hh
 include/elementary-cxx-1/efl_ui_clock.eo.hh
 include/elementary-cxx-1/efl_ui_clock.eo.impl.hh
 include/elementary-cxx-1/efl_ui_flip.eo.hh
 include/elementary-cxx-1/efl_ui_flip.eo.impl.hh
 include/elementary-cxx-1/efl_ui_flip_internal_part.eo.hh
 include/elementary-cxx-1/efl_ui_flip_internal_part.eo.impl.hh
+include/elementary-cxx-1/efl_ui_focus_manager.eo.hh
+include/elementary-cxx-1/efl_ui_focus_manager.eo.impl.hh
+include/elementary-cxx-1/efl_ui_focus_manager_root_focus.eo.hh
+include/elementary-cxx-1/efl_ui_focus_manager_root_focus.eo.impl.hh
+include/elementary-cxx-1/efl_ui_focus_manager_sub.eo.hh
+include/elementary-cxx-1/efl_ui_focus_manager_sub.eo.impl.hh
+include/elementary-cxx-1/efl_ui_focus_object.eo.hh
+include/elementary-cxx-1/efl_ui_focus_object.eo.impl.hh
+include/elementary-cxx-1/efl_ui_focus_user.eo.hh
+include/elementary-cxx-1/efl_ui_focus_user.eo.impl.hh
 include/elementary-cxx-1/efl_ui_frame.eo.hh
 include/elementary-cxx-1/efl_ui_frame.eo.impl.hh
 include/elementary-cxx-1/efl_ui_grid.eo.hh
@@ -1206,12 +1293,26 @@ include/elementary-cxx-1/efl_ui_image.eo.hh
 include/elementary-cxx-1/efl_ui_image.eo.impl.hh
 include/elementary-cxx-1/efl_ui_image_factory.eo.hh
 include/elementary-cxx-1/efl_ui_image_factory.eo.impl.hh
+include/elementary-cxx-1/efl_ui_image_zoomable.eo.hh
+include/elementary-cxx-1/efl_ui_image_zoomable.eo.impl.hh
+include/elementary-cxx-1/efl_ui_image_zoomable_pan.eo.hh
+include/elementary-cxx-1/efl_ui_image_zoomable_pan.eo.impl.hh
 include/elementary-cxx-1/efl_ui_layout_internal_box.eo.hh
 include/elementary-cxx-1/efl_ui_layout_internal_box.eo.impl.hh
 include/elementary-cxx-1/efl_ui_layout_internal_table.eo.hh
 include/elementary-cxx-1/efl_ui_layout_internal_table.eo.impl.hh
 include/elementary-cxx-1/efl_ui_nstate.eo.hh
 include/elementary-cxx-1/efl_ui_nstate.eo.impl.hh
+include/elementary-cxx-1/efl_ui_progressbar.eo.hh
+include/elementary-cxx-1/efl_ui_progressbar.eo.impl.hh
+include/elementary-cxx-1/efl_ui_progressbar_internal_part.eo.hh
+include/elementary-cxx-1/efl_ui_progressbar_internal_part.eo.impl.hh
+include/elementary-cxx-1/efl_ui_radio.eo.hh
+include/elementary-cxx-1/efl_ui_radio.eo.impl.hh
+include/elementary-cxx-1/efl_ui_slider.eo.hh
+include/elementary-cxx-1/efl_ui_slider.eo.impl.hh
+include/elementary-cxx-1/efl_ui_slider_internal_part.eo.hh
+include/elementary-cxx-1/efl_ui_slider_internal_part.eo.impl.hh
 include/elementary-cxx-1/efl_ui_text.eo.hh
 include/elementary-cxx-1/efl_ui_text.eo.impl.hh
 include/elementary-cxx-1/efl_ui_text_editable.eo.hh
@@ -1222,22 +1323,18 @@ include/elementary-cxx-1/efl_ui_video.eo.hh
 include/elementary-cxx-1/efl_ui_video.eo.impl.hh
 include/elementary-cxx-1/efl_ui_win.eo.hh
 include/elementary-cxx-1/efl_ui_win.eo.impl.hh
-include/elementary-cxx-1/efl_ui_win_standard.eo.hh
-include/elementary-cxx-1/efl_ui_win_standard.eo.impl.hh
+include/elementary-cxx-1/elm_actionslider_internal_part.eo.hh
+include/elementary-cxx-1/elm_actionslider_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_atspi_app_object.eo.hh
 include/elementary-cxx-1/elm_atspi_app_object.eo.impl.hh
 include/elementary-cxx-1/elm_atspi_bridge.eo.hh
 include/elementary-cxx-1/elm_atspi_bridge.eo.impl.hh
 include/elementary-cxx-1/elm_bg.eo.hh
 include/elementary-cxx-1/elm_bg.eo.impl.hh
-include/elementary-cxx-1/elm_button.eo.hh
-include/elementary-cxx-1/elm_button.eo.impl.hh
-include/elementary-cxx-1/elm_button_internal_part.eo.hh
-include/elementary-cxx-1/elm_button_internal_part.eo.impl.hh
+include/elementary-cxx-1/elm_bubble_internal_part.eo.hh
+include/elementary-cxx-1/elm_bubble_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_calendar.eo.hh
 include/elementary-cxx-1/elm_calendar.eo.impl.hh
-include/elementary-cxx-1/elm_check.eo.hh
-include/elementary-cxx-1/elm_check.eo.impl.hh
 include/elementary-cxx-1/elm_clock.eo.hh
 include/elementary-cxx-1/elm_clock.eo.impl.hh
 include/elementary-cxx-1/elm_code_widget.eo.hh
@@ -1270,6 +1367,8 @@ include/elementary-cxx-1/elm_fileselector.eo.hh
 include/elementary-cxx-1/elm_fileselector.eo.impl.hh
 include/elementary-cxx-1/elm_fileselector_entry_internal_part.eo.hh
 include/elementary-cxx-1/elm_fileselector_entry_internal_part.eo.impl.hh
+include/elementary-cxx-1/elm_fileselector_internal_part.eo.hh
+include/elementary-cxx-1/elm_fileselector_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_flip_internal_part.eo.hh
 include/elementary-cxx-1/elm_flip_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_flipselector_item.eo.hh
@@ -1324,6 +1423,8 @@ include/elementary-cxx-1/elm_interface_scrollable.eo.hh
 include/elementary-cxx-1/elm_interface_scrollable.eo.impl.hh
 include/elementary-cxx-1/elm_label.eo.hh
 include/elementary-cxx-1/elm_label.eo.impl.hh
+include/elementary-cxx-1/elm_label_internal_part.eo.hh
+include/elementary-cxx-1/elm_label_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_layout.eo.hh
 include/elementary-cxx-1/elm_layout.eo.impl.hh
 include/elementary-cxx-1/elm_layout_internal_part.eo.hh
@@ -1344,6 +1445,8 @@ include/elementary-cxx-1/elm_menu_item.eo.hh
 include/elementary-cxx-1/elm_menu_item.eo.impl.hh
 include/elementary-cxx-1/elm_multibuttonentry.eo.hh
 include/elementary-cxx-1/elm_multibuttonentry.eo.impl.hh
+include/elementary-cxx-1/elm_multibuttonentry_internal_part.eo.hh
+include/elementary-cxx-1/elm_multibuttonentry_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_multibuttonentry_item.eo.hh
 include/elementary-cxx-1/elm_multibuttonentry_item.eo.impl.hh
 include/elementary-cxx-1/elm_naviframe_internal_part.eo.hh
@@ -1360,10 +1463,6 @@ include/elementary-cxx-1/elm_panel_internal_part.eo.hh
 include/elementary-cxx-1/elm_panel_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_panes.eo.hh
 include/elementary-cxx-1/elm_panes.eo.impl.hh
-include/elementary-cxx-1/elm_photocam.eo.hh
-include/elementary-cxx-1/elm_photocam.eo.impl.hh
-include/elementary-cxx-1/elm_photocam_pan.eo.hh
-include/elementary-cxx-1/elm_photocam_pan.eo.impl.hh
 include/elementary-cxx-1/elm_player.eo.hh
 include/elementary-cxx-1/elm_player.eo.impl.hh
 include/elementary-cxx-1/elm_player_internal_part.eo.hh
@@ -1376,20 +1475,12 @@ include/elementary-cxx-1/elm_popup_internal_part.eo.hh
 include/elementary-cxx-1/elm_popup_internal_part.eo.impl.hh
 include/elementary-cxx-1/elm_popup_item.eo.hh
 include/elementary-cxx-1/elm_popup_item.eo.impl.hh
-include/elementary-cxx-1/elm_progressbar.eo.hh
-include/elementary-cxx-1/elm_progressbar.eo.impl.hh
-include/elementary-cxx-1/elm_progressbar_internal_part.eo.hh
-include/elementary-cxx-1/elm_progressbar_internal_part.eo.impl.hh
-include/elementary-cxx-1/elm_radio.eo.hh
-include/elementary-cxx-1/elm_radio.eo.impl.hh
 include/elementary-cxx-1/elm_route.eo.hh
 include/elementary-cxx-1/elm_route.eo.impl.hh
 include/elementary-cxx-1/elm_scroller.eo.hh
 include/elementary-cxx-1/elm_scroller.eo.impl.hh
 include/elementary-cxx-1/elm_scroller_internal_part.eo.hh
 include/elementary-cxx-1/elm_scroller_internal_part.eo.impl.hh
-include/elementary-cxx-1/elm_slider.eo.hh
-include/elementary-cxx-1/elm_slider.eo.impl.hh
 include/elementary-cxx-1/elm_spinner.eo.hh
 include/elementary-cxx-1/elm_spinner.eo.impl.hh
 include/elementary-cxx-1/elm_sys_notify.eo.hh
@@ -1520,8 +1611,8 @@ include/evas-1/canvas/efl_canvas_image_internal.eo.h
 include/evas-1/canvas/efl_canvas_image_internal.eo.legacy.h
 include/evas-1/canvas/efl_canvas_object.eo.h
 include/evas-1/canvas/efl_canvas_object.eo.legacy.h
-include/evas-1/canvas/efl_canvas_output.eo.h
-include/evas-1/canvas/efl_canvas_output.eo.legacy.h
+include/evas-1/canvas/efl_canvas_object_event_grabber.eo.h
+include/evas-1/canvas/efl_canvas_object_event_grabber.eo.legacy.h
 include/evas-1/canvas/efl_canvas_polygon.eo.h
 include/evas-1/canvas/efl_canvas_polygon.eo.legacy.h
 include/evas-1/canvas/efl_canvas_proxy.eo.h
@@ -1542,8 +1633,6 @@ include/evas-1/canvas/efl_canvas_surface_x11.eo.h
 include/evas-1/canvas/efl_canvas_surface_x11.eo.legacy.h
 include/evas-1/canvas/efl_canvas_text.eo.h
 include/evas-1/canvas/efl_canvas_text.eo.legacy.h
-include/evas-1/canvas/efl_canvas_text_cursor.eo.h
-include/evas-1/canvas/efl_canvas_text_cursor.eo.legacy.h
 include/evas-1/canvas/efl_gfx_map.eo.h
 include/evas-1/canvas/efl_gfx_map.eo.legacy.h
 include/evas-1/canvas/efl_input_event.eo.h
@@ -1568,8 +1657,8 @@ include/evas-1/canvas/efl_ui_scrollable.eo.h
 include/evas-1/canvas/efl_ui_scrollable.eo.legacy.h
 include/evas-1/canvas/efl_ui_selectable.eo.h
 include/evas-1/canvas/efl_ui_selectable.eo.legacy.h
-include/evas-1/canvas/efl_ui_zoomable.eo.h
-include/evas-1/canvas/efl_ui_zoomable.eo.legacy.h
+include/evas-1/canvas/efl_ui_zoom.eo.h
+include/evas-1/canvas/efl_ui_zoom.eo.legacy.h
 include/evas-1/canvas/efl_vg.eo.h
 include/evas-1/canvas/efl_vg.eo.legacy.h
 include/evas-1/canvas/efl_vg_container.eo.h
@@ -1605,6 +1694,7 @@ include/evas-1/canvas/evas_canvas3d_scene.eo.h
 include/evas-1/canvas/evas_canvas3d_scene.eo.legacy.h
 include/evas-1/canvas/evas_canvas3d_texture.eo.h
 include/evas-1/canvas/evas_canvas3d_texture.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_types.eot.h
 include/evas-1/canvas/evas_grid.eo.legacy.h
 include/evas-1/canvas/evas_image.eo.legacy.h
 include/evas-1/canvas/evas_line.eo.legacy.h
@@ -1612,7 +1702,6 @@ include/evas-1/canvas/evas_table.eo.legacy.h
 include/evas-1/canvas/evas_text.eo.legacy.h
 include/evas-1/canvas/evas_textblock_legacy.h
 include/evas-1/canvas/evas_textgrid.eo.legacy.h
-include/evas-1/canvas/evas_types.eot.h
 include/evas-1/canvas/evas_vg.eo.h
 include/evas-1/canvas/evas_vg.eo.legacy.h
 include/evas-cxx-1/Evas.eo.hh
@@ -1629,8 +1718,8 @@ include/evas-cxx-1/canvas/efl_canvas_image_internal.eo.hh
 include/evas-cxx-1/canvas/efl_canvas_image_internal.eo.impl.hh
 include/evas-cxx-1/canvas/efl_canvas_object.eo.hh
 include/evas-cxx-1/canvas/efl_canvas_object.eo.impl.hh
-include/evas-cxx-1/canvas/efl_canvas_output.eo.hh
-include/evas-cxx-1/canvas/efl_canvas_output.eo.impl.hh
+include/evas-cxx-1/canvas/efl_canvas_object_event_grabber.eo.hh
+include/evas-cxx-1/canvas/efl_canvas_object_event_grabber.eo.impl.hh
 include/evas-cxx-1/canvas/efl_canvas_polygon.eo.hh
 include/evas-cxx-1/canvas/efl_canvas_polygon.eo.impl.hh
 include/evas-cxx-1/canvas/efl_canvas_proxy.eo.hh
@@ -1651,8 +1740,6 @@ include/evas-cxx-1/canvas/efl_canvas_surface_x11.eo.hh
 include/evas-cxx-1/canvas/efl_canvas_surface_x11.eo.impl.hh
 include/evas-cxx-1/canvas/efl_canvas_text.eo.hh
 include/evas-cxx-1/canvas/efl_canvas_text.eo.impl.hh
-include/evas-cxx-1/canvas/efl_canvas_text_cursor.eo.hh
-include/evas-cxx-1/canvas/efl_canvas_text_cursor.eo.impl.hh
 include/evas-cxx-1/canvas/efl_gfx_map.eo.hh
 include/evas-cxx-1/canvas/efl_gfx_map.eo.impl.hh
 include/evas-cxx-1/canvas/efl_input_event.eo.hh
@@ -1677,8 +1764,8 @@ include/evas-cxx-1/canvas/efl_ui_scrollable.eo.hh
 include/evas-cxx-1/canvas/efl_ui_scrollable.eo.impl.hh
 include/evas-cxx-1/canvas/efl_ui_selectable.eo.hh
 include/evas-cxx-1/canvas/efl_ui_selectable.eo.impl.hh
-include/evas-cxx-1/canvas/efl_ui_zoomable.eo.hh
-include/evas-cxx-1/canvas/efl_ui_zoomable.eo.impl.hh
+include/evas-cxx-1/canvas/efl_ui_zoom.eo.hh
+include/evas-cxx-1/canvas/efl_ui_zoom.eo.impl.hh
 include/evas-cxx-1/canvas/efl_vg.eo.hh
 include/evas-cxx-1/canvas/efl_vg.eo.impl.hh
 include/evas-cxx-1/canvas/efl_vg_container.eo.hh
@@ -1755,8 +1842,8 @@ lib/cmake/Eldbus/EldbusConfig.cmake
 lib/cmake/Eldbus/EldbusConfigVersion.cmake
 lib/cmake/Elementary/ElementaryConfig.cmake
 lib/cmake/Elementary/ElementaryConfigVersion.cmake
-%%ELUA%%lib/cmake/Elua/EluaConfig.cmake
-%%ELUA%%lib/cmake/Elua/EluaConfigVersion.cmake
+lib/cmake/Elua/EluaConfig.cmake
+lib/cmake/Elua/EluaConfigVersion.cmake
 lib/cmake/Emile/EmileConfig.cmake
 lib/cmake/Emile/EmileConfigVersion.cmake
 lib/cmake/Emotion/EmotionConfig.cmake
@@ -1780,11 +1867,15 @@ lib/cmake/EvasCxx/EvasCxxConfig.cmake
 lib/cmake/EvasCxx/EvasCxxConfigVersion.cmake
 lib/ecore/system/upower/v-%%BRANCHVERSION%%/module.so
 lib/ecore_con/utils/v-%%BRANCHVERSION%%/efl_net_proxy_helper
-lib/ecore_evas/engines/extn/v-%%BRANCHVERSION%%/module.so
+%%OPENGL%%lib/ecore_evas/engines/extn/v-%%BRANCHVERSION%%/module.so
+%%OPENGLES%%lib/ecore_evas/engines/extn/v-%%BRANCHVERSION%%/module.so
 %%SDL%%lib/ecore_evas/engines/sdl/v-%%BRANCHVERSION%%/module.so
-lib/ecore_evas/engines/x/v-%%BRANCHVERSION%%/module.so
+%%WAYLAND%%lib/ecore_evas/engines/wayland/v-%%BRANCHVERSION%%/module.so
+%%OPENGL%%lib/ecore_evas/engines/x/v-%%BRANCHVERSION%%/module.so
+%%OPENGLES%%lib/ecore_evas/engines/x/v-%%BRANCHVERSION%%/module.so
 %%IBUS%%lib/ecore_imf/modules/ibus/v-%%BRANCHVERSION%%/module.so
 %%SCIM%%lib/ecore_imf/modules/scim/v-%%BRANCHVERSION%%/module.so
+%%WAYLAND%%lib/ecore_imf/modules/wayland/v-%%BRANCHVERSION%%/module.so
 lib/ecore_imf/modules/xim/v-%%BRANCHVERSION%%/module.so
 lib/edje/modules/elm/v-%%BRANCHVERSION%%/module.so
 lib/edje/modules/emotion/v-%%BRANCHVERSION%%/module.so
@@ -1808,6 +1899,8 @@ lib/ethumb_client/utils/v-%%BRANCHVERSION%%/ethumbd_slave
 %%OPENGL%%lib/evas/modules/engines/gl_generic/v-%%BRANCHVERSION%%/module.so
 %%OPENGL%%lib/evas/modules/engines/gl_x11/v-%%BRANCHVERSION%%/module.so
 lib/evas/modules/engines/software_x11/v-%%BRANCHVERSION%%/module.so
+%%WAYLAND_EGL%%lib/evas/modules/engines/wayland_egl/v-%%BRANCHVERSION%%/module.so
+%%WAYLAND%%lib/evas/modules/engines/wayland_shm/v-%%BRANCHVERSION%%/module.so
 lib/evas/modules/image_loaders/gif/v-%%BRANCHVERSION%%/module.so
 %%OPENJPEG%%lib/evas/modules/image_loaders/jp2k/v-%%BRANCHVERSION%%/module.so
 lib/evas/modules/image_loaders/tiff/v-%%BRANCHVERSION%%/module.so
@@ -1949,6 +2042,9 @@ lib/libecore_ipc.so.%%PORTVERSION%%
 %%SDL%%lib/libecore_sdl.so
 %%SDL%%lib/libecore_sdl.so.1
 %%SDL%%lib/libecore_sdl.so.%%PORTVERSION%%
+%%WAYLAND%%lib/libecore_wl2.so
+%%WAYLAND%%lib/libecore_wl2.so.1
+%%WAYLAND%%lib/libecore_wl2.so.%%PORTVERSION%%
 lib/libecore_x.so
 lib/libecore_x.so.1
 lib/libecore_x.so.%%PORTVERSION%%
@@ -1964,6 +2060,9 @@ lib/libeet.so.%%PORTVERSION%%
 lib/libefl.so
 lib/libefl.so.1
 lib/libefl.so.%%PORTVERSION%%
+%%WAYLAND%%lib/libefl_wl.so
+%%WAYLAND%%lib/libefl_wl.so.1
+%%WAYLAND%%lib/libefl_wl.so.%%PORTVERSION%%
 lib/libefreet.so
 lib/libefreet.so.1
 lib/libefreet.so.%%PORTVERSION%%
@@ -2034,6 +2133,7 @@ libdata/pkgconfig/ecore-input-evas.pc
 libdata/pkgconfig/ecore-input.pc
 libdata/pkgconfig/ecore-ipc.pc
 %%SDL%%libdata/pkgconfig/ecore-sdl.pc
+%%WAYLAND%%libdata/pkgconfig/ecore-wl2.pc
 libdata/pkgconfig/ecore-x.pc
 libdata/pkgconfig/ecore.pc
 libdata/pkgconfig/ector.pc
@@ -2042,6 +2142,7 @@ libdata/pkgconfig/edje.pc
 libdata/pkgconfig/eet-cxx.pc
 libdata/pkgconfig/eet.pc
 libdata/pkgconfig/efl-cxx.pc
+%%WAYLAND%%libdata/pkgconfig/efl-wl.pc
 libdata/pkgconfig/efl.pc
 libdata/pkgconfig/efreet-mime.pc
 libdata/pkgconfig/efreet-trash.pc
@@ -2067,8 +2168,11 @@ libdata/pkgconfig/ethumb.pc
 libdata/pkgconfig/ethumb_client.pc
 libdata/pkgconfig/evas-cxx.pc
 %%OPENGL%%libdata/pkgconfig/evas-opengl-x11.pc
+%%OPENGLES%%libdata/pkgconfig/evas-opengl-x11.pc
 libdata/pkgconfig/evas-software-buffer.pc
 libdata/pkgconfig/evas-software-x11.pc
+%%WAYLAND_EGL%%libdata/pkgconfig/evas-wayland-egl.pc
+%%WAYLAND%%libdata/pkgconfig/evas-wayland-shm.pc
 libdata/pkgconfig/evas.pc
 share/applications/elementary_config.desktop
 share/applications/elementary_test.desktop
@@ -2190,6 +2294,7 @@ share/elementary/objects/test_focus_style.edj
 share/elementary/objects/test_masking.edj
 share/elementary/objects/test_prefs.edj
 share/elementary/objects/test_prefs.epb
+share/elementary/objects/test_tooltip.edj
 share/elementary/testdiff.diff
 share/elementary/testfile-windows.txt
 share/elementary/testfile-withblanks.txt
@@ -2211,7 +2316,6 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/core/util.lua
 %%ELUA%%share/elua/modules/benchmark.lua
 %%ELUA%%share/elua/modules/ecore/ecore_exe.eo.lua
-%%ELUA%%share/elua/modules/ecore/ecore_poller.eo.lua
 %%ELUA%%share/elua/modules/ecore/efl_io_buffered_stream.eo.lua
 %%ELUA%%share/elua/modules/ecore/efl_io_closer_fd.eo.lua
 %%ELUA%%share/elua/modules/ecore/efl_io_copier.eo.lua
@@ -2274,6 +2378,12 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/ecore_con/efl_net_ssl_context.eo.lua
 %%ELUA%%share/elua/modules/edje/edje_edit.eo.lua
 %%ELUA%%share/elua/modules/edje/edje_object.eo.lua
+%%ELUA%%share/elua/modules/edje/efl_canvas_layout_external.eo.lua
+%%ELUA%%share/elua/modules/edje/efl_canvas_layout_internal.eo.lua
+%%ELUA%%share/elua/modules/edje/efl_canvas_layout_internal_box.eo.lua
+%%ELUA%%share/elua/modules/edje/efl_canvas_layout_internal_swallow.eo.lua
+%%ELUA%%share/elua/modules/edje/efl_canvas_layout_internal_table.eo.lua
+%%ELUA%%share/elua/modules/edje/efl_canvas_layout_internal_text.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_animator.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_canvas.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_config.eo.lua
@@ -2316,13 +2426,21 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/efl/efl_player.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_screen.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_text.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text_annotate.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text_cursor.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text_font.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text_format.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_text_properties.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_text_style.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_ui_autorepeat.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_ui_base.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_ui_drag.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_factory.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_item.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_menu.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_model_connect.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_model_factory_connect.eo.lua
-%%ELUA%%share/elua/modules/efl/efl_ui_progress.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_ui_range.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_spin.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_ui_view.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_vpath.eo.lua
@@ -2344,30 +2462,43 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/elementary/efl_ui_box.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_box_flow.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_box_stack.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_button.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_button_internal_part.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_check.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_clock.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_flip.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_flip_internal_part.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_focus_manager.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_focus_manager_root_focus.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_focus_manager_sub.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_focus_object.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_focus_user.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_frame.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_grid.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_grid_static.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_image.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_image_factory.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_image_zoomable.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_image_zoomable_pan.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_layout_internal_box.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_layout_internal_table.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_nstate.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_progressbar.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_progressbar_internal_part.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_radio.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_slider.eo.lua
+%%ELUA%%share/elua/modules/elementary/efl_ui_slider_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_text.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_text_editable.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_text_interactive.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_video.eo.lua
 %%ELUA%%share/elua/modules/elementary/efl_ui_win.eo.lua
-%%ELUA%%share/elua/modules/elementary/efl_ui_win_standard.eo.lua
+%%ELUA%%share/elua/modules/elementary/elm_actionslider_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_atspi_app_object.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_atspi_bridge.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_bg.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_button.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_button_internal_part.eo.lua
+%%ELUA%%share/elua/modules/elementary/elm_bubble_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_calendar.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_check.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_clock.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_code_widget.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_color_item.eo.lua
@@ -2384,6 +2515,7 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/elementary/elm_entry_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_fileselector.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_fileselector_entry_internal_part.eo.lua
+%%ELUA%%share/elua/modules/elementary/elm_fileselector_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_flip_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_flipselector_item.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_gengrid.eo.lua
@@ -2411,6 +2543,7 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/elementary/elm_interface_fileselector.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_interface_scrollable.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_label.eo.lua
+%%ELUA%%share/elua/modules/elementary/elm_label_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_layout.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_layout_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_list.eo.lua
@@ -2421,6 +2554,7 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/elementary/elm_menu.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_menu_item.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_multibuttonentry.eo.lua
+%%ELUA%%share/elua/modules/elementary/elm_multibuttonentry_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_multibuttonentry_item.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_naviframe_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_notify.eo.lua
@@ -2429,21 +2563,15 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/elementary/elm_panel.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_panel_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_panes.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_photocam.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_photocam_pan.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_player.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_player_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_plug.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_popup.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_popup_internal_part.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_popup_item.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_progressbar.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_progressbar_internal_part.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_radio.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_route.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_scroller.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_scroller_internal_part.eo.lua
-%%ELUA%%share/elua/modules/elementary/elm_slider.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_spinner.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_sys_notify.eo.lua
 %%ELUA%%share/elua/modules/elementary/elm_sys_notify_dbus.eo.lua
@@ -2465,7 +2593,7 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/evas/efl_canvas_image.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_image_internal.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_object.eo.lua
-%%ELUA%%share/elua/modules/evas/efl_canvas_output.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_canvas_object_event_grabber.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_polygon.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_proxy.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_rectangle.eo.lua
@@ -2476,7 +2604,6 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/evas/efl_canvas_surface_wayland.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_surface_x11.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_canvas_text.eo.lua
-%%ELUA%%share/elua/modules/evas/efl_canvas_text_cursor.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_gfx_map.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_input_event.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_input_focus.eo.lua
@@ -2489,7 +2616,7 @@ share/elementary/themes/default.edj
 %%ELUA%%share/elua/modules/evas/efl_ui_draggable.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_ui_scrollable.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_ui_selectable.eo.lua
-%%ELUA%%share/elua/modules/evas/efl_ui_zoomable.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_ui_zoom.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_vg.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_vg_container.eo.lua
 %%ELUA%%share/elua/modules/evas/efl_vg_gradient.eo.lua
@@ -2524,8 +2651,6 @@ share/eolian/include/ecore-1/ecore_con_eet_base.eo
 share/eolian/include/ecore-1/ecore_con_eet_client_obj.eo
 share/eolian/include/ecore-1/ecore_con_eet_server_obj.eo
 share/eolian/include/ecore-1/ecore_exe.eo
-share/eolian/include/ecore-1/ecore_poller.eo
-share/eolian/include/ecore-1/ecore_types.eot
 share/eolian/include/ecore-1/efl_io_buffered_stream.eo
 share/eolian/include/ecore-1/efl_io_closer_fd.eo
 share/eolian/include/ecore-1/efl_io_copier.eo
@@ -2583,10 +2708,8 @@ share/eolian/include/ector-1/ector_buffer.eo
 share/eolian/include/ector-1/ector_cairo_software_surface.eo
 share/eolian/include/ector-1/ector_cairo_surface.eo
 share/eolian/include/ector-1/ector_gl_buffer.eo
-share/eolian/include/ector-1/ector_gl_buffer_base.eo
 share/eolian/include/ector-1/ector_gl_surface.eo
 share/eolian/include/ector-1/ector_renderer.eo
-share/eolian/include/ector-1/ector_renderer_buffer.eo
 share/eolian/include/ector-1/ector_renderer_cairo.eo
 share/eolian/include/ector-1/ector_renderer_cairo_gradient_linear.eo
 share/eolian/include/ector-1/ector_renderer_cairo_gradient_radial.eo
@@ -2600,7 +2723,6 @@ share/eolian/include/ector-1/ector_renderer_gradient_linear.eo
 share/eolian/include/ector-1/ector_renderer_gradient_radial.eo
 share/eolian/include/ector-1/ector_renderer_shape.eo
 share/eolian/include/ector-1/ector_renderer_software.eo
-share/eolian/include/ector-1/ector_renderer_software_buffer.eo
 share/eolian/include/ector-1/ector_renderer_software_gradient_linear.eo
 share/eolian/include/ector-1/ector_renderer_software_gradient_radial.eo
 share/eolian/include/ector-1/ector_renderer_software_shape.eo
@@ -2612,6 +2734,12 @@ share/eolian/include/ector-1/ector_types.eot
 share/eolian/include/edje-1/edje_edit.eo
 share/eolian/include/edje-1/edje_object.eo
 share/eolian/include/edje-1/edje_types.eot
+share/eolian/include/edje-1/efl_canvas_layout_external.eo
+share/eolian/include/edje-1/efl_canvas_layout_internal.eo
+share/eolian/include/edje-1/efl_canvas_layout_internal_box.eo
+share/eolian/include/edje-1/efl_canvas_layout_internal_swallow.eo
+share/eolian/include/edje-1/efl_canvas_layout_internal_table.eo
+share/eolian/include/edje-1/efl_canvas_layout_internal_text.eo
 share/eolian/include/efl-1/efl_animator.eo
 share/eolian/include/efl-1/efl_canvas.eo
 share/eolian/include/efl-1/efl_config.eo
@@ -2656,16 +2784,25 @@ share/eolian/include/efl-1/efl_part.eo
 share/eolian/include/efl-1/efl_player.eo
 share/eolian/include/efl-1/efl_screen.eo
 share/eolian/include/efl-1/efl_text.eo
+share/eolian/include/efl-1/efl_text_annotate.eo
+share/eolian/include/efl-1/efl_text_cursor.eo
+share/eolian/include/efl-1/efl_text_font.eo
+share/eolian/include/efl-1/efl_text_format.eo
 share/eolian/include/efl-1/efl_text_properties.eo
+share/eolian/include/efl-1/efl_text_style.eo
 share/eolian/include/efl-1/efl_text_types.eot
 share/eolian/include/efl-1/efl_types.eot
+share/eolian/include/efl-1/efl_ui_autorepeat.eo
+share/eolian/include/efl-1/efl_ui_base.eo
+share/eolian/include/efl-1/efl_ui_drag.eo
 share/eolian/include/efl-1/efl_ui_factory.eo
 share/eolian/include/efl-1/efl_ui_item.eo
 share/eolian/include/efl-1/efl_ui_menu.eo
 share/eolian/include/efl-1/efl_ui_model_connect.eo
 share/eolian/include/efl-1/efl_ui_model_factory_connect.eo
-share/eolian/include/efl-1/efl_ui_progress.eo
+share/eolian/include/efl-1/efl_ui_range.eo
 share/eolian/include/efl-1/efl_ui_spin.eo
+share/eolian/include/efl-1/efl_ui_types.eot
 share/eolian/include/efl-1/efl_ui_view.eo
 share/eolian/include/efl-1/efl_vpath.eo
 share/eolian/include/efl-1/efl_vpath_core.eo
@@ -2686,30 +2823,43 @@ share/eolian/include/elementary-1/efl_config_global.eo
 share/eolian/include/elementary-1/efl_ui_box.eo
 share/eolian/include/elementary-1/efl_ui_box_flow.eo
 share/eolian/include/elementary-1/efl_ui_box_stack.eo
+share/eolian/include/elementary-1/efl_ui_button.eo
+share/eolian/include/elementary-1/efl_ui_button_internal_part.eo
+share/eolian/include/elementary-1/efl_ui_check.eo
 share/eolian/include/elementary-1/efl_ui_clock.eo
 share/eolian/include/elementary-1/efl_ui_flip.eo
 share/eolian/include/elementary-1/efl_ui_flip_internal_part.eo
+share/eolian/include/elementary-1/efl_ui_focus_manager.eo
+share/eolian/include/elementary-1/efl_ui_focus_manager_root_focus.eo
+share/eolian/include/elementary-1/efl_ui_focus_manager_sub.eo
+share/eolian/include/elementary-1/efl_ui_focus_object.eo
+share/eolian/include/elementary-1/efl_ui_focus_user.eo
 share/eolian/include/elementary-1/efl_ui_frame.eo
 share/eolian/include/elementary-1/efl_ui_grid.eo
 share/eolian/include/elementary-1/efl_ui_grid_static.eo
 share/eolian/include/elementary-1/efl_ui_image.eo
 share/eolian/include/elementary-1/efl_ui_image_factory.eo
+share/eolian/include/elementary-1/efl_ui_image_zoomable.eo
+share/eolian/include/elementary-1/efl_ui_image_zoomable_pan.eo
 share/eolian/include/elementary-1/efl_ui_layout_internal_box.eo
 share/eolian/include/elementary-1/efl_ui_layout_internal_table.eo
 share/eolian/include/elementary-1/efl_ui_nstate.eo
+share/eolian/include/elementary-1/efl_ui_progressbar.eo
+share/eolian/include/elementary-1/efl_ui_progressbar_internal_part.eo
+share/eolian/include/elementary-1/efl_ui_radio.eo
+share/eolian/include/elementary-1/efl_ui_slider.eo
+share/eolian/include/elementary-1/efl_ui_slider_internal_part.eo
 share/eolian/include/elementary-1/efl_ui_text.eo
 share/eolian/include/elementary-1/efl_ui_text_editable.eo
 share/eolian/include/elementary-1/efl_ui_text_interactive.eo
 share/eolian/include/elementary-1/efl_ui_video.eo
 share/eolian/include/elementary-1/efl_ui_win.eo
-share/eolian/include/elementary-1/efl_ui_win_standard.eo
+share/eolian/include/elementary-1/elm_actionslider_internal_part.eo
 share/eolian/include/elementary-1/elm_atspi_app_object.eo
 share/eolian/include/elementary-1/elm_atspi_bridge.eo
 share/eolian/include/elementary-1/elm_bg.eo
-share/eolian/include/elementary-1/elm_button.eo
-share/eolian/include/elementary-1/elm_button_internal_part.eo
+share/eolian/include/elementary-1/elm_bubble_internal_part.eo
 share/eolian/include/elementary-1/elm_calendar.eo
-share/eolian/include/elementary-1/elm_check.eo
 share/eolian/include/elementary-1/elm_clock.eo
 share/eolian/include/elementary-1/elm_code_widget.eo
 share/eolian/include/elementary-1/elm_color_item.eo
@@ -2726,6 +2876,7 @@ share/eolian/include/elementary-1/elm_entry.eo
 share/eolian/include/elementary-1/elm_entry_internal_part.eo
 share/eolian/include/elementary-1/elm_fileselector.eo
 share/eolian/include/elementary-1/elm_fileselector_entry_internal_part.eo
+share/eolian/include/elementary-1/elm_fileselector_internal_part.eo
 share/eolian/include/elementary-1/elm_flip_internal_part.eo
 share/eolian/include/elementary-1/elm_flipselector_item.eo
 share/eolian/include/elementary-1/elm_general.eot
@@ -2754,6 +2905,7 @@ share/eolian/include/elementary-1/elm_interface_atspi_window.eo
 share/eolian/include/elementary-1/elm_interface_fileselector.eo
 share/eolian/include/elementary-1/elm_interface_scrollable.eo
 share/eolian/include/elementary-1/elm_label.eo
+share/eolian/include/elementary-1/elm_label_internal_part.eo
 share/eolian/include/elementary-1/elm_layout.eo
 share/eolian/include/elementary-1/elm_layout_internal_part.eo
 share/eolian/include/elementary-1/elm_list.eo
@@ -2764,6 +2916,7 @@ share/eolian/include/elementary-1/elm_mapbuf_internal_part.eo
 share/eolian/include/elementary-1/elm_menu.eo
 share/eolian/include/elementary-1/elm_menu_item.eo
 share/eolian/include/elementary-1/elm_multibuttonentry.eo
+share/eolian/include/elementary-1/elm_multibuttonentry_internal_part.eo
 share/eolian/include/elementary-1/elm_multibuttonentry_item.eo
 share/eolian/include/elementary-1/elm_naviframe_internal_part.eo
 share/eolian/include/elementary-1/elm_notify.eo
@@ -2772,21 +2925,15 @@ share/eolian/include/elementary-1/elm_pan.eo
 share/eolian/include/elementary-1/elm_panel.eo
 share/eolian/include/elementary-1/elm_panel_internal_part.eo
 share/eolian/include/elementary-1/elm_panes.eo
-share/eolian/include/elementary-1/elm_photocam.eo
-share/eolian/include/elementary-1/elm_photocam_pan.eo
 share/eolian/include/elementary-1/elm_player.eo
 share/eolian/include/elementary-1/elm_player_internal_part.eo
 share/eolian/include/elementary-1/elm_plug.eo
 share/eolian/include/elementary-1/elm_popup.eo
 share/eolian/include/elementary-1/elm_popup_internal_part.eo
 share/eolian/include/elementary-1/elm_popup_item.eo
-share/eolian/include/elementary-1/elm_progressbar.eo
-share/eolian/include/elementary-1/elm_progressbar_internal_part.eo
-share/eolian/include/elementary-1/elm_radio.eo
 share/eolian/include/elementary-1/elm_route.eo
 share/eolian/include/elementary-1/elm_scroller.eo
 share/eolian/include/elementary-1/elm_scroller_internal_part.eo
-share/eolian/include/elementary-1/elm_slider.eo
 share/eolian/include/elementary-1/elm_spinner.eo
 share/eolian/include/elementary-1/elm_sys_notify.eo
 share/eolian/include/elementary-1/elm_sys_notify_dbus.eo
@@ -2811,7 +2958,7 @@ share/eolian/include/evas-1/efl_canvas_group_clipped.eo
 share/eolian/include/evas-1/efl_canvas_image.eo
 share/eolian/include/evas-1/efl_canvas_image_internal.eo
 share/eolian/include/evas-1/efl_canvas_object.eo
-share/eolian/include/evas-1/efl_canvas_output.eo
+share/eolian/include/evas-1/efl_canvas_object_event_grabber.eo
 share/eolian/include/evas-1/efl_canvas_polygon.eo
 share/eolian/include/evas-1/efl_canvas_proxy.eo
 share/eolian/include/evas-1/efl_canvas_rectangle.eo
@@ -2822,7 +2969,6 @@ share/eolian/include/evas-1/efl_canvas_surface_tbm.eo
 share/eolian/include/evas-1/efl_canvas_surface_wayland.eo
 share/eolian/include/evas-1/efl_canvas_surface_x11.eo
 share/eolian/include/evas-1/efl_canvas_text.eo
-share/eolian/include/evas-1/efl_canvas_text_cursor.eo
 share/eolian/include/evas-1/efl_gfx_map.eo
 share/eolian/include/evas-1/efl_input_event.eo
 share/eolian/include/evas-1/efl_input_focus.eo
@@ -2835,7 +2981,7 @@ share/eolian/include/evas-1/efl_ui_clickable.eo
 share/eolian/include/evas-1/efl_ui_draggable.eo
 share/eolian/include/evas-1/efl_ui_scrollable.eo
 share/eolian/include/evas-1/efl_ui_selectable.eo
-share/eolian/include/evas-1/efl_ui_zoomable.eo
+share/eolian/include/evas-1/efl_ui_zoom.eo
 share/eolian/include/evas-1/efl_vg.eo
 share/eolian/include/evas-1/efl_vg_container.eo
 share/eolian/include/evas-1/efl_vg_gradient.eo
@@ -2853,7 +2999,7 @@ share/eolian/include/evas-1/evas_canvas3d_object.eo
 share/eolian/include/evas-1/evas_canvas3d_primitive.eo
 share/eolian/include/evas-1/evas_canvas3d_scene.eo
 share/eolian/include/evas-1/evas_canvas3d_texture.eo
-share/eolian/include/evas-1/evas_types.eot
+share/eolian/include/evas-1/evas_canvas3d_types.eot
 share/eolian/include/evas-1/evas_vg.eo
 share/ethumb/checkme
 share/ethumb/frames/default.edj