- Update IceWM to version 1.6.6 (long overdue; version 1.7.0 has issues)

- Now requires C++11-capable compiler (so drop USE_CXXSTD=c++98) - Options ASM, GNOME, LITE, and MENUFIX had been fixed/removed upstream - Explicitly list all needed libraries and X11 components to ensure robust build and simplify BEASTIE option handling while at it
svn path=/head/; revision=542362
2020-07-16 15:34:20 +00:00 · 2020-07-16 15:34:20 +00:00 · 7d10f10c3d · 2021-03-31 03:12:20 +00:00
commit 7d10f10c3d
parent 243562ce09
10 changed files with 442 additions and 268 deletions
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@ -2,10 +2,12 @@
 # $FreeBSD$

 PORTNAME=	icewm
-PORTVERSION=	1.3.8
-PORTREVISION=	5
+PORTVERSION=	1.6.6
 CATEGORIES=	x11-wm
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION}
+MASTER_SITES=	https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
+
+PATCH_SITES=	https://github.com/bbidulock/icewm/commit/
+PATCHFILES=	32c295c85d22.diff:-p1 f60340768c55.diff:-p1

 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Window Manager designed for speed, usability and consistency
@ -14,35 +16,29 @@ LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libsndfile.so:audio/libsndfile

-USES=		gmake gnome iconv:translit localbase pkgconfig xorg
-USE_CXXSTD=	c++98
+USES=		compiler:c++11-lang gmake gnome iconv:translit localbase \
+		perl5 pkgconfig shebangfix tar:lz xorg
 USE_GNOME=	gdkpixbuf2
-USE_XORG=	ice sm x11 xext xrender
+USE_PERL5=	build
+USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xpm xrender
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-guievents \
-		--with-icesound=oss \
+CONFIGURE_ARGS=	--with-icesound=oss \
 		--with-cfgdir=${DATADIR} \
 		--with-libdir=${DATADIR} \
-		--with-kdedatadir=${LOCALBASE}/share \
-		--with-docdir=${PREFIX}/share/doc \
-		--with-mkfontdir=${NONEXISTENT}
+		--with-docdir=${PREFIX}/share/doc
+SHEBANG_FILES=	contrib/icewm-menu-xrandr

-OPTIONS_DEFINE=		BEASTIE GNOME LITE MENUFIX NLS XFT XINERAMA \
-			XRANDR DOCS
-OPTIONS_DEFINE_i386=	ASM
-OPTIONS_DEFAULT=	BEASTIE MENUFIX XFT XINERAMA XRANDR
-OPTIONS_DEFAULT_i386=	ASM
+OPTIONS_DEFINE=		BEASTIE DOCS NLS XFT XINERAMA XRANDR
+OPTIONS_DEFAULT=	BEASTIE XFT XINERAMA XRANDR
 OPTIONS_SUB=		yes

 BEASTIE_DESC=		Use Beastie'fied startup button
-GNOME_DESC=		Display GNOME 2 menus
-GNOME_USE=		GNOME=gnomedesktop,libgnomeui
-GNOME_CONFIGURE_ENABLE=	menus-gnome2
-LITE_CONFIGURE_ENABLE=	lite
-MENUFIX_DESC=		MenuIconSize fix
-MENUFIX_EXTRA_PATCHES=	${FILESDIR}/extra-menu-icon-fix.patch
+BEASTIE_VARS=		STARTUP_PIXMAP=bsd-daemon.xpm
+BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
@ -51,41 +47,23 @@ XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_ENABLE=	xinerama
 XRANDR_USE=		XORG=xrandr
 XRANDR_CONFIGURE_ENABLE=	xrandr
-ASM_CONFIGURE_ENABLE=	x86-asm
-BEASTIE_VARS=		STARTUP_PIXMAP=${DATADIR}/taskbar/bsd-daemon.xpm
-BEASTIE_VARS_OFF=	STARTUP_PIXMAP=icewm-logo.xpm

 post-extract:
 .for dir in taskbar themes/Infadel2/taskbar
 	@cd ${WRKSRC}/lib/${dir} && ${MV} start.xpm icewm-logo.xpm
+	@${LN} -sf ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/${dir}
+	@${LN} -sf ${STARTUP_PIXMAP} ${WRKSRC}/lib/${dir}/start.xpm
 .endfor
-	@${CP} -f ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar

 post-patch:
-	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/control|${LOCALBASE}/share/control|g ; \
-		 s|/usr/share/app|${LOCALBASE}/share/app|g ; \
-		 s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
-		 ${WRKSRC}/src/gnome2.cc
-	@${REINPLACE_CMD} -e \
-		's|SHELL=.*|SHELL=@SHELL@| ; \
-		 s|icewm-set-gnomewm||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|icewm-$$(VERSION)|icewm| ; \
-		 s|`pkg-config fontconfig --cflags`|| ; \
-		 s|`pkg-config fontconfig --libs`|| ; \
+	@${REINPLACE_CMD} -E -e \
+		'/^(icewm|icehelp|icewmbg)_LDADD =/s|$$| @LIBICONV@| ; \
 		 /@echo/s|^|#| ; \
-		 s|@$$(|$$(|' ${WRKSRC}/src/Makefile.in
-
-post-install:
-.for dir in taskbar themes/Infadel2/taskbar
-	@${LN} -s ${STARTUP_PIXMAP} ${STAGEDIR}${DATADIR}/${dir}/start.xpm
-.endfor
+		 s|@$$\(|$$(|' ${WRKSRC}/src/Makefile.in

 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in CHANGES INSTALL README TODO doc/*.html
+.for f in ChangeLog NEWS README TODO doc/*.html
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor

--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@ -1,2 +1,7 @@
-SHA256 (icewm-1.3.8.tar.gz) = 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18
-SIZE (icewm-1.3.8.tar.gz) = 905680
+TIMESTAMP = 1590778501
+SHA256 (icewm-1.6.6.tar.lz) = 77f512e0bcdc9c6ec8e1a10c822b8238548265babc70dfe4eb76b4520d60c01c
+SIZE (icewm-1.6.6.tar.lz) = 1684639
+SHA256 (32c295c85d22.diff) = d6801471b14780b34399a7e9ebb75744a4eb3153f97856c1109a81a76d4706c6
+SIZE (32c295c85d22.diff) = 304
+SHA256 (f60340768c55.diff) = 94178b00d71e9a8e8959247616f8758a9c89f3dc976c9f74022307376854a14a
+SIZE (f60340768c55.diff) = 298
--- a/x11-wm/icewm/files/extra-menu-icon-fix.patch
+++ b/x11-wm/icewm/files/extra-menu-icon-fix.patch
@ -1,73 +0,0 @@
-diff -Naur src/yicon.cc src/yicon.cc
--- src/yicon.cc	2010-10-31 15:09:36.000000000 +0100
-+++ src/yicon.cc	2011-11-07 19:41:52.841910531 +0100
-@@ -270,6 +270,10 @@
-         iconCache.getItem(0)->removeFromCache();
- }
- 
-+int YIcon::menuSize() {
-+    return menuIconSize;
-+}
-+
- int YIcon::smallSize() {
-     return smallIconSize;
- }
-diff -Naur src/yicon.h src/yicon.h
--- src/yicon.h	2010-10-31 15:09:36.000000000 +0100
-+++ src/yicon.h	2011-11-07 19:41:28.555296033 +0100
-@@ -25,6 +25,7 @@
-     bool isCached() { return fCached; }
-     void setCached(bool cached) { fCached = cached; }
- 
-+    static int menuSize();
-     static int smallSize();
-     static int largeSize();
-     static int hugeSize();
-diff -Naur src/ymenu.cc src/ymenu.cc
--- src/ymenu.cc	2010-10-31 15:09:36.000000000 +0100
-+++ src/ymenu.cc	2011-11-07 19:42:40.498474049 +0100
-@@ -153,8 +153,8 @@
- 
- #ifndef LITE
-         if (getItem(selItem)->getIcon() != null &&
-            YIcon::smallSize() > h)
-            h = YIcon::smallSize();
-+            YIcon::menuSize() > h)
-+            h = YIcon::menuSize();
- #endif
- 
-         if (x <= int(width() - h - 4))
-@@ -1023,8 +1023,8 @@
-                     mitem->getIcon()->draw(g,
-                                l + 1 + delta, t + delta + top + pad +
-                                (eh - top - pad * 2 - bottom -
-                                YIcon::smallSize()) / 2,
-                                YIcon::smallSize());
-+                                YIcon::menuSize()) / 2,
-+                                YIcon::menuSize());
- #endif
-                 }
- 
-diff -Naur src/ymenuitem.cc src/ymenuitem.cc
--- src/ymenuitem.cc	2010-10-31 15:09:36.000000000 +0100
-+++ src/ymenuitem.cc	2011-11-07 19:50:04.458316916 +0100
-@@ -86,8 +86,8 @@
-         int ih = fontHeight;
- 
- #ifndef LITE
-        if (YIcon::smallSize() > ih)
-            ih = YIcon::smallSize();
-+        if (YIcon::menuSize() > ih)
-+            ih = YIcon::menuSize();
- #endif
- 
-         if (wmLook == lookWarp4 || wmLook == lookWin95) {
-@@ -123,7 +123,7 @@
-     return 0;
- #else
-     ref<YIcon> icon = getIcon();
-    return icon != null ? YIcon::smallSize(): 0;
-+    return icon != null ? YIcon::menuSize(): 0;
- #endif
- }
- 
--- a/x11-wm/icewm/files/patch-lib_Makefile.in
+++ b/x11-wm/icewm/files/patch-lib_Makefile.in
@ -0,0 +1,25 @@
+--- lib/Makefile.in.orig	2020-07-12 18:02:27 UTC
+++ lib/Makefile.in
+@@ -488,11 +488,13 @@ nobase_dist_pkgdata_DATA = \
+ 	mailbox/newmail.xpm \
+ 	mailbox/nomail.xpm \
+ 	mailbox/unreadmail.xpm \
+	taskbar/bsd-daemon.xpm \
+ 	taskbar/collapse.xpm \
+ 	taskbar/debian.xpm \
+ 	taskbar/desktop.xpm \
+ 	taskbar/expand.xpm \
+ 	taskbar/icewm.xpm \
+	taskbar/icewm-logo.xpm \
+ 	taskbar/linux1.xpm \
+ 	taskbar/linux20.xpm \
+ 	taskbar/linux2.xpm \
+@@ -562,6 +564,8 @@ nobase_dist_pkgdata_DATA = \
+ 	themes/Infadel2/rollupA.xpm \
+ 	themes/Infadel2/rollupI.xpm \
+ 	themes/Infadel2/snap.pcf \
+	themes/Infadel2/taskbar/bsd-daemon.xpm \
+	themes/Infadel2/taskbar/icewm-logo.xpm \
+ 	themes/Infadel2/taskbar/linux.xpm \
+ 	themes/Infadel2/taskbar/start.xpm \
+ 	themes/Infadel2/taskbar/windows.xpm \
--- a/x11-wm/icewm/files/patch-src__wmapp.cc
+++ b/x11-wm/icewm/files/patch-src__wmapp.cc
@ -1,29 +0,0 @@
--- src/wmapp.cc.orig	2013-11-17 16:54:39 UTC
-+++ src/wmapp.cc
-@@ -221,7 +221,7 @@ static void registerProtocols2(Window xid) {
- #endif
- 
-     long pid = getpid();
-    const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")";
-+    const char wmname[] = "IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")";
- 
- #ifdef GNOME1_HINTS
-     XChangeProperty(xapp->display(), xid, 
-@@ -337,7 +337,7 @@ static void initFontPath(IApp *app) {
-             int ndirs; // ------------------- retrieve the old X's font path ---
-             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
- 
-            char ** newFontPath = new char *[ndirs + 1];
-+            const char ** newFontPath = new const char *[ndirs + 1];
-             newFontPath[ndirs] = fontsdir;
- 
-             if (fontPath)
-@@ -383,7 +383,7 @@ static void initFontPath(IApp *app) {
-             XChangeProperty(xapp->display(), manager->handle(),
-                             XA_ICEWM_FONT_PATH, XA_STRING, 8, PropModeReplace,
-                             (unsigned char *) fontsdir, strlen(fontsdir));
-            XSetFontPath(xapp->display(), newFontPath, ndirs + 1);
-+            XSetFontPath(xapp->display(), (char **) newFontPath, ndirs + 1);
- 
-             if (fontPath) XFreeFontPath(fontPath);
-             delete[] fontsdir;
--- a/x11-wm/icewm/files/patch-src__wmapp.h
+++ b/x11-wm/icewm/files/patch-src__wmapp.h
@ -1,11 +0,0 @@
--- src/wmapp.h.orig
-+++ src/wmapp.h
-@@ -78,7 +78,7 @@
-     Window managerWindow;
- };
- 
-#if 0
-+#ifdef CONFIG_GUIEVENTS
- extern YWMApp * wmapp;
- #endif
- 
--- a/x11-wm/icewm/files/patch-src__wmmgr.cc
+++ b/x11-wm/icewm/files/patch-src__wmmgr.cc
@ -1,13 +0,0 @@
-diff --git src/wmmgr.cc src/wmmgr.cc
-index 4252bf6..dc1e703 100644
--- src/wmmgr.cc
-+++ src/wmmgr.cc
-@@ -697,7 +697,7 @@ void YWindowManager::handleClientMessage(const XClientMessageEvent &message) {
-         case ICEWM_ACTION_RESTARTWM:
-         case ICEWM_ACTION_WINDOWLIST:
-         case ICEWM_ACTION_ABOUT:
-            break;
-+            //break;
-         default:
-             smActionListener->handleSMAction(message.data.l[1]);
-             break;
--- a/x11-wm/icewm/files/patch-src_wmabout.cc
+++ b/x11-wm/icewm/files/patch-src_wmabout.cc
@ -1,11 +0,0 @@
--- src/wmabout.cc.orig	2018-02-25 21:00:14.796410000 -0800
-+++ src/wmabout.cc	2018-02-25 21:00:22.254233000 -0800
-@@ -23,7 +23,7 @@
- AboutDlg *aboutDlg = 0;
- 
- AboutDlg::AboutDlg(): YDialog() {
-    char const *version("IceWM "VERSION" ("HOSTOS"/"HOSTCPU")");
-+    char const *version("IceWM " VERSION" (" HOSTOS"/" HOSTCPU")");
-     ustring copyright =
-         ustring("Copyright ")
-         .append(_("(C)"))
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@ -2,4 +2,4 @@ Window Manager designed for speed, usability and consistency.

 'bsd-daemon.xpm' is from Steve Farrell.

-WWW: http://www.icewm.org/
+WWW: https://ice-wm.org/
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@ -1,54 +1,147 @@
-%%NO_LITE%%bin/icehelp
+bin/icehelp
 bin/icesh
 bin/icesound
 bin/icewm
-%%GNOME%%bin/icewm-menu-gnome2
+bin/icewm-menu-fdo
+bin/icewm-menu-xrandr
 bin/icewm-session
+bin/icewm-set-gnomewm
 bin/icewmbg
 bin/icewmhint
-bin/icewmtray
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+man/man1/icehelp.1.gz
+man/man1/icesh.1.gz
+man/man1/icesound.1.gz
+man/man1/icewm-menu-fdo.1.gz
+man/man1/icewm-menu-xrandr.1.gz
+man/man1/icewm-session.1.gz
+man/man1/icewm-set-gnomewm.1.gz
+man/man1/icewm.1.gz
+man/man1/icewmbg.1.gz
+man/man1/icewmhint.1.gz
+man/man5/icewm-env.5.gz
+man/man5/icewm-focus_mode.5.gz
+man/man5/icewm-keys.5.gz
+man/man5/icewm-menu.5.gz
+man/man5/icewm-preferences.5.gz
+man/man5/icewm-prefoverride.5.gz
+man/man5/icewm-programs.5.gz
+man/man5/icewm-shutdown.5.gz
+man/man5/icewm-startup.5.gz
+man/man5/icewm-theme.5.gz
+man/man5/icewm-toolbar.5.gz
+man/man5/icewm-winoptions.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/icewm-1.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-10.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-11.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-12.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-13.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-14.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-15.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-16.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-17.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-18.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-19.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-2.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-20.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-3.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-4.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-5.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-6.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-7.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-8.html
-%%PORTDOCS%%%%DOCSDIR%%/icewm-9.html
+%%PORTDOCS%%%%DOCSDIR%%/icehelp.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icesh.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icesound.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-env.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-focus_mode.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-keys.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-menu-fdo.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-menu-xrandr.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-menu.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-preferences.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-prefoverride.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-programs.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-session.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-set-gnomewm.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-shutdown.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-startup.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-theme.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-toolbar.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm-winoptions.5.html
+%%PORTDOCS%%%%DOCSDIR%%/icewm.1.html
 %%PORTDOCS%%%%DOCSDIR%%/icewm.html
+%%PORTDOCS%%%%DOCSDIR%%/icewmbg.1.html
+%%PORTDOCS%%%%DOCSDIR%%/icewmhint.1.html
+%%DATADIR%%/IceWM.jpg
+%%DATADIR%%/icons/about_16x16.xpm
+%%DATADIR%%/icons/about_32x32.xpm
 %%DATADIR%%/icons/app_16x16.xpm
 %%DATADIR%%/icons/app_32x32.xpm
+%%DATADIR%%/icons/bomb_16x16.xpm
+%%DATADIR%%/icons/bomb_32x32.xpm
+%%DATADIR%%/icons/communicator-abook_16x16.xpm
+%%DATADIR%%/icons/communicator-abook_32x32.xpm
+%%DATADIR%%/icons/communicator-browser_16x16.xpm
+%%DATADIR%%/icons/communicator-browser_32x32.xpm
+%%DATADIR%%/icons/communicator-composer_16x16.xpm
+%%DATADIR%%/icons/communicator-composer_32x32.xpm
+%%DATADIR%%/icons/communicator-discussion_16x16.xpm
+%%DATADIR%%/icons/communicator-discussion_32x32.xpm
+%%DATADIR%%/icons/communicator-mail_16x16.xpm
+%%DATADIR%%/icons/communicator-mail_32x32.xpm
 %%DATADIR%%/icons/emacs_16x16.xpm
 %%DATADIR%%/icons/emacs_32x32.xpm
 %%DATADIR%%/icons/file_16x16.xpm
 %%DATADIR%%/icons/file_32x32.xpm
+%%DATADIR%%/icons/focus_16x16.png
+%%DATADIR%%/icons/focus_16x16.xpm
+%%DATADIR%%/icons/focus_32x32.png
+%%DATADIR%%/icons/focus_32x32.xpm
 %%DATADIR%%/icons/folder_16x16.xpm
 %%DATADIR%%/icons/folder_32x32.xpm
 %%DATADIR%%/icons/fte_16x16.xpm
 %%DATADIR%%/icons/fte_32x32.xpm
+%%DATADIR%%/icons/gimp_16x16.xpm
+%%DATADIR%%/icons/gimp_32x32.xpm
+%%DATADIR%%/icons/gnome_16x16.xpm
+%%DATADIR%%/icons/help_16x16.xpm
+%%DATADIR%%/icons/help_32x32.xpm
+%%DATADIR%%/icons/icewm_16x16.png
+%%DATADIR%%/icons/icewm_32x32.png
 %%DATADIR%%/icons/java_16x16.xpm
 %%DATADIR%%/icons/java_32x32.xpm
+%%DATADIR%%/icons/kde_16x16.xpm
+%%DATADIR%%/icons/key_16x16.png
+%%DATADIR%%/icons/key_32x32.png
+%%DATADIR%%/icons/koules_16x16.xpm
+%%DATADIR%%/icons/koules_32x32.xpm
+%%DATADIR%%/icons/lock_16x16.xpm
+%%DATADIR%%/icons/lock_32x32.xpm
+%%DATADIR%%/icons/lock_48x48.xpm
+%%DATADIR%%/icons/logout_16x16.xpm
+%%DATADIR%%/icons/logout_32x32.xpm
+%%DATADIR%%/icons/navigator_16x16.xpm
+%%DATADIR%%/icons/navigator_32x32.xpm
+%%DATADIR%%/icons/netscape_16x16.xpm
+%%DATADIR%%/icons/netscape_32x32.xpm
+%%DATADIR%%/icons/pdf_16x16.xpm
+%%DATADIR%%/icons/pdf_32x32.xpm
+%%DATADIR%%/icons/pref_16x16.png
+%%DATADIR%%/icons/pref_32x32.png
+%%DATADIR%%/icons/programs_16x16.xpm
+%%DATADIR%%/icons/programs_32x32.xpm
+%%DATADIR%%/icons/reboot_16x16.xpm
+%%DATADIR%%/icons/reboot_32x32.xpm
+%%DATADIR%%/icons/restart_16x16.xpm
+%%DATADIR%%/icons/restart_32x32.xpm
+%%DATADIR%%/icons/run_16x16.xpm
+%%DATADIR%%/icons/run_32x32.xpm
+%%DATADIR%%/icons/save_16x16.png
+%%DATADIR%%/icons/save_32x32.png
+%%DATADIR%%/icons/settings_16x16.xpm
+%%DATADIR%%/icons/settings_32x32.xpm
+%%DATADIR%%/icons/shutdown_16x16.xpm
+%%DATADIR%%/icons/shutdown_32x32.xpm
+%%DATADIR%%/icons/themes_16x16.xpm
+%%DATADIR%%/icons/themes_32x32.xpm
 %%DATADIR%%/icons/vim_16x16.xpm
 %%DATADIR%%/icons/vim_32x32.xpm
 %%DATADIR%%/icons/vim_48x48.xpm
+%%DATADIR%%/icons/windows_16x16.xpm
+%%DATADIR%%/icons/windows_32x32.xpm
+%%DATADIR%%/icons/xisp_16x16.xpm
+%%DATADIR%%/icons/xisp_32x32.xpm
+%%DATADIR%%/icons/xload_16x16.xpm
+%%DATADIR%%/icons/xload_32x32.xpm
 %%DATADIR%%/icons/xterm_16x16.xpm
 %%DATADIR%%/icons/xterm_32x32.xpm
+%%DATADIR%%/icons/xv_16x16.xpm
+%%DATADIR%%/icons/xv_32x32.xpm
 %%DATADIR%%/keys
 %%DATADIR%%/ledclock/a.xpm
 %%DATADIR%%/ledclock/colon.xpm
@ -75,13 +168,137 @@ bin/icewmtray
 %%DATADIR%%/mailbox/unreadmail.xpm
 %%DATADIR%%/menu
 %%DATADIR%%/preferences
+%%DATADIR%%/programs
 %%DATADIR%%/taskbar/bsd-daemon.xpm
 %%DATADIR%%/taskbar/collapse.xpm
+%%DATADIR%%/taskbar/debian.xpm
 %%DATADIR%%/taskbar/desktop.xpm
 %%DATADIR%%/taskbar/expand.xpm
 %%DATADIR%%/taskbar/icewm-logo.xpm
+%%DATADIR%%/taskbar/icewm.xpm
+%%DATADIR%%/taskbar/linux.xpm
+%%DATADIR%%/taskbar/linux1.xpm
+%%DATADIR%%/taskbar/linux2.xpm
+%%DATADIR%%/taskbar/linux20.xpm
 %%DATADIR%%/taskbar/start.xpm
 %%DATADIR%%/taskbar/windows.xpm
+%%DATADIR%%/taskbar/xfreeos2.xpm
+%%DATADIR%%/themes/CrystalBlue/close.xpm
+%%DATADIR%%/themes/CrystalBlue/closeA.xpm
+%%DATADIR%%/themes/CrystalBlue/closeO.xpm
+%%DATADIR%%/themes/CrystalBlue/default.theme
+%%DATADIR%%/themes/CrystalBlue/dframeAB.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeABL.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeABR.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeAL.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeAR.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeAT.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeATL.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeATR.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeIB.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeIBL.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeIBR.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeIL.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeIR.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeIT.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeITL.xpm
+%%DATADIR%%/themes/CrystalBlue/dframeITR.xpm
+%%DATADIR%%/themes/CrystalBlue/frameAB.xpm
+%%DATADIR%%/themes/CrystalBlue/frameABL.xpm
+%%DATADIR%%/themes/CrystalBlue/frameABR.xpm
+%%DATADIR%%/themes/CrystalBlue/frameAL.xpm
+%%DATADIR%%/themes/CrystalBlue/frameAR.xpm
+%%DATADIR%%/themes/CrystalBlue/frameAT.xpm
+%%DATADIR%%/themes/CrystalBlue/frameATL.xpm
+%%DATADIR%%/themes/CrystalBlue/frameATR.xpm
+%%DATADIR%%/themes/CrystalBlue/frameIB.xpm
+%%DATADIR%%/themes/CrystalBlue/frameIBL.xpm
+%%DATADIR%%/themes/CrystalBlue/frameIBR.xpm
+%%DATADIR%%/themes/CrystalBlue/frameIL.xpm
+%%DATADIR%%/themes/CrystalBlue/frameIR.xpm
+%%DATADIR%%/themes/CrystalBlue/frameIT.xpm
+%%DATADIR%%/themes/CrystalBlue/frameITL.xpm
+%%DATADIR%%/themes/CrystalBlue/frameITR.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/a.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/colon.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/dot.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/m.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n0.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n1.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n2.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n3.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n4.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n5.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n6.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n7.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n8.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/n9.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/p.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/slash.xpm
+%%DATADIR%%/themes/CrystalBlue/ledclock/space.xpm
+%%DATADIR%%/themes/CrystalBlue/maximize.xpm
+%%DATADIR%%/themes/CrystalBlue/maximizeA.xpm
+%%DATADIR%%/themes/CrystalBlue/maximizeO.xpm
+%%DATADIR%%/themes/CrystalBlue/menuButtonA.xpm
+%%DATADIR%%/themes/CrystalBlue/menuButtonI.xpm
+%%DATADIR%%/themes/CrystalBlue/menubg.xpm
+%%DATADIR%%/themes/CrystalBlue/menusel.xpm
+%%DATADIR%%/themes/CrystalBlue/minimize.xpm
+%%DATADIR%%/themes/CrystalBlue/minimizeA.xpm
+%%DATADIR%%/themes/CrystalBlue/minimizeO.xpm
+%%DATADIR%%/themes/CrystalBlue/restore.xpm
+%%DATADIR%%/themes/CrystalBlue/restoreA.xpm
+%%DATADIR%%/themes/CrystalBlue/restoreO.xpm
+%%DATADIR%%/themes/CrystalBlue/rolldown.xpm
+%%DATADIR%%/themes/CrystalBlue/rolldownA.xpm
+%%DATADIR%%/themes/CrystalBlue/rolldownO.xpm
+%%DATADIR%%/themes/CrystalBlue/rollup.xpm
+%%DATADIR%%/themes/CrystalBlue/rollupA.xpm
+%%DATADIR%%/themes/CrystalBlue/rollupO.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/collapse.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/desktop.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/expand.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/icewm.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/taskbarbg.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/taskbuttonactive.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/taskbuttonbg.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/taskbuttonminimized.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/toolbuttonbg.xpm
+%%DATADIR%%/themes/CrystalBlue/taskbar/windows.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAB.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAJ.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAM.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAP.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAQ.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAS.xpm
+%%DATADIR%%/themes/CrystalBlue/titleAT.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIB.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIJ.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIM.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIP.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIQ.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIS.xpm
+%%DATADIR%%/themes/CrystalBlue/titleIT.xpm
+%%DATADIR%%/themes/Helix/closeA.xpm
+%%DATADIR%%/themes/Helix/closeI.xpm
+%%DATADIR%%/themes/Helix/default.theme
+%%DATADIR%%/themes/Helix/maximizeA.xpm
+%%DATADIR%%/themes/Helix/maximizeI.xpm
+%%DATADIR%%/themes/Helix/menuButtonA.xpm
+%%DATADIR%%/themes/Helix/menuButtonI.xpm
+%%DATADIR%%/themes/Helix/minimizeA.xpm
+%%DATADIR%%/themes/Helix/minimizeI.xpm
+%%DATADIR%%/themes/Helix/restoreA.xpm
+%%DATADIR%%/themes/Helix/restoreI.xpm
+%%DATADIR%%/themes/Helix/titleAB.xpm
+%%DATADIR%%/themes/Helix/titleAM.xpm
+%%DATADIR%%/themes/Helix/titleAP.xpm
+%%DATADIR%%/themes/Helix/titleAS.xpm
+%%DATADIR%%/themes/Helix/titleAT.xpm
+%%DATADIR%%/themes/Helix/titleIB.xpm
+%%DATADIR%%/themes/Helix/titleIP.xpm
+%%DATADIR%%/themes/Helix/titleIS.xpm
+%%DATADIR%%/themes/Helix/titleIT.xpm
 %%DATADIR%%/themes/Infadel2/Ergonomic.theme
 %%DATADIR%%/themes/Infadel2/Overloaded.theme
 %%DATADIR%%/themes/Infadel2/closeA.xpm
@ -100,7 +317,7 @@ bin/icewmtray
 %%DATADIR%%/themes/Infadel2/default.theme
 %%DATADIR%%/themes/Infadel2/depthA.xpm
 %%DATADIR%%/themes/Infadel2/depthI.xpm
-%%DATADIR%%/themes/Infadel2/fonts.dir
+%%DATADIR%%/themes/Infadel2/fonts.dir.default
 %%DATADIR%%/themes/Infadel2/hideA.xpm
 %%DATADIR%%/themes/Infadel2/hideI.xpm
 %%DATADIR%%/themes/Infadel2/icons/app_16x16.xpm
@ -124,7 +341,9 @@ bin/icewmtray
 %%DATADIR%%/themes/Infadel2/rollupA.xpm
 %%DATADIR%%/themes/Infadel2/rollupI.xpm
 %%DATADIR%%/themes/Infadel2/snap.pcf
+%%DATADIR%%/themes/Infadel2/taskbar/bsd-daemon.xpm
 %%DATADIR%%/themes/Infadel2/taskbar/icewm-logo.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/linux.xpm
 %%DATADIR%%/themes/Infadel2/taskbar/start.xpm
 %%DATADIR%%/themes/Infadel2/taskbar/windows.xpm
 %%DATADIR%%/themes/Infadel2/titleAB.xpm
@ -143,17 +362,140 @@ bin/icewmtray
 %%DATADIR%%/themes/Infadel2/titleIR.xpm
 %%DATADIR%%/themes/Infadel2/titleIS.xpm
 %%DATADIR%%/themes/Infadel2/titleIT.xpm
-%%DATADIR%%/themes/gtk2/closeA.xpm
-%%DATADIR%%/themes/gtk2/closeI.xpm
-%%DATADIR%%/themes/gtk2/default.theme
-%%DATADIR%%/themes/gtk2/maximizeA.xpm
-%%DATADIR%%/themes/gtk2/maximizeI.xpm
-%%DATADIR%%/themes/gtk2/menuButtonA.xpm
-%%DATADIR%%/themes/gtk2/menuButtonI.xpm
-%%DATADIR%%/themes/gtk2/minimizeA.xpm
-%%DATADIR%%/themes/gtk2/minimizeI.xpm
-%%DATADIR%%/themes/gtk2/restoreA.xpm
-%%DATADIR%%/themes/gtk2/restoreI.xpm
+%%DATADIR%%/themes/NanoBlue/closeA.xpm
+%%DATADIR%%/themes/NanoBlue/closeI.xpm
+%%DATADIR%%/themes/NanoBlue/closeO.xpm
+%%DATADIR%%/themes/NanoBlue/default.theme
+%%DATADIR%%/themes/NanoBlue/dframeAB.xpm
+%%DATADIR%%/themes/NanoBlue/dframeABL.xpm
+%%DATADIR%%/themes/NanoBlue/dframeABR.xpm
+%%DATADIR%%/themes/NanoBlue/dframeAL.xpm
+%%DATADIR%%/themes/NanoBlue/dframeAR.xpm
+%%DATADIR%%/themes/NanoBlue/dframeAT.xpm
+%%DATADIR%%/themes/NanoBlue/dframeATL.xpm
+%%DATADIR%%/themes/NanoBlue/dframeATR.xpm
+%%DATADIR%%/themes/NanoBlue/dframeIB.xpm
+%%DATADIR%%/themes/NanoBlue/dframeIBL.xpm
+%%DATADIR%%/themes/NanoBlue/dframeIBR.xpm
+%%DATADIR%%/themes/NanoBlue/dframeIL.xpm
+%%DATADIR%%/themes/NanoBlue/dframeIR.xpm
+%%DATADIR%%/themes/NanoBlue/dframeIT.xpm
+%%DATADIR%%/themes/NanoBlue/dframeITL.xpm
+%%DATADIR%%/themes/NanoBlue/dframeITR.xpm
+%%DATADIR%%/themes/NanoBlue/drameAB.xpm
+%%DATADIR%%/themes/NanoBlue/drameATR.xpm
+%%DATADIR%%/themes/NanoBlue/eos.jpg
+%%DATADIR%%/themes/NanoBlue/expandA.xpm
+%%DATADIR%%/themes/NanoBlue/expandI.xpm
+%%DATADIR%%/themes/NanoBlue/expandO.xpm
+%%DATADIR%%/themes/NanoBlue/frameAB.xpm
+%%DATADIR%%/themes/NanoBlue/frameABL.xpm
+%%DATADIR%%/themes/NanoBlue/frameABR.xpm
+%%DATADIR%%/themes/NanoBlue/frameAL.xpm
+%%DATADIR%%/themes/NanoBlue/frameAR.xpm
+%%DATADIR%%/themes/NanoBlue/frameAT.xpm
+%%DATADIR%%/themes/NanoBlue/frameATL.xpm
+%%DATADIR%%/themes/NanoBlue/frameATR.xpm
+%%DATADIR%%/themes/NanoBlue/frameIB.xpm
+%%DATADIR%%/themes/NanoBlue/frameIBL.xpm
+%%DATADIR%%/themes/NanoBlue/frameIBR.xpm
+%%DATADIR%%/themes/NanoBlue/frameIL.xpm
+%%DATADIR%%/themes/NanoBlue/frameIR.xpm
+%%DATADIR%%/themes/NanoBlue/frameIT.xpm
+%%DATADIR%%/themes/NanoBlue/frameITL.xpm
+%%DATADIR%%/themes/NanoBlue/frameITR.xpm
+%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/app_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.png
+%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.png
+%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.png
+%%DATADIR%%/themes/NanoBlue/ledclock/a.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/colon.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/dot.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/m.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n0.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n1.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n2.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n3.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n4.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n5.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n6.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n7.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n8.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/n9.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/p.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/slash.xpm
+%%DATADIR%%/themes/NanoBlue/ledclock/space.xpm
+%%DATADIR%%/themes/NanoBlue/maximizeA.xpm
+%%DATADIR%%/themes/NanoBlue/maximizeI.xpm
+%%DATADIR%%/themes/NanoBlue/maximizeO.xpm
+%%DATADIR%%/themes/NanoBlue/menuButtonA.xpm
+%%DATADIR%%/themes/NanoBlue/menuButtonI.xpm
+%%DATADIR%%/themes/NanoBlue/menuButtonO.xpm
+%%DATADIR%%/themes/NanoBlue/menusel.xpm
+%%DATADIR%%/themes/NanoBlue/menusep.xpm
+%%DATADIR%%/themes/NanoBlue/minimizeA.xpm
+%%DATADIR%%/themes/NanoBlue/minimizeI.xpm
+%%DATADIR%%/themes/NanoBlue/minimizeO.xpm
+%%DATADIR%%/themes/NanoBlue/restoreA.xpm
+%%DATADIR%%/themes/NanoBlue/restoreI.xpm
+%%DATADIR%%/themes/NanoBlue/restoreO.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/collapse.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/desktop.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/expand.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/icewm.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/taskbarbg.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/taskbuttonactive.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/taskbuttonbg.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/taskbuttonminimized.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/toolbuttonbg.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/windows.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/workspacebuttonactive.xpm
+%%DATADIR%%/themes/NanoBlue/taskbar/workspacebuttonbg.xpm
+%%DATADIR%%/themes/NanoBlue/titleAB.xpm
+%%DATADIR%%/themes/NanoBlue/titleAL.xpm
+%%DATADIR%%/themes/NanoBlue/titleAM.xpm
+%%DATADIR%%/themes/NanoBlue/titleAP.xpm
+%%DATADIR%%/themes/NanoBlue/titleAR.xpm
+%%DATADIR%%/themes/NanoBlue/titleAS.xpm
+%%DATADIR%%/themes/NanoBlue/titleAT.xpm
+%%DATADIR%%/themes/NanoBlue/titleIB.xpm
+%%DATADIR%%/themes/NanoBlue/titleIL.xpm
+%%DATADIR%%/themes/NanoBlue/titleIM.xpm
+%%DATADIR%%/themes/NanoBlue/titleIP.xpm
+%%DATADIR%%/themes/NanoBlue/titleIR.xpm
+%%DATADIR%%/themes/NanoBlue/titleIS.xpm
+%%DATADIR%%/themes/NanoBlue/titleIT.xpm
+%%DATADIR%%/themes/default/closeA.xpm
+%%DATADIR%%/themes/default/closeI.xpm
+%%DATADIR%%/themes/default/default.png
+%%DATADIR%%/themes/default/default.theme
+%%DATADIR%%/themes/default/depthA.xpm
+%%DATADIR%%/themes/default/depthI.xpm
+%%DATADIR%%/themes/default/hideA.xpm
+%%DATADIR%%/themes/default/hideI.xpm
+%%DATADIR%%/themes/default/maximizeA.xpm
+%%DATADIR%%/themes/default/maximizeI.xpm
+%%DATADIR%%/themes/default/menuButtonA.xpm
+%%DATADIR%%/themes/default/menuButtonI.xpm
+%%DATADIR%%/themes/default/minimizeA.xpm
+%%DATADIR%%/themes/default/minimizeI.xpm
+%%DATADIR%%/themes/default/restoreA.xpm
+%%DATADIR%%/themes/default/restoreI.xpm
+%%DATADIR%%/themes/default/rolldownA.xpm
+%%DATADIR%%/themes/default/rolldownI.xpm
+%%DATADIR%%/themes/default/rollupA.xpm
+%%DATADIR%%/themes/default/rollupI.xpm
 %%DATADIR%%/themes/icedesert/closeA.xpm
 %%DATADIR%%/themes/icedesert/closeI.xpm
 %%DATADIR%%/themes/icedesert/closeO.xpm
@ -245,57 +587,14 @@ bin/icewmtray
 %%DATADIR%%/themes/motif/menu.xpm
 %%DATADIR%%/themes/motif/minimize.xpm
 %%DATADIR%%/themes/motif/restore.xpm
-%%DATADIR%%/themes/nice/blue.theme
-%%DATADIR%%/themes/nice/close.xpm
-%%DATADIR%%/themes/nice/default.theme
-%%DATADIR%%/themes/nice/hide.xpm
-%%DATADIR%%/themes/nice/maximize.xpm
-%%DATADIR%%/themes/nice/minimize.xpm
-%%DATADIR%%/themes/nice/restore.xpm
-%%DATADIR%%/themes/nice/rolldown.xpm
-%%DATADIR%%/themes/nice/rollup.xpm
-%%DATADIR%%/themes/nice2/closeA.xpm
-%%DATADIR%%/themes/nice2/closeI.xpm
-%%DATADIR%%/themes/nice2/default.theme
-%%DATADIR%%/themes/nice2/maximizeA.xpm
-%%DATADIR%%/themes/nice2/maximizeI.xpm
-%%DATADIR%%/themes/nice2/menuButtonA.xpm
-%%DATADIR%%/themes/nice2/menuButtonI.xpm
-%%DATADIR%%/themes/nice2/minimizeA.xpm
-%%DATADIR%%/themes/nice2/minimizeI.xpm
-%%DATADIR%%/themes/nice2/restoreA.xpm
-%%DATADIR%%/themes/nice2/restoreI.xpm
-%%DATADIR%%/themes/nice2/titleAB.xpm
-%%DATADIR%%/themes/nice2/titleAT.xpm
-%%DATADIR%%/themes/nice2/titleIB.xpm
-%%DATADIR%%/themes/nice2/titleIT.xpm
-%%DATADIR%%/themes/warp3/close.xpm
-%%DATADIR%%/themes/warp3/default.theme
-%%DATADIR%%/themes/warp3/hide.xpm
-%%DATADIR%%/themes/warp3/maximize.xpm
-%%DATADIR%%/themes/warp3/minimize.xpm
-%%DATADIR%%/themes/warp3/restore.xpm
-%%DATADIR%%/themes/warp3/rolldown.xpm
-%%DATADIR%%/themes/warp3/rollup.xpm
-%%DATADIR%%/themes/warp4/close.xpm
-%%DATADIR%%/themes/warp4/default.theme
-%%DATADIR%%/themes/warp4/hide.xpm
-%%DATADIR%%/themes/warp4/maximize.xpm
-%%DATADIR%%/themes/warp4/minimize.xpm
-%%DATADIR%%/themes/warp4/restore.xpm
 %%DATADIR%%/themes/win95/close.xpm
 %%DATADIR%%/themes/win95/default.theme
 %%DATADIR%%/themes/win95/maximize.xpm
 %%DATADIR%%/themes/win95/minimize.xpm
 %%DATADIR%%/themes/win95/restore.xpm
-%%DATADIR%%/themes/yellowmotif/close.xpm
-%%DATADIR%%/themes/yellowmotif/default.theme
-%%DATADIR%%/themes/yellowmotif/maximize.xpm
-%%DATADIR%%/themes/yellowmotif/menu.xpm
-%%DATADIR%%/themes/yellowmotif/minimize.xpm
-%%DATADIR%%/themes/yellowmotif/restore.xpm
 %%DATADIR%%/toolbar
 %%DATADIR%%/winoptions
+%%NLS%%share/locale/ar/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/be/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/icewm.mo
@ -307,6 +606,7 @@ bin/icewmtray
 %%NLS%%share/locale/es/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/he/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/id/LC_MESSAGES/icewm.mo
@ -318,6 +618,7 @@ bin/icewmtray
 %%NLS%%share/locale/mk/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/no/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/icewm.mo
@ -330,3 +631,5 @@ bin/icewmtray
 %%NLS%%share/locale/vi/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/icewm.mo
+share/xsessions/icewm-session.desktop
+share/xsessions/icewm.desktop