diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 7d5c043164e0..3a626b03de4b 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -1,78 +1,77 @@
 PORTNAME=	e16
-PORTVERSION=	1.0.24
+PORTVERSION=	1.0.25
 PORTREVISION=	0
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Enlightenment DR16 window manager
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz
 
 USES=		autoreconf gettext-tools gmake iconv libtool gnome perl5 \
-		pkgconfig shebangfix xorg
+		pkgconfig python shebangfix xorg
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS NLS PANGO
 OPTIONS_RADIO=		SOUND SOUNDLOADER
 OPTIONS_RADIO_SOUND=	PULSEAUDIO SNDIO
 OPTIONS_RADIO_SOUNDLOADER=	SNDFILE AUDIOFILE
 OPTIONS_SUB=		yes
 OPTIONS_DEFAULT=	PULSEAUDIO SNDFILE
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ON=--enable-sound=pulseaudio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ON=	--enable-sound=sndio
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_ON=	--with-sndldr=sndfile
 AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 AUDIOFILE_CONFIGURE_ON=	--with-sndldr=audiofile
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 PANGO_USE=		GNOME=pango
 PANGO_CONFIGURE_ENABLE=	pango
 DOCS_CONFIGURE_ON=	--enable-docs=yes
 DOCS_CONFIGURE_OFF=	--enable-docs=no
 
 .include <bsd.port.options.mk>
 
 # Double check SOUND and SOUNDLOADER
 E16_SOUND=	${PORT_OPTIONS:MPULSEAUDIO}${PORT_OPTIONS:MSNDIO}
 E16_SNDLDR=	${PORT_OPTIONS:MSNDFILE}${PORT_OPTIONS:MAUDIOFILE}
 .if !empty(E16_SOUND) && empty(E16_SNDLDR)
 IGNORE=	sound support requires a sound loader
 .endif
 .if empty(E16_SOUND) && !empty(E16_SNDLDR)
 IGNORE=	sound loader only makes sense with sound support
 .endif
 
 USE_XORG=	ice sm xorgproto x11 xbitmaps xcomposite xdamage xext xfixes \
 		xft xinerama xrandr xrender xxf86vm
 SHEBANG_FILES=	scripts/e_gen_menu
 CFLAGS+=	-Wno-unused-parameter -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-dependency-tracking  --disable-rpath \
 		--enable-mans SHELL=/bin/sh
 
 .if empty(E16_SOUND) && empty(E16_SNDLDR)
 CONFIGURE_ARGS+=--enable-sound=no --with-sndldr=none
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|$$(USER)|${SHAREOWN}:${SHAREGRP}|g' \
-	    ${WRKSRC}/themes/Makefile.am ${WRKSRC}/themes/Makefile.in
 	${REINPLACE_CMD} -e '/dl, dlopen/d' ${WRKSRC}/configure.ac
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e '/^SUBDIRS/s|docs ||' \
 	    ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e16/distinfo b/x11-wm/e16/distinfo
index ebe3d1517481..c96901674b3f 100644
--- a/x11-wm/e16/distinfo
+++ b/x11-wm/e16/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637053370
-SHA256 (e16-1.0.24.tar.gz) = e5309b1a77595a5fe9c29231bf91057093b0b96eb592d2d6805fb6e556a2735a
-SIZE (e16-1.0.24.tar.gz) = 2415255
+TIMESTAMP = 1659436905
+SHA256 (e16-1.0.25.tar.gz) = e664df6856864d41d76a8c7cfc6d0a18914a0e08d6a70af30251c01da4d136e1
+SIZE (e16-1.0.25.tar.gz) = 2395514
diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist
index 53ee3f3ebc9e..e1ddb3ca2f1e 100644
--- a/x11-wm/e16/pkg-plist
+++ b/x11-wm/e16/pkg-plist
@@ -1,413 +1,418 @@
 bin/e16
 bin/edox
 bin/eesh
 bin/epp
 bin/starte16
 lib/e16/libhack.so
 share/applications/e16.desktop
 share/gnome-session/sessions/e16-gnome.session
 share/xsessions/e16-session.desktop
 share/xsessions/e16-kde-session.desktop
 share/xsessions/e16-gnome2-session.desktop
 share/xsessions/e16-gnome3-session.desktop
 %%DATADIR%%/E-docs/bg.png
 %%DATADIR%%/E-docs/exit1.png
 %%DATADIR%%/E-docs/exit2.png
 %%DATADIR%%/E-docs/next1.png
 %%DATADIR%%/E-docs/next2.png
 %%DATADIR%%/E-docs/prev1.png
 %%DATADIR%%/E-docs/prev2.png
 %%DATADIR%%/E-docs/title.png
 %%DATADIR%%/config/actionclasses.cfg
 %%DATADIR%%/config/bindings.cfg
 %%DATADIR%%/config/definitions
 %%DATADIR%%/config/e16keyedit.db
 %%DATADIR%%/config/fonts.pango.cfg
 %%DATADIR%%/config/fonts.xft.cfg
 %%DATADIR%%/config/matches.cfg
 %%DATADIR%%/fonts/COPYRIGHT.Vera
 %%DATADIR%%/fonts/Vera.ttf
 %%DATADIR%%/fonts/VeraBd.ttf
 %%DATADIR%%/fonts/bold.ttf
 %%DATADIR%%/fonts/normal.ttf
 %%DATADIR%%/icons/default.png
 %%DATADIR%%/icons/e.png
 %%DATADIR%%/icons/e16.png
 %%DATADIR%%/icons/iconbox.png
 %%DATADIR%%/icons/mon.png
 %%DATADIR%%/icons/pager.png
 %%DATADIR%%/menus/desktop.menu
 %%DATADIR%%/menus/enlightenment.menu
 %%DATADIR%%/menus/maintenance.menu
 %%DATADIR%%/menus/settings.menu
 %%DATADIR%%/menus/winops.menu
 %%DATADIR%%/menus/winops_groups.menu
 %%DATADIR%%/menus/winops_layer.menu
 %%DATADIR%%/menus/winops_misc.menu
 %%DATADIR%%/menus/winops_opacity.menu
 %%DATADIR%%/menus/winops_size.menu
 %%DATADIR%%/misc/Xclients.e16-gnome.sh
 %%DATADIR%%/misc/Xclients.e16-kde.sh
 %%DATADIR%%/misc/Xclients.e16.sh
 %%DATADIR%%/misc/e16-dbus-cmd
 %%DATADIR%%/misc/starte16
 %%DATADIR%%/misc/starte16-gnome
 %%DATADIR%%/misc/starte16-kde
 %%DATADIR%%/pix/about.png
 %%DATADIR%%/pix/areas.png
 %%DATADIR%%/pix/bg.png
 %%DATADIR%%/pix/desktops.png
 %%DATADIR%%/pix/elogo48.png
 %%DATADIR%%/pix/focus.png
 %%DATADIR%%/pix/fx.png
 %%DATADIR%%/pix/key_blank.png
 %%DATADIR%%/pix/key_ctrl.png
 %%DATADIR%%/pix/key_lock.png
 %%DATADIR%%/pix/key_mod1.png
 %%DATADIR%%/pix/key_mod2.png
 %%DATADIR%%/pix/key_mod3.png
 %%DATADIR%%/pix/key_mod4.png
 %%DATADIR%%/pix/key_mod5.png
 %%DATADIR%%/pix/key_shift.png
 %%DATADIR%%/pix/mouse_0.png
 %%DATADIR%%/pix/mouse_1.png
 %%DATADIR%%/pix/mouse_2.png
 %%DATADIR%%/pix/mouse_3.png
 %%DATADIR%%/pix/mouse_4.png
 %%DATADIR%%/pix/mouse_5.png
 %%DATADIR%%/pix/mouse_any.png
 %%DATADIR%%/pix/moveres.png
 %%DATADIR%%/pix/pager.png
 %%DATADIR%%/pix/place.png
 %%DATADIR%%/pix/raise.png
 %%DATADIR%%/pix/snapshots.png
 %%DATADIR%%/pix/sound.png
 %%DATADIR%%/pix/tips.png
 %%DATADIR%%/pix/wait1.png
 %%DATADIR%%/pix/wait10.png
 %%DATADIR%%/pix/wait11.png
 %%DATADIR%%/pix/wait12.png
 %%DATADIR%%/pix/wait2.png
 %%DATADIR%%/pix/wait3.png
 %%DATADIR%%/pix/wait4.png
 %%DATADIR%%/pix/wait5.png
 %%DATADIR%%/pix/wait6.png
 %%DATADIR%%/pix/wait7.png
 %%DATADIR%%/pix/wait8.png
 %%DATADIR%%/pix/wait9.png
 %%DATADIR%%/scripts/e_cache_clean
 %%DATADIR%%/scripts/e_cache_query
 %%DATADIR%%/scripts/e_gen_menu
 %%DATADIR%%/scripts/session.sh
 %%DATADIR%%/themes/winter/ABOUT/MAIN
 %%DATADIR%%/themes/winter/ABOUT/bg.png
 %%DATADIR%%/themes/winter/README
 %%DATADIR%%/themes/winter/backgrounds/backgrounds.cfg
 %%DATADIR%%/themes/winter/backgrounds/images/startup-bg.png
 %%DATADIR%%/themes/winter/backgrounds/images/winter_logo.png
 %%DATADIR%%/themes/winter/backgrounds/images/winter_ui.png
 %%DATADIR%%/themes/winter/backgrounds/images/winter_ui_blue.png
 %%DATADIR%%/themes/winter/backgrounds/images/winter_ui_green.png
 %%DATADIR%%/themes/winter/borders.cfg
 %%DATADIR%%/themes/winter/borders/AUTOSHADE/border.cfg
 %%DATADIR%%/themes/winter/borders/BORDERLESS/border.cfg
 %%DATADIR%%/themes/winter/borders/BORDER_ONLY/border.cfg
 %%DATADIR%%/themes/winter/borders/BORDER_ONLY/images/bl.png
 %%DATADIR%%/themes/winter/borders/BORDER_ONLY/images/br.png
 %%DATADIR%%/themes/winter/borders/BORDER_ONLY/images/horiz.png
 %%DATADIR%%/themes/winter/borders/BORDER_ONLY/images/tl.png
 %%DATADIR%%/themes/winter/borders/BORDER_ONLY/images/tr.png
 %%DATADIR%%/themes/winter/borders/DEFAULT/border.cfg
 %%DATADIR%%/themes/winter/borders/DIALOG/border.cfg
 %%DATADIR%%/themes/winter/borders/FIXED_SIZE/border.cfg
 %%DATADIR%%/themes/winter/borders/ICONBOX/border.cfg
 %%DATADIR%%/themes/winter/borders/MENU/border.cfg
 %%DATADIR%%/themes/winter/borders/MENU_BORDER_ONLY/border.cfg
 %%DATADIR%%/themes/winter/borders/PAGER/border.cfg
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb1.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb2.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb3.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb4.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb5.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb6.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb8.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb9l.png
 %%DATADIR%%/themes/winter/borders/PAGER/images/pb9r.png
 %%DATADIR%%/themes/winter/borders/PAGER_AUTOSHADE/border.cfg
 %%DATADIR%%/themes/winter/borders/PAGER_SHADE_RIGHT/border.cfg
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/border.cfg
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb1.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb2.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb3.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb4.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb5.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb6.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb8.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb9l.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images/pb9r.png
 %%DATADIR%%/themes/winter/borders/RIGHT_PAGER_SHADE_LEFT/border.cfg
 %%DATADIR%%/themes/winter/borders/SHAPED/border.cfg
 %%DATADIR%%/themes/winter/borders/TRANSIENT/border.cfg
 %%DATADIR%%/themes/winter/borders/borders.cfg
 %%DATADIR%%/themes/winter/borders/common/Winter.Changelog
 %%DATADIR%%/themes/winter/borders/common/border.cfg
 %%DATADIR%%/themes/winter/borders/common/images/border-bl-blue.png
 %%DATADIR%%/themes/winter/borders/common/images/border-bl.png
 %%DATADIR%%/themes/winter/borders/common/images/border-bottom-blue_alternative.png
 %%DATADIR%%/themes/winter/borders/common/images/border-bottom.png
 %%DATADIR%%/themes/winter/borders/common/images/border-bottom_alternative.png
 %%DATADIR%%/themes/winter/borders/common/images/border-br-blue.png
 %%DATADIR%%/themes/winter/borders/common/images/border-br.png
 %%DATADIR%%/themes/winter/borders/common/images/border-button.png
 %%DATADIR%%/themes/winter/borders/common/images/border-close1.png
 %%DATADIR%%/themes/winter/borders/common/images/border-close1_hilited.png
 %%DATADIR%%/themes/winter/borders/common/images/border-close2.png
 %%DATADIR%%/themes/winter/borders/common/images/border-dot1.png
 %%DATADIR%%/themes/winter/borders/common/images/border-dot2.png
 %%DATADIR%%/themes/winter/borders/common/images/border-iconify1.png
 %%DATADIR%%/themes/winter/borders/common/images/border-iconify1_hilited.png
 %%DATADIR%%/themes/winter/borders/common/images/border-iconify2.png
 %%DATADIR%%/themes/winter/borders/common/images/border-lr.png
 %%DATADIR%%/themes/winter/borders/common/images/border-max1.png
 %%DATADIR%%/themes/winter/borders/common/images/border-max1_hilited.png
 %%DATADIR%%/themes/winter/borders/common/images/border-max2.png
 %%DATADIR%%/themes/winter/borders/common/images/border-minus.png
 %%DATADIR%%/themes/winter/borders/common/images/border-minus2.png
 %%DATADIR%%/themes/winter/borders/common/images/border-plus1.png
 %%DATADIR%%/themes/winter/borders/common/images/border-plus2.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top-blue.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top-blue_alternative.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top-blue_text.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top_alternative.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top_iconbox.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top_iconbox_blue.png
 %%DATADIR%%/themes/winter/borders/common/images/border-top_text.png
 %%DATADIR%%/themes/winter/borders/common/images/border-topmiddle.png
 %%DATADIR%%/themes/winter/borders/common/images/ic_border-l.png
 %%DATADIR%%/themes/winter/borders/common/images/ic_border-r.png
 %%DATADIR%%/themes/winter/borders/common/images/menu-border-bottom.png
 %%DATADIR%%/themes/winter/borders/common/images/menu-border-top.png
 %%DATADIR%%/themes/winter/buttons.cfg
 %%DATADIR%%/themes/winter/buttons/buttons.cfg
 %%DATADIR%%/themes/winter/colormodifiers.cfg
 %%DATADIR%%/themes/winter/common/images/blank.png
 %%DATADIR%%/themes/winter/common/images/blue_bar.png
 %%DATADIR%%/themes/winter/common/images/light_brushed.png
 %%DATADIR%%/themes/winter/coords/coords.cfg
 %%DATADIR%%/themes/winter/cursors.cfg
 %%DATADIR%%/themes/winter/cursors/cursors.cfg
 %%DATADIR%%/themes/winter/desktops.cfg
 %%DATADIR%%/themes/winter/dialogs/dialogs.cfg
 %%DATADIR%%/themes/winter/dialogs/images/arrow-down.png
 %%DATADIR%%/themes/winter/dialogs/images/arrow-left.png
 %%DATADIR%%/themes/winter/dialogs/images/arrow-right.png
 %%DATADIR%%/themes/winter/dialogs/images/arrow-up.png
 %%DATADIR%%/themes/winter/dialogs/images/bg.png
 %%DATADIR%%/themes/winter/dialogs/images/button-clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/button-over.png
 %%DATADIR%%/themes/winter/dialogs/images/button-up.png
 %%DATADIR%%/themes/winter/dialogs/images/checkbox-checked.png
 %%DATADIR%%/themes/winter/dialogs/images/checkbox-checked_clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/checkbox-checked_hilited.png
 %%DATADIR%%/themes/winter/dialogs/images/checkbox.png
 %%DATADIR%%/themes/winter/dialogs/images/checkbox_clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/checkbox_hilited.png
 %%DATADIR%%/themes/winter/dialogs/images/indent.png
 %%DATADIR%%/themes/winter/dialogs/images/ondent.png
 %%DATADIR%%/themes/winter/dialogs/images/radio-on.png
 %%DATADIR%%/themes/winter/dialogs/images/radio-on_clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/radio-on_hilited.png
 %%DATADIR%%/themes/winter/dialogs/images/radio.png
 %%DATADIR%%/themes/winter/dialogs/images/radio_clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/radio_hilited.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-bar-vert.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-down.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-left.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-right.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-trough-horiz.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-trough-vert.png
 %%DATADIR%%/themes/winter/dialogs/images/scroll-up.png
 %%DATADIR%%/themes/winter/dialogs/images/scrollbar-horiz-deco.png
 %%DATADIR%%/themes/winter/dialogs/images/scrollbar-horiz.png
 %%DATADIR%%/themes/winter/dialogs/images/scrollbar-vert-deco.png
 %%DATADIR%%/themes/winter/dialogs/images/separator.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-h.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-h_clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-h_hilited.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-h_on.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-v.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-v_clicked.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-v_hilited.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-handle-v_on.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-trough-h.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-trough-v.png
 %%DATADIR%%/themes/winter/dialogs/images/slider-trough.png
 %%DATADIR%%/themes/winter/dialogs/images/trough.png
 %%DATADIR%%/themes/winter/dialogs/images/window-base.png
 %%DATADIR%%/themes/winter/dock/dock.cfg
 %%DATADIR%%/themes/winter/dragbar/dragbar.cfg
-%%DATADIR%%/themes/winter/dragbar/images/a1.png
-%%DATADIR%%/themes/winter/dragbar/images/a1b.png
-%%DATADIR%%/themes/winter/dragbar/images/a2.png
-%%DATADIR%%/themes/winter/dragbar/images/a2b.png
+%%DATADIR%%/themes/winter/dragbar/images/a1_horiz.png
+%%DATADIR%%/themes/winter/dragbar/images/a1_vert.png
+%%DATADIR%%/themes/winter/dragbar/images/a1b_horiz.png
+%%DATADIR%%/themes/winter/dragbar/images/a1b_vert.png
+%%DATADIR%%/themes/winter/dragbar/images/a2_horiz.png
+%%DATADIR%%/themes/winter/dragbar/images/a2_vert.png
+%%DATADIR%%/themes/winter/dragbar/images/a2b_horiz.png
+%%DATADIR%%/themes/winter/dragbar/images/a2b_vert.png
 %%DATADIR%%/themes/winter/dragbar/images/dragbar_horiz.png
 %%DATADIR%%/themes/winter/dragbar/images/dragbar_vert.png
 %%DATADIR%%/themes/winter/epplets/epplets.cfg
 %%DATADIR%%/themes/winter/epplets/images/ar_d1.png
 %%DATADIR%%/themes/winter/epplets/images/ar_d2.png
 %%DATADIR%%/themes/winter/epplets/images/ar_d3.png
 %%DATADIR%%/themes/winter/epplets/images/ar_l1.png
 %%DATADIR%%/themes/winter/epplets/images/ar_l2.png
 %%DATADIR%%/themes/winter/epplets/images/ar_l3.png
 %%DATADIR%%/themes/winter/epplets/images/ar_r1.png
 %%DATADIR%%/themes/winter/epplets/images/ar_r2.png
 %%DATADIR%%/themes/winter/epplets/images/ar_r3.png
 %%DATADIR%%/themes/winter/epplets/images/ar_u1.png
 %%DATADIR%%/themes/winter/epplets/images/ar_u2.png
 %%DATADIR%%/themes/winter/epplets/images/ar_u3.png
 %%DATADIR%%/themes/winter/epplets/images/b1.png
 %%DATADIR%%/themes/winter/epplets/images/b2.png
 %%DATADIR%%/themes/winter/epplets/images/b3.png
 %%DATADIR%%/themes/winter/epplets/images/bb1.png
 %%DATADIR%%/themes/winter/epplets/images/bb2.png
 %%DATADIR%%/themes/winter/epplets/images/bg.png
 %%DATADIR%%/themes/winter/epplets/images/bg_v.png
 %%DATADIR%%/themes/winter/epplets/images/blank1.png
 %%DATADIR%%/themes/winter/epplets/images/blank2.png
 %%DATADIR%%/themes/winter/epplets/images/blank3.png
 %%DATADIR%%/themes/winter/epplets/images/close1.png
 %%DATADIR%%/themes/winter/epplets/images/close2.png
 %%DATADIR%%/themes/winter/epplets/images/close3.png
 %%DATADIR%%/themes/winter/epplets/images/config1.png
 %%DATADIR%%/themes/winter/epplets/images/config2.png
 %%DATADIR%%/themes/winter/epplets/images/config3.png
 %%DATADIR%%/themes/winter/epplets/images/da.png
 %%DATADIR%%/themes/winter/epplets/images/eject1.png
 %%DATADIR%%/themes/winter/epplets/images/eject2.png
 %%DATADIR%%/themes/winter/epplets/images/eject3.png
 %%DATADIR%%/themes/winter/epplets/images/ff1.png
 %%DATADIR%%/themes/winter/epplets/images/ff2.png
 %%DATADIR%%/themes/winter/epplets/images/ff3.png
 %%DATADIR%%/themes/winter/epplets/images/help1.png
 %%DATADIR%%/themes/winter/epplets/images/help2.png
 %%DATADIR%%/themes/winter/epplets/images/help3.png
 %%DATADIR%%/themes/winter/epplets/images/next1.png
 %%DATADIR%%/themes/winter/epplets/images/next2.png
 %%DATADIR%%/themes/winter/epplets/images/next3.png
 %%DATADIR%%/themes/winter/epplets/images/pause1.png
 %%DATADIR%%/themes/winter/epplets/images/pause2.png
 %%DATADIR%%/themes/winter/epplets/images/pause3.png
 %%DATADIR%%/themes/winter/epplets/images/pb_h.png
 %%DATADIR%%/themes/winter/epplets/images/pb_v.png
 %%DATADIR%%/themes/winter/epplets/images/play1.png
 %%DATADIR%%/themes/winter/epplets/images/play2.png
 %%DATADIR%%/themes/winter/epplets/images/play3.png
 %%DATADIR%%/themes/winter/epplets/images/prev1.png
 %%DATADIR%%/themes/winter/epplets/images/prev2.png
 %%DATADIR%%/themes/winter/epplets/images/prev3.png
 %%DATADIR%%/themes/winter/epplets/images/repeat1.png
 %%DATADIR%%/themes/winter/epplets/images/repeat2.png
 %%DATADIR%%/themes/winter/epplets/images/repeat3.png
 %%DATADIR%%/themes/winter/epplets/images/rw1.png
 %%DATADIR%%/themes/winter/epplets/images/rw2.png
 %%DATADIR%%/themes/winter/epplets/images/rw3.png
 %%DATADIR%%/themes/winter/epplets/images/s_h.png
 %%DATADIR%%/themes/winter/epplets/images/s_k1.png
 %%DATADIR%%/themes/winter/epplets/images/s_k2.png
 %%DATADIR%%/themes/winter/epplets/images/s_k3.png
 %%DATADIR%%/themes/winter/epplets/images/s_v.png
 %%DATADIR%%/themes/winter/epplets/images/skip1.png
 %%DATADIR%%/themes/winter/epplets/images/skip2.png
 %%DATADIR%%/themes/winter/epplets/images/skip3.png
 %%DATADIR%%/themes/winter/epplets/images/stop1.png
 %%DATADIR%%/themes/winter/epplets/images/stop2.png
 %%DATADIR%%/themes/winter/epplets/images/stop3.png
 %%DATADIR%%/themes/winter/eterm/eterm.cfg
 %%DATADIR%%/themes/winter/eterm/images/a_d_1.png
 %%DATADIR%%/themes/winter/eterm/images/a_d_2.png
 %%DATADIR%%/themes/winter/eterm/images/a_l_1.png
 %%DATADIR%%/themes/winter/eterm/images/a_l_2.png
 %%DATADIR%%/themes/winter/eterm/images/a_r_1.png
 %%DATADIR%%/themes/winter/eterm/images/a_r_2.png
 %%DATADIR%%/themes/winter/eterm/images/a_u_1.png
 %%DATADIR%%/themes/winter/eterm/images/a_u_2.png
 %%DATADIR%%/themes/winter/eterm/images/bg.jpg
 %%DATADIR%%/themes/winter/eterm/images/bt.png
 %%DATADIR%%/themes/winter/eterm/images/mb2.png
 %%DATADIR%%/themes/winter/eterm/images/mb3.png
 %%DATADIR%%/themes/winter/eterm/images/sb1.png
 %%DATADIR%%/themes/winter/eterm/images/sb2.png
 %%DATADIR%%/themes/winter/eterm/images/t.png
 %%DATADIR%%/themes/winter/focuslist/focuslist.cfg
 %%DATADIR%%/themes/winter/focuslist/images/hbar.png
 %%DATADIR%%/themes/winter/focuslist/images/hbar2.png
 %%DATADIR%%/themes/winter/fonts.theme.cfg
 %%DATADIR%%/themes/winter/iconbox/iconbox.cfg
 %%DATADIR%%/themes/winter/iconbox/images/base_.png
 %%DATADIR%%/themes/winter/iconbox/images/bg.png
 %%DATADIR%%/themes/winter/iconbox/images/blank.png
 %%DATADIR%%/themes/winter/iconbox/images/button-h.png
 %%DATADIR%%/themes/winter/iconbox/images/cover.png
 %%DATADIR%%/themes/winter/iconbox/images/scroll-base_h.png
 %%DATADIR%%/themes/winter/iconbox/images/scroll-base_v.png
+%%DATADIR%%/themes/winter/iconbox/images/scroll-base_v.png.old
 %%DATADIR%%/themes/winter/iconbox/images/scroll-knob.png
 %%DATADIR%%/themes/winter/iconbox/images/scroll-knob_active.png
 %%DATADIR%%/themes/winter/iconbox/images/scroll-knob_clicked.png
 %%DATADIR%%/themes/winter/iconbox/images/unused.png
 %%DATADIR%%/themes/winter/imageclasses.cfg
 %%DATADIR%%/themes/winter/init.cfg
 %%DATADIR%%/themes/winter/init/images/btn3.png
 %%DATADIR%%/themes/winter/init/images/progress.png
 %%DATADIR%%/themes/winter/init/images/progress_bar.png
 %%DATADIR%%/themes/winter/init/init.cfg
 %%DATADIR%%/themes/winter/menustyles.cfg
 %%DATADIR%%/themes/winter/menustyles/images/menu-arrow-sel.png
 %%DATADIR%%/themes/winter/menustyles/images/menu-arrow.png
 %%DATADIR%%/themes/winter/menustyles/images/menu-sel.png
 %%DATADIR%%/themes/winter/menustyles/menustyles.cfg
 %%DATADIR%%/themes/winter/pager/images/p_bg.png
 %%DATADIR%%/themes/winter/pager/images/p_sel.png
 %%DATADIR%%/themes/winter/pager/images/p_win.png
 %%DATADIR%%/themes/winter/pager/pager.cfg
 %%DATADIR%%/themes/winter/slideouts.cfg
 %%DATADIR%%/themes/winter/slideouts/slideouts.cfg
 %%DATADIR%%/themes/winter/sound.cfg
 %%DATADIR%%/themes/winter/sound/sound.cfg
 %%DATADIR%%/themes/winter/tooltips.cfg
 %%DATADIR%%/themes/winter/tooltips/images/clear.png
 %%DATADIR%%/themes/winter/tooltips/images/tooltipbg.png
 %%DATADIR%%/themes/winter/tooltips/tooltips.cfg
 %%NLS%%share/locale/ar/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/csb/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/da/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/de/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/es/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/fo/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/it/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/e16.mo
 %%DOCS%%%%DOCSDIR%%/e16.html
 %%DOCS%%man/man1/e16.1.gz