7 files changed, 962 insertions, 219 deletions

diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 14642ec59d6a..e06b93f0ff0f 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -6,52 +6,57 @@
 #
 
 PORTNAME=	qmc2
-PORTVERSION=	0.2.b8
-PORTREVISION=	4
+PORTVERSION=	0.35
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Qt 4 based UNIX MAME/MESS frontend supporting MAME/SDLMESS
+COMMENT=	Qt 4 based UNIX MAME/MESS frontend
 
-RUN_DEPENDS=	mame:${PORTSDIR}/emulators/mame
-RUN_DEPENDS+=	mess:${PORTSDIR}/emulators/mess
+RUN_DEPENDS=	mame:${PORTSDIR}/emulators/mame \
+		mess:${PORTSDIR}/emulators/mess
+
+NO_WRKSUBDIR=	yes
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GL=		yes
-USE_SDL=	sdl
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build gui qtestlib xml phonon opengl
 USE_XORG=	xmu
-MAKE_ENV=	QTDIR="${QTDIR}" QMAKE="${QMAKE}" SYSCONFDIR="${PREFIX}/etc"
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_GL=		glu
+USE_QT_VER=	4
+QT_COMPONENTS=	gui opengl phonon qtestlib webkit xml \
+		moc_build qmake_build rcc_build uic_build
+USE_SDL=	sdl
+USE_GMAKE=	yes
+MAKE_ARGS=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
+		SYSCONFDIR="${PREFIX}/etc" ARCH="${OPSYS}" \
+		CC_FLAGS="${CFLAGS}" CXX_FLAGS="${CXXFLAGS}" \
+		CC="${CC}" CXX="${CXX}" LINK="${CXX}"
+MAKE_JOBS_UNSAFE=yes
 
-.include <bsd.port.pre.mk>
+post-extract:
+	@${MKDIR} ${WRKSRC}/qmc2-sdlmess
+	@(cd ${WRKSRC}/qmc2; ${COPYTREE_SHARE} . ../qmc2-sdlmess)
+	@${FIND} ${WRKSRC} -name "*.sh" | ${XARGS} ${CHMOD} ${BINMODE}
 
 post-patch:
-	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.qmc2
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	@(cd ${WRKSRC}/qmc2/inst; ${SED} -e 's|DATADIR|${PREFIX}/share|' \
+		< qmc2.ini.template > qmc2.ini)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qmc2-sdlmame ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qmc2-sdlmess ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/qmc2/
-	${MKDIR} ${PREFIX}/share/qmc2/lng/
-	${CP} ${WRKSRC}/data/lng/qmc2_*.qm ${PREFIX}/share/qmc2/lng/
-	${CP} -r ${WRKSRC}/data/opt ${PREFIX}/share/qmc2/
-	${CP} -r ${WRKSRC}/data/img ${PREFIX}/share/qmc2/
-	${MKDIR} ${PREFIX}/etc/qmc2/
-	${REINPLACE_CMD} -e 's|DATADIR|${PREFIX}/share|' ${WRKSRC}/inst/qmc2.ini.template
-	${CP} ${WRKSRC}/inst/qmc2.ini.template ${PREFIX}/etc/qmc2/qmc2.ini
+	${INSTALL_PROGRAM} ${WRKSRC}/qmc2/qmc2-sdlmame ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qmc2-sdlmess/qmc2-sdlmess ${PREFIX}/bin
+	@${MKDIR} ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/qmc2/inst/qmc2.ini ${ETCDIR}
+	@${MKDIR} ${DATADIR}/img
+	@(cd ${WRKSRC}/qmc2/data/img; ${COPYTREE_SHARE} . ${DATADIR}/img)
+	@${MKDIR} ${DATADIR}/lng
+	${INSTALL_DATA} ${WRKSRC}/qmc2/data/lng/qmc2_*.qm ${DATADIR}/lng
+	@${MKDIR} ${DATADIR}/opt
+	@(cd ${WRKSRC}/qmc2/data/opt; ${COPYTREE_SHARE} . ${DATADIR}/opt)
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} -r ${WRKSRC}/data/doc/html ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/html
+	@(cd ${WRKSRC}/qmc2/data/doc/html; ${COPYTREE_SHARE} . ${DOCSDIR}/html)
 .endif
-
-post-install:
-	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/qmc2/distinfo b/emulators/qmc2/distinfo
index b02b9bcd2feb..19e35b7d4112 100644
--- a/emulators/qmc2/distinfo
+++ b/emulators/qmc2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmc2-0.2.b8.tar.bz2) = fcf6a681e116f1d1f78a4b1e701f40d51cc88032dd61b19487ae96ada97ab9d5
-SIZE (qmc2-0.2.b8.tar.bz2) = 2144670
+SHA256 (qmc2-0.35.tar.bz2) = bdf54ad4479675054cf14ce967291ff952bbfff65eec50151ab0fa64adb1a94d
+SIZE (qmc2-0.35.tar.bz2) = 9122784
diff --git a/emulators/qmc2/files/Makefile b/emulators/qmc2/files/Makefile
index a2d6507b265d..6209944f1669 100644
--- a/emulators/qmc2/files/Makefile
+++ b/emulators/qmc2/files/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-all:
-	gmake -f Makefile.qmc2 EMULATOR=SDLMAME
-	mkdir bin
-	mv qmc2-sdlmame bin/
-	gmake -f Makefile.qmc2 EMULATOR=SDLMAME clean
-	gmake -f Makefile.qmc2 EMULATOR=SDLMESS
-	mv qmc2-sdlmess bin/
+all:	qmc2/qmc2-sdlmame qmc2-sdlmess/qmc2-sdlmess
 
+qmc2/qmc2-sdlmame:
+	${MAKE} -C qmc2 EMULATOR=SDLMAME
+
+qmc2-sdlmess/qmc2-sdlmess:
+	${MAKE} -C qmc2-sdlmess EMULATOR=SDLMESS
diff --git a/emulators/qmc2/files/patch-arch__FreeBSD.cfg b/emulators/qmc2/files/patch-arch__FreeBSD.cfg
deleted file mode 100644
index ad9031080502..000000000000
--- a/emulators/qmc2/files/patch-arch__FreeBSD.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
---- arch/FreeBSD.cfg.orig	2009-03-16 02:40:31.000000000 +0100
-+++ arch/FreeBSD.cfg	2009-03-16 02:40:59.000000000 +0100
-@@ -1,7 +1,7 @@
--QMAKE    = $(QTDIR)/bin/qmake
-+QMAKE    ?= $(QTDIR)/bin/qmake
- LUPDATE  = $(QTDIR)/bin/lupdate
- LRELEASE = $(QTDIR)/bin/lrelease
--MAKE     = gmake
-+MAKE     ?= gmake
- OSNAME   = FreeBSD
- RSYNC    = rsync -lr
- SED      = sed -E
diff --git a/emulators/qmc2/files/patch-arch__default.cfg b/emulators/qmc2/files/patch-arch__default.cfg
deleted file mode 100644
index 8b8c3a6a8337..000000000000
--- a/emulators/qmc2/files/patch-arch__default.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- arch/default.cfg.orig	2009-03-16 03:02:51.000000000 +0100
-+++ arch/default.cfg	2009-03-16 03:02:57.000000000 +0100
-@@ -1,8 +1,6 @@
- QMAKEFILE  = Makefile.qmake
--QMAKE      = qmake
- LUPDATE    = lupdate
- LRELEASE   = lrelease
--MAKE       = make
- MAKESILENT = make --silent
- MKDIR      = mkdir -p
- RM         = rm -f
diff --git a/emulators/qmc2/pkg-message b/emulators/qmc2/pkg-message
index 7f72ed883e1b..ee6b674e24aa 100644
--- a/emulators/qmc2/pkg-message
+++ b/emulators/qmc2/pkg-message
@@ -6,7 +6,7 @@ You can download game preview images (screenshots) and flyer images here:
 
 http://www.mameworld.net/mamecat/download.html
 
-Extract them to a directory (like "~/.qmc/prv" and "~/.qmc/fly") and tell the
-program where to find them in the path configuration.
+Extract them to a directory (like "~/.qmc2/prv" and "~/.qmc2/fly") and tell
+the program where to find them in the path configuration.
 
 ==============================================================================
diff --git a/emulators/qmc2/pkg-plist b/emulators/qmc2/pkg-plist
index b5677da8c3a4..d61bb677a166 100644
--- a/emulators/qmc2/pkg-plist
+++ b/emulators/qmc2/pkg-plist
@@ -1,23 +1,11 @@
 bin/qmc2-sdlmame
 bin/qmc2-sdlmess
-etc/qmc2/qmc2.ini
+%%ETCDIR%%/qmc2.ini
 %%PORTDOCS%%%%DOCSDIR%%/html/de/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/de/copying.html
 %%PORTDOCS%%%%DOCSDIR%%/html/de/credits.html
 %%PORTDOCS%%%%DOCSDIR%%/html/de/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/ballou.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/jonas.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/rene.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/robert.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/sammy.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/samwise.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/sphere_blue.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/sphere_green.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/sphere_grey.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/sphere_red.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/sphere_yellowgreen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/teddy.png
-%%PORTDOCS%%%%DOCSDIR%%/html/de/img/vas.png
+%%PORTDOCS%%%%DOCSDIR%%/html/de/img
 %%PORTDOCS%%%%DOCSDIR%%/html/de/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/de/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/html/de/todo.html
@@ -25,19 +13,7 @@ etc/qmc2/qmc2.ini
 %%PORTDOCS%%%%DOCSDIR%%/html/fr/copying.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fr/credits.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fr/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/ballou.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/jonas.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/rene.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/robert.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/sammy.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/samwise.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/sphere_blue.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/sphere_green.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/sphere_grey.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/sphere_red.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/sphere_yellowgreen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/teddy.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fr/img/vas.png
+%%PORTDOCS%%%%DOCSDIR%%/html/fr/img
 %%PORTDOCS%%%%DOCSDIR%%/html/fr/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fr/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/html/fr/todo.html
@@ -45,28 +21,29 @@ etc/qmc2/qmc2.ini
 %%PORTDOCS%%%%DOCSDIR%%/html/pl/copying.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pl/credits.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pl/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/ballou.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/jonas.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/rene.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/robert.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/sammy.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/samwise.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/sphere_blue.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/sphere_green.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/sphere_grey.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/sphere_red.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/sphere_yellowgreen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/teddy.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pl/img/vas.png
+%%PORTDOCS%%%%DOCSDIR%%/html/pl/img
 %%PORTDOCS%%%%DOCSDIR%%/html/pl/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pl/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pl/todo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/copying.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/credits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/img
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pt/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/copying.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/credits.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/img/ballou.png
+%%PORTDOCS%%%%DOCSDIR%%/html/us/img/doc-bg.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/us/img/gradient1.png
+%%PORTDOCS%%%%DOCSDIR%%/html/us/img/gradient2.png
 %%PORTDOCS%%%%DOCSDIR%%/html/us/img/jonas.png
+%%PORTDOCS%%%%DOCSDIR%%/html/us/img/qmc2_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/us/img/qmc2_mess_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/us/img/rene.png
 %%PORTDOCS%%%%DOCSDIR%%/html/us/img/robert.png
 %%PORTDOCS%%%%DOCSDIR%%/html/us/img/sammy.png
@@ -81,135 +58,269 @@ etc/qmc2/qmc2.ini
 %%PORTDOCS%%%%DOCSDIR%%/html/us/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/html/us/todo.html
+%%DATADIR%%/img/activity_green.png
+%%DATADIR%%/img/activity_red.png
+%%DATADIR%%/img/add_to_favorites.png
 %%DATADIR%%/img/arcadebackground.png
 %%DATADIR%%/img/arcadecabinet.png
 %%DATADIR%%/img/arcadeforeground.png
 %%DATADIR%%/img/arcademode.png
 %%DATADIR%%/img/back.png
 %%DATADIR%%/img/broom.png
+%%DATADIR%%/img/browser.png
 %%DATADIR%%/img/calculator.png
 %%DATADIR%%/img/camera.png
+%%DATADIR%%/img/category.png
 %%DATADIR%%/img/cd.png
-%%DATADIR%%/img/clock.png
-%%DATADIR%%/img/colors.png
-%%DATADIR%%/img/configure.png
-%%DATADIR%%/img/controller.png
-%%DATADIR%%/img/disk.png
-%%DATADIR%%/img/disk2.png
-%%DATADIR%%/img/down.png
-%%DATADIR%%/img/east.png
-%%DATADIR%%/img/edit.png
-%%DATADIR%%/img/editcopy.png
-%%DATADIR%%/img/editcut.png
-%%DATADIR%%/img/editdelete.png
-%%DATADIR%%/img/editpaste.png
-%%DATADIR%%/img/edittrash.png
-%%DATADIR%%/img/exit.png
-%%DATADIR%%/img/exit_small.png
-%%DATADIR%%/img/favorites.png
-%%DATADIR%%/img/fileclose.png
-%%DATADIR%%/img/filefind.png
-%%DATADIR%%/img/filenew.png
-%%DATADIR%%/img/fileopen.png
-%%DATADIR%%/img/fileprint.png
-%%DATADIR%%/img/filesave.png
-%%DATADIR%%/img/filesaveas.png
-%%DATADIR%%/img/filter.png
-%%DATADIR%%/img/find.png
-%%DATADIR%%/img/fonts.png
-%%DATADIR%%/img/forward.png
-%%DATADIR%%/img/ghost.png
-%%DATADIR%%/img/help.png
-%%DATADIR%%/img/hint.png
-%%DATADIR%%/img/hint_small.png
-%%DATADIR%%/img/home.png
-%%DATADIR%%/img/icon.png
-%%DATADIR%%/img/info.png
-%%DATADIR%%/img/joystick.png
-%%DATADIR%%/img/keyboard.png
-%%DATADIR%%/img/kill.png
-%%DATADIR%%/img/launch.png
-%%DATADIR%%/img/led_off.png
-%%DATADIR%%/img/led_on.png
-%%DATADIR%%/img/locale.png
-%%DATADIR%%/img/lock.png
-%%DATADIR%%/img/mame.ico
-%%DATADIR%%/img/mame.png
-%%DATADIR%%/img/marquee.png
-%%DATADIR%%/img/media_back.png
-%%DATADIR%%/img/media_fastbackward.png
-%%DATADIR%%/img/media_fastforward.png
-%%DATADIR%%/img/media_next.png
-%%DATADIR%%/img/media_pause.png
-%%DATADIR%%/img/media_play.png
-%%DATADIR%%/img/media_stop.png
-%%DATADIR%%/img/mess.ico
-%%DATADIR%%/img/mess.png
-%%DATADIR%%/img/next-sail.png
-%%DATADIR%%/img/next.png
-%%DATADIR%%/img/no.png
-%%DATADIR%%/img/north.png
-%%DATADIR%%/img/opengl.png
-%%DATADIR%%/img/pencils.png
-%%DATADIR%%/img/previous-sail.png
-%%DATADIR%%/img/previous.png
-%%DATADIR%%/img/qmc2_logo_big.png
-%%DATADIR%%/img/qmc2_logo_small.png
-%%DATADIR%%/img/qt-logo.png
-%%DATADIR%%/img/redo.png
-%%DATADIR%%/img/reload.png
-%%DATADIR%%/img/reload_small.png
-%%DATADIR%%/img/remove.png
-%%DATADIR%%/img/rom.png
-%%DATADIR%%/img/search.png
-%%DATADIR%%/img/sound.png
-%%DATADIR%%/img/south.png
-%%DATADIR%%/img/sphere_blue.png
-%%DATADIR%%/img/sphere_blue_bios.png
-%%DATADIR%%/img/sphere_green.png
-%%DATADIR%%/img/sphere_green_bios.png
-%%DATADIR%%/img/sphere_grey.png
-%%DATADIR%%/img/sphere_grey_bios.png
-%%DATADIR%%/img/sphere_red.png
-%%DATADIR%%/img/sphere_red_bios.png
-%%DATADIR%%/img/sphere_yellowgreen.png
-%%DATADIR%%/img/sphere_yellowgreen_bios.png
-%%DATADIR%%/img/stop.png
-%%DATADIR%%/img/tape.png
-%%DATADIR%%/img/terminate.png
-%%DATADIR%%/img/thumbnail.png
-%%DATADIR%%/img/time.png
-%%DATADIR%%/img/toggle_fullscreen.png
-%%DATADIR%%/img/undo.png
-%%DATADIR%%/img/unknown.png
-%%DATADIR%%/img/unlock.png
-%%DATADIR%%/img/up.png
-%%DATADIR%%/img/view_detail.png
-%%DATADIR%%/img/view_tree.png
-%%DATADIR%%/img/viewmag+.png
-%%DATADIR%%/img/viewmag-.png
-%%DATADIR%%/img/viewmagfit.png
-%%DATADIR%%/img/warning.png
-%%DATADIR%%/img/west.png
-%%DATADIR%%/img/work.png
-%%DATADIR%%/img/yes.png
-%%DATADIR%%/img/zip.png
+%%DATADIR%%/img/circles/activity_green.png
+%%DATADIR%%/img/circles/activity_red.png
+%%DATADIR%%/img/circles/add_to_favorites.png
+%%DATADIR%%/img/circles/arcadebackground.png
+%%DATADIR%%/img/circles/arcadecabinet.png
+%%DATADIR%%/img/circles/arcadeforeground.png
+%%DATADIR%%/img/circles/arcademode.png
+%%DATADIR%%/img/circles/back.png
+%%DATADIR%%/img/circles/broom.png
+%%DATADIR%%/img/circles/browser.png
+%%DATADIR%%/img/circles/calculator.png
+%%DATADIR%%/img/circles/camera.png
+%%DATADIR%%/img/circles/category.png
+%%DATADIR%%/img/circles/cd.png
+%%DATADIR%%/img/circles/circuit.png
+%%DATADIR%%/img/circles/clock.png
+%%DATADIR%%/img/circles/clone.png
+%%DATADIR%%/img/circles/colors.png
+%%DATADIR%%/img/circles/compressed.png
+%%DATADIR%%/img/circles/configure.png
+%%DATADIR%%/img/circles/controller.png
+%%DATADIR%%/img/circles/detail.png
+%%DATADIR%%/img/circles/dev_cartridge.png
+%%DATADIR%%/img/circles/dev_cassette.png
+%%DATADIR%%/img/circles/dev_cdrom.png
+%%DATADIR%%/img/circles/dev_cylinder.png
+%%DATADIR%%/img/circles/dev_floppydisk.png
+%%DATADIR%%/img/circles/dev_harddisk.png
+%%DATADIR%%/img/circles/dev_magtape.png
+%%DATADIR%%/img/circles/dev_memcard.png
+%%DATADIR%%/img/circles/dev_parallel.png
+%%DATADIR%%/img/circles/dev_printer.png
+%%DATADIR%%/img/circles/dev_punchtape.png
+%%DATADIR%%/img/circles/dev_quickload.png
+%%DATADIR%%/img/circles/dev_serial.png
+%%DATADIR%%/img/circles/dev_snapshot.png
+%%DATADIR%%/img/circles/dice.png
+%%DATADIR%%/img/circles/disk.png
+%%DATADIR%%/img/circles/disk2.png
+%%DATADIR%%/img/circles/dock.png
+%%DATADIR%%/img/circles/down.png
+%%DATADIR%%/img/circles/download.png
+%%DATADIR%%/img/circles/east.png
+%%DATADIR%%/img/circles/edit.png
+%%DATADIR%%/img/circles/editcopy.png
+%%DATADIR%%/img/circles/editcut.png
+%%DATADIR%%/img/circles/editdelete.png
+%%DATADIR%%/img/circles/editpaste.png
+%%DATADIR%%/img/circles/edittrash.png
+%%DATADIR%%/img/circles/effect.png
+%%DATADIR%%/img/circles/embed.png
+%%DATADIR%%/img/circles/embed_multiple.png
+%%DATADIR%%/img/circles/exit.png
+%%DATADIR%%/img/circles/exit_small.png
+%%DATADIR%%/img/circles/export_rom_status.png
+%%DATADIR%%/img/circles/favorites.png
+%%DATADIR%%/img/circles/favorites_multiple.png
+%%DATADIR%%/img/circles/fileclose.png
+%%DATADIR%%/img/circles/filefind.png
+%%DATADIR%%/img/circles/filenew.png
+%%DATADIR%%/img/circles/fileopen.png
+%%DATADIR%%/img/circles/fileprint.png
+%%DATADIR%%/img/circles/filesave.png
+%%DATADIR%%/img/circles/filesaveas.png
+%%DATADIR%%/img/circles/filter.png
+%%DATADIR%%/img/circles/find.png
+%%DATADIR%%/img/circles/flat.png
+%%DATADIR%%/img/circles/flip.png
+%%DATADIR%%/img/circles/fonts.png
+%%DATADIR%%/img/circles/forward.png
+%%DATADIR%%/img/circles/ghost.png
+%%DATADIR%%/img/circles/ghost_video.png
+%%DATADIR%%/img/circles/gradient1.png
+%%DATADIR%%/img/circles/gradient2.png
+%%DATADIR%%/img/circles/help.png
+%%DATADIR%%/img/circles/hint.png
+%%DATADIR%%/img/circles/hint_small.png
+%%DATADIR%%/img/circles/home.png
+%%DATADIR%%/img/circles/icon.png
+%%DATADIR%%/img/circles/info.png
+%%DATADIR%%/img/circles/inspect.png
+%%DATADIR%%/img/circles/internet.png
+%%DATADIR%%/img/circles/invert_tag.png
+%%DATADIR%%/img/circles/invert_tag_all.png
+%%DATADIR%%/img/circles/joystick.png
+%%DATADIR%%/img/circles/keyboard.png
+%%DATADIR%%/img/circles/kill.png
+%%DATADIR%%/img/circles/launch.png
+%%DATADIR%%/img/circles/launch_multiple.png
+%%DATADIR%%/img/circles/led_off.png
+%%DATADIR%%/img/circles/led_on.png
+%%DATADIR%%/img/circles/locale.png
+%%DATADIR%%/img/circles/lock.png
+%%DATADIR%%/img/circles/mame.icns
+%%DATADIR%%/img/circles/mame.ico
+%%DATADIR%%/img/circles/mame.png
+%%DATADIR%%/img/circles/marquee.png
+%%DATADIR%%/img/circles/maws.png
+%%DATADIR%%/img/circles/maximize.png
+%%DATADIR%%/img/circles/media_back.png
+%%DATADIR%%/img/circles/media_fastbackward.png
+%%DATADIR%%/img/circles/media_fastforward.png
+%%DATADIR%%/img/circles/media_next.png
+%%DATADIR%%/img/circles/media_pause.png
+%%DATADIR%%/img/circles/media_play.png
+%%DATADIR%%/img/circles/media_stop.png
+%%DATADIR%%/img/circles/merge.png
+%%DATADIR%%/img/circles/merge_nok.png
+%%DATADIR%%/img/circles/merge_ok.png
+%%DATADIR%%/img/circles/mess.icns
+%%DATADIR%%/img/circles/mess.ico
+%%DATADIR%%/img/circles/mess.png
+%%DATADIR%%/img/circles/minimize.png
+%%DATADIR%%/img/circles/minus.png
+%%DATADIR%%/img/circles/movie.png
+%%DATADIR%%/img/circles/music.png
+%%DATADIR%%/img/circles/next-sail.png
+%%DATADIR%%/img/circles/next.png
+%%DATADIR%%/img/circles/no.png
+%%DATADIR%%/img/circles/north.png
+%%DATADIR%%/img/circles/notes.png
+%%DATADIR%%/img/circles/ok.png
+%%DATADIR%%/img/circles/opengl.png
+%%DATADIR%%/img/circles/pacman.png
+%%DATADIR%%/img/circles/pencils.png
+%%DATADIR%%/img/circles/plus.png
+%%DATADIR%%/img/circles/previous-sail.png
+%%DATADIR%%/img/circles/previous.png
+%%DATADIR%%/img/circles/process.png
+%%DATADIR%%/img/circles/process_multiple.png
+%%DATADIR%%/img/circles/project_mess.png
+%%DATADIR%%/img/circles/qmc2_logo_big.png
+%%DATADIR%%/img/circles/qmc2_logo_small.png
+%%DATADIR%%/img/circles/qmc2_mame_splash.png
+%%DATADIR%%/img/circles/qmc2_mess_logo_big.png
+%%DATADIR%%/img/circles/qmc2_mess_logo_small.png
+%%DATADIR%%/img/circles/qmc2_mess_splash.png
+%%DATADIR%%/img/circles/qt-logo.png
+%%DATADIR%%/img/circles/redo.png
+%%DATADIR%%/img/circles/release.png
+%%DATADIR%%/img/circles/release_alternate.png
+%%DATADIR%%/img/circles/reload.png
+%%DATADIR%%/img/circles/reload_small.png
+%%DATADIR%%/img/circles/remove.png
+%%DATADIR%%/img/circles/remove_from_favorites.png
+%%DATADIR%%/img/circles/rom.png
+%%DATADIR%%/img/circles/rom_multiple.png
+%%DATADIR%%/img/circles/search.png
+%%DATADIR%%/img/circles/search_multiple.png
+%%DATADIR%%/img/circles/sleep.png
+%%DATADIR%%/img/circles/slot.png
+%%DATADIR%%/img/circles/sound.png
+%%DATADIR%%/img/circles/south.png
+%%DATADIR%%/img/circles/speaker.png
+%%DATADIR%%/img/circles/sphere_blue.png
+%%DATADIR%%/img/circles/sphere_blue_bios.png
+%%DATADIR%%/img/circles/sphere_blue_device.png
+%%DATADIR%%/img/circles/sphere_green.png
+%%DATADIR%%/img/circles/sphere_green_bios.png
+%%DATADIR%%/img/circles/sphere_green_device.png
+%%DATADIR%%/img/circles/sphere_grey.png
+%%DATADIR%%/img/circles/sphere_grey_bios.png
+%%DATADIR%%/img/circles/sphere_grey_device.png
+%%DATADIR%%/img/circles/sphere_red.png
+%%DATADIR%%/img/circles/sphere_red_bios.png
+%%DATADIR%%/img/circles/sphere_red_device.png
+%%DATADIR%%/img/circles/sphere_yellowgreen.png
+%%DATADIR%%/img/circles/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/circles/sphere_yellowgreen_device.png
+%%DATADIR%%/img/circles/stop.png
+%%DATADIR%%/img/circles/stop_browser.png
+%%DATADIR%%/img/circles/swap.png
+%%DATADIR%%/img/circles/tag.png
+%%DATADIR%%/img/circles/tagged.png
+%%DATADIR%%/img/circles/tagged_all.png
+%%DATADIR%%/img/circles/tape.png
+%%DATADIR%%/img/circles/terminate.png
+%%DATADIR%%/img/circles/thumbnail.png
+%%DATADIR%%/img/circles/time.png
+%%DATADIR%%/img/circles/toggle_fullscreen.png
+%%DATADIR%%/img/circles/trafficlight_green.png
+%%DATADIR%%/img/circles/trafficlight_off.png
+%%DATADIR%%/img/circles/trafficlight_red.png
+%%DATADIR%%/img/circles/trafficlight_yellow.png
+%%DATADIR%%/img/circles/undo.png
+%%DATADIR%%/img/circles/unknown.png
+%%DATADIR%%/img/circles/unlock.png
+%%DATADIR%%/img/circles/untagged.png
+%%DATADIR%%/img/circles/untagged_all.png
+%%DATADIR%%/img/circles/up.png
+%%DATADIR%%/img/circles/url.png
+%%DATADIR%%/img/circles/version.png
+%%DATADIR%%/img/circles/view_detail.png
+%%DATADIR%%/img/circles/view_tree.png
+%%DATADIR%%/img/circles/viewmag+.png
+%%DATADIR%%/img/circles/viewmag-.png
+%%DATADIR%%/img/circles/viewmagfit.png
+%%DATADIR%%/img/circles/warning.png
+%%DATADIR%%/img/circles/west.png
+%%DATADIR%%/img/circles/wip.png
+%%DATADIR%%/img/circles/wizard.png
+%%DATADIR%%/img/circles/work.png
+%%DATADIR%%/img/circles/world.png
+%%DATADIR%%/img/circles/yes.png
+%%DATADIR%%/img/circles/youtube.png
+%%DATADIR%%/img/circles/zip.png
+%%DATADIR%%/img/circuit.png
+%%DATADIR%%/img/classic/activity_green.png
+%%DATADIR%%/img/classic/activity_red.png
+%%DATADIR%%/img/classic/add_to_favorites.png
 %%DATADIR%%/img/classic/arcadebackground.png
 %%DATADIR%%/img/classic/arcadecabinet.png
 %%DATADIR%%/img/classic/arcadeforeground.png
 %%DATADIR%%/img/classic/arcademode.png
 %%DATADIR%%/img/classic/back.png
 %%DATADIR%%/img/classic/broom.png
+%%DATADIR%%/img/classic/browser.png
 %%DATADIR%%/img/classic/calculator.png
 %%DATADIR%%/img/classic/camera.png
+%%DATADIR%%/img/classic/category.png
 %%DATADIR%%/img/classic/cd.png
+%%DATADIR%%/img/classic/circuit.png
 %%DATADIR%%/img/classic/clock.png
+%%DATADIR%%/img/classic/clone.png
 %%DATADIR%%/img/classic/colors.png
+%%DATADIR%%/img/classic/compressed.png
 %%DATADIR%%/img/classic/configure.png
 %%DATADIR%%/img/classic/controller.png
+%%DATADIR%%/img/classic/detail.png
+%%DATADIR%%/img/classic/dev_cartridge.png
+%%DATADIR%%/img/classic/dev_cassette.png
+%%DATADIR%%/img/classic/dev_cdrom.png
+%%DATADIR%%/img/classic/dev_cylinder.png
+%%DATADIR%%/img/classic/dev_floppydisk.png
+%%DATADIR%%/img/classic/dev_harddisk.png
+%%DATADIR%%/img/classic/dev_magtape.png
+%%DATADIR%%/img/classic/dev_memcard.png
+%%DATADIR%%/img/classic/dev_parallel.png
+%%DATADIR%%/img/classic/dev_printer.png
+%%DATADIR%%/img/classic/dev_punchtape.png
+%%DATADIR%%/img/classic/dev_quickload.png
+%%DATADIR%%/img/classic/dev_serial.png
+%%DATADIR%%/img/classic/dev_snapshot.png
+%%DATADIR%%/img/classic/dice.png
 %%DATADIR%%/img/classic/disk.png
 %%DATADIR%%/img/classic/disk2.png
+%%DATADIR%%/img/classic/dock.png
 %%DATADIR%%/img/classic/down.png
+%%DATADIR%%/img/classic/download.png
 %%DATADIR%%/img/classic/east.png
 %%DATADIR%%/img/classic/edit.png
 %%DATADIR%%/img/classic/editcopy.png
@@ -217,9 +328,14 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/classic/editdelete.png
 %%DATADIR%%/img/classic/editpaste.png
 %%DATADIR%%/img/classic/edittrash.png
+%%DATADIR%%/img/classic/effect.png
+%%DATADIR%%/img/classic/embed.png
+%%DATADIR%%/img/classic/embed_multiple.png
 %%DATADIR%%/img/classic/exit.png
 %%DATADIR%%/img/classic/exit_small.png
+%%DATADIR%%/img/classic/export_rom_status.png
 %%DATADIR%%/img/classic/favorites.png
+%%DATADIR%%/img/classic/favorites_multiple.png
 %%DATADIR%%/img/classic/fileclose.png
 %%DATADIR%%/img/classic/filefind.png
 %%DATADIR%%/img/classic/filenew.png
@@ -229,26 +345,39 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/classic/filesaveas.png
 %%DATADIR%%/img/classic/filter.png
 %%DATADIR%%/img/classic/find.png
+%%DATADIR%%/img/classic/flat.png
+%%DATADIR%%/img/classic/flip.png
 %%DATADIR%%/img/classic/fonts.png
 %%DATADIR%%/img/classic/forward.png
 %%DATADIR%%/img/classic/ghost.png
+%%DATADIR%%/img/classic/ghost_video.png
+%%DATADIR%%/img/classic/gradient1.png
+%%DATADIR%%/img/classic/gradient2.png
 %%DATADIR%%/img/classic/help.png
 %%DATADIR%%/img/classic/hint.png
 %%DATADIR%%/img/classic/hint_small.png
 %%DATADIR%%/img/classic/home.png
 %%DATADIR%%/img/classic/icon.png
 %%DATADIR%%/img/classic/info.png
+%%DATADIR%%/img/classic/inspect.png
+%%DATADIR%%/img/classic/internet.png
+%%DATADIR%%/img/classic/invert_tag.png
+%%DATADIR%%/img/classic/invert_tag_all.png
 %%DATADIR%%/img/classic/joystick.png
 %%DATADIR%%/img/classic/keyboard.png
 %%DATADIR%%/img/classic/kill.png
 %%DATADIR%%/img/classic/launch.png
+%%DATADIR%%/img/classic/launch_multiple.png
 %%DATADIR%%/img/classic/led_off.png
 %%DATADIR%%/img/classic/led_on.png
 %%DATADIR%%/img/classic/locale.png
 %%DATADIR%%/img/classic/lock.png
+%%DATADIR%%/img/classic/mame.icns
 %%DATADIR%%/img/classic/mame.ico
 %%DATADIR%%/img/classic/mame.png
 %%DATADIR%%/img/classic/marquee.png
+%%DATADIR%%/img/classic/maws.png
+%%DATADIR%%/img/classic/maximize.png
 %%DATADIR%%/img/classic/media_back.png
 %%DATADIR%%/img/classic/media_fastbackward.png
 %%DATADIR%%/img/classic/media_fastforward.png
@@ -256,47 +385,92 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/classic/media_pause.png
 %%DATADIR%%/img/classic/media_play.png
 %%DATADIR%%/img/classic/media_stop.png
+%%DATADIR%%/img/classic/merge.png
+%%DATADIR%%/img/classic/merge_nok.png
+%%DATADIR%%/img/classic/merge_ok.png
+%%DATADIR%%/img/classic/mess.icns
 %%DATADIR%%/img/classic/mess.ico
 %%DATADIR%%/img/classic/mess.png
+%%DATADIR%%/img/classic/minimize.png
+%%DATADIR%%/img/classic/minus.png
+%%DATADIR%%/img/classic/movie.png
+%%DATADIR%%/img/classic/music.png
 %%DATADIR%%/img/classic/next-sail.png
 %%DATADIR%%/img/classic/next.png
 %%DATADIR%%/img/classic/no.png
 %%DATADIR%%/img/classic/north.png
+%%DATADIR%%/img/classic/notes.png
+%%DATADIR%%/img/classic/ok.png
 %%DATADIR%%/img/classic/opengl.png
+%%DATADIR%%/img/classic/pacman.png
 %%DATADIR%%/img/classic/pencils.png
+%%DATADIR%%/img/classic/plus.png
 %%DATADIR%%/img/classic/previous-sail.png
 %%DATADIR%%/img/classic/previous.png
+%%DATADIR%%/img/classic/process.png
+%%DATADIR%%/img/classic/process_multiple.png
+%%DATADIR%%/img/classic/project_mess.png
 %%DATADIR%%/img/classic/qmc2_logo_big.png
 %%DATADIR%%/img/classic/qmc2_logo_small.png
+%%DATADIR%%/img/classic/qmc2_mame_splash.png
+%%DATADIR%%/img/classic/qmc2_mess_logo_big.png
+%%DATADIR%%/img/classic/qmc2_mess_logo_small.png
+%%DATADIR%%/img/classic/qmc2_mess_splash.png
 %%DATADIR%%/img/classic/qt-logo.png
 %%DATADIR%%/img/classic/redo.png
+%%DATADIR%%/img/classic/release.png
+%%DATADIR%%/img/classic/release_alternate.png
 %%DATADIR%%/img/classic/reload.png
 %%DATADIR%%/img/classic/reload_small.png
 %%DATADIR%%/img/classic/remove.png
+%%DATADIR%%/img/classic/remove_from_favorites.png
 %%DATADIR%%/img/classic/rom.png
+%%DATADIR%%/img/classic/rom_multiple.png
 %%DATADIR%%/img/classic/search.png
+%%DATADIR%%/img/classic/search_multiple.png
+%%DATADIR%%/img/classic/sleep.png
+%%DATADIR%%/img/classic/slot.png
 %%DATADIR%%/img/classic/sound.png
 %%DATADIR%%/img/classic/south.png
+%%DATADIR%%/img/classic/speaker.png
 %%DATADIR%%/img/classic/sphere_blue.png
 %%DATADIR%%/img/classic/sphere_blue_bios.png
+%%DATADIR%%/img/classic/sphere_blue_device.png
 %%DATADIR%%/img/classic/sphere_green.png
 %%DATADIR%%/img/classic/sphere_green_bios.png
+%%DATADIR%%/img/classic/sphere_green_device.png
 %%DATADIR%%/img/classic/sphere_grey.png
 %%DATADIR%%/img/classic/sphere_grey_bios.png
+%%DATADIR%%/img/classic/sphere_grey_device.png
 %%DATADIR%%/img/classic/sphere_red.png
 %%DATADIR%%/img/classic/sphere_red_bios.png
+%%DATADIR%%/img/classic/sphere_red_device.png
 %%DATADIR%%/img/classic/sphere_yellowgreen.png
 %%DATADIR%%/img/classic/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/classic/sphere_yellowgreen_device.png
 %%DATADIR%%/img/classic/stop.png
+%%DATADIR%%/img/classic/stop_browser.png
+%%DATADIR%%/img/classic/swap.png
+%%DATADIR%%/img/classic/tag.png
+%%DATADIR%%/img/classic/tagged.png
+%%DATADIR%%/img/classic/tagged_all.png
 %%DATADIR%%/img/classic/tape.png
 %%DATADIR%%/img/classic/terminate.png
 %%DATADIR%%/img/classic/thumbnail.png
 %%DATADIR%%/img/classic/time.png
 %%DATADIR%%/img/classic/toggle_fullscreen.png
+%%DATADIR%%/img/classic/trafficlight_green.png
+%%DATADIR%%/img/classic/trafficlight_off.png
+%%DATADIR%%/img/classic/trafficlight_red.png
+%%DATADIR%%/img/classic/trafficlight_yellow.png
 %%DATADIR%%/img/classic/undo.png
 %%DATADIR%%/img/classic/unknown.png
 %%DATADIR%%/img/classic/unlock.png
+%%DATADIR%%/img/classic/untagged.png
+%%DATADIR%%/img/classic/untagged_all.png
 %%DATADIR%%/img/classic/up.png
+%%DATADIR%%/img/classic/url.png
+%%DATADIR%%/img/classic/version.png
 %%DATADIR%%/img/classic/view_detail.png
 %%DATADIR%%/img/classic/view_tree.png
 %%DATADIR%%/img/classic/viewmag+.png
@@ -304,25 +478,61 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/classic/viewmagfit.png
 %%DATADIR%%/img/classic/warning.png
 %%DATADIR%%/img/classic/west.png
+%%DATADIR%%/img/classic/wip.png
+%%DATADIR%%/img/classic/wizard.png
 %%DATADIR%%/img/classic/work.png
+%%DATADIR%%/img/classic/world.png
 %%DATADIR%%/img/classic/yes.png
+%%DATADIR%%/img/classic/youtube.png
 %%DATADIR%%/img/classic/zip.png
+%%DATADIR%%/img/clock.png
+%%DATADIR%%/img/clone.png
+%%DATADIR%%/img/colors.png
+%%DATADIR%%/img/compressed.png
+%%DATADIR%%/img/configure.png
+%%DATADIR%%/img/controller.png
+%%DATADIR%%/img/crazy/activity_green.png
+%%DATADIR%%/img/crazy/activity_red.png
+%%DATADIR%%/img/crazy/add_to_favorites.png
 %%DATADIR%%/img/crazy/arcadebackground.png
 %%DATADIR%%/img/crazy/arcadecabinet.png
 %%DATADIR%%/img/crazy/arcadeforeground.png
 %%DATADIR%%/img/crazy/arcademode.png
 %%DATADIR%%/img/crazy/back.png
 %%DATADIR%%/img/crazy/broom.png
+%%DATADIR%%/img/crazy/browser.png
 %%DATADIR%%/img/crazy/calculator.png
 %%DATADIR%%/img/crazy/camera.png
+%%DATADIR%%/img/crazy/category.png
 %%DATADIR%%/img/crazy/cd.png
+%%DATADIR%%/img/crazy/circuit.png
 %%DATADIR%%/img/crazy/clock.png
+%%DATADIR%%/img/crazy/clone.png
 %%DATADIR%%/img/crazy/colors.png
+%%DATADIR%%/img/crazy/compressed.png
 %%DATADIR%%/img/crazy/configure.png
 %%DATADIR%%/img/crazy/controller.png
+%%DATADIR%%/img/crazy/detail.png
+%%DATADIR%%/img/crazy/dev_cartridge.png
+%%DATADIR%%/img/crazy/dev_cassette.png
+%%DATADIR%%/img/crazy/dev_cdrom.png
+%%DATADIR%%/img/crazy/dev_cylinder.png
+%%DATADIR%%/img/crazy/dev_floppydisk.png
+%%DATADIR%%/img/crazy/dev_harddisk.png
+%%DATADIR%%/img/crazy/dev_magtape.png
+%%DATADIR%%/img/crazy/dev_memcard.png
+%%DATADIR%%/img/crazy/dev_parallel.png
+%%DATADIR%%/img/crazy/dev_printer.png
+%%DATADIR%%/img/crazy/dev_punchtape.png
+%%DATADIR%%/img/crazy/dev_quickload.png
+%%DATADIR%%/img/crazy/dev_serial.png
+%%DATADIR%%/img/crazy/dev_snapshot.png
+%%DATADIR%%/img/crazy/dice.png
 %%DATADIR%%/img/crazy/disk.png
 %%DATADIR%%/img/crazy/disk2.png
+%%DATADIR%%/img/crazy/dock.png
 %%DATADIR%%/img/crazy/down.png
+%%DATADIR%%/img/crazy/download.png
 %%DATADIR%%/img/crazy/east.png
 %%DATADIR%%/img/crazy/edit.png
 %%DATADIR%%/img/crazy/editcopy.png
@@ -330,9 +540,14 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy/editdelete.png
 %%DATADIR%%/img/crazy/editpaste.png
 %%DATADIR%%/img/crazy/edittrash.png
+%%DATADIR%%/img/crazy/effect.png
+%%DATADIR%%/img/crazy/embed.png
+%%DATADIR%%/img/crazy/embed_multiple.png
 %%DATADIR%%/img/crazy/exit.png
 %%DATADIR%%/img/crazy/exit_small.png
+%%DATADIR%%/img/crazy/export_rom_status.png
 %%DATADIR%%/img/crazy/favorites.png
+%%DATADIR%%/img/crazy/favorites_multiple.png
 %%DATADIR%%/img/crazy/fileclose.png
 %%DATADIR%%/img/crazy/filefind.png
 %%DATADIR%%/img/crazy/filenew.png
@@ -342,26 +557,39 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy/filesaveas.png
 %%DATADIR%%/img/crazy/filter.png
 %%DATADIR%%/img/crazy/find.png
+%%DATADIR%%/img/crazy/flat.png
+%%DATADIR%%/img/crazy/flip.png
 %%DATADIR%%/img/crazy/fonts.png
 %%DATADIR%%/img/crazy/forward.png
 %%DATADIR%%/img/crazy/ghost.png
+%%DATADIR%%/img/crazy/ghost_video.png
+%%DATADIR%%/img/crazy/gradient1.png
+%%DATADIR%%/img/crazy/gradient2.png
 %%DATADIR%%/img/crazy/help.png
 %%DATADIR%%/img/crazy/hint.png
 %%DATADIR%%/img/crazy/hint_small.png
 %%DATADIR%%/img/crazy/home.png
 %%DATADIR%%/img/crazy/icon.png
 %%DATADIR%%/img/crazy/info.png
+%%DATADIR%%/img/crazy/inspect.png
+%%DATADIR%%/img/crazy/internet.png
+%%DATADIR%%/img/crazy/invert_tag.png
+%%DATADIR%%/img/crazy/invert_tag_all.png
 %%DATADIR%%/img/crazy/joystick.png
 %%DATADIR%%/img/crazy/keyboard.png
 %%DATADIR%%/img/crazy/kill.png
 %%DATADIR%%/img/crazy/launch.png
+%%DATADIR%%/img/crazy/launch_multiple.png
 %%DATADIR%%/img/crazy/led_off.png
 %%DATADIR%%/img/crazy/led_on.png
 %%DATADIR%%/img/crazy/locale.png
 %%DATADIR%%/img/crazy/lock.png
+%%DATADIR%%/img/crazy/mame.icns
 %%DATADIR%%/img/crazy/mame.ico
 %%DATADIR%%/img/crazy/mame.png
 %%DATADIR%%/img/crazy/marquee.png
+%%DATADIR%%/img/crazy/maws.png
+%%DATADIR%%/img/crazy/maximize.png
 %%DATADIR%%/img/crazy/media_back.png
 %%DATADIR%%/img/crazy/media_fastbackward.png
 %%DATADIR%%/img/crazy/media_fastforward.png
@@ -369,47 +597,92 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy/media_pause.png
 %%DATADIR%%/img/crazy/media_play.png
 %%DATADIR%%/img/crazy/media_stop.png
+%%DATADIR%%/img/crazy/merge.png
+%%DATADIR%%/img/crazy/merge_nok.png
+%%DATADIR%%/img/crazy/merge_ok.png
+%%DATADIR%%/img/crazy/mess.icns
 %%DATADIR%%/img/crazy/mess.ico
 %%DATADIR%%/img/crazy/mess.png
+%%DATADIR%%/img/crazy/minimize.png
+%%DATADIR%%/img/crazy/minus.png
+%%DATADIR%%/img/crazy/movie.png
+%%DATADIR%%/img/crazy/music.png
 %%DATADIR%%/img/crazy/next-sail.png
 %%DATADIR%%/img/crazy/next.png
 %%DATADIR%%/img/crazy/no.png
 %%DATADIR%%/img/crazy/north.png
+%%DATADIR%%/img/crazy/notes.png
+%%DATADIR%%/img/crazy/ok.png
 %%DATADIR%%/img/crazy/opengl.png
+%%DATADIR%%/img/crazy/pacman.png
 %%DATADIR%%/img/crazy/pencils.png
+%%DATADIR%%/img/crazy/plus.png
 %%DATADIR%%/img/crazy/previous-sail.png
 %%DATADIR%%/img/crazy/previous.png
+%%DATADIR%%/img/crazy/process.png
+%%DATADIR%%/img/crazy/process_multiple.png
+%%DATADIR%%/img/crazy/project_mess.png
 %%DATADIR%%/img/crazy/qmc2_logo_big.png
 %%DATADIR%%/img/crazy/qmc2_logo_small.png
+%%DATADIR%%/img/crazy/qmc2_mame_splash.png
+%%DATADIR%%/img/crazy/qmc2_mess_logo_big.png
+%%DATADIR%%/img/crazy/qmc2_mess_logo_small.png
+%%DATADIR%%/img/crazy/qmc2_mess_splash.png
 %%DATADIR%%/img/crazy/qt-logo.png
 %%DATADIR%%/img/crazy/redo.png
+%%DATADIR%%/img/crazy/release.png
+%%DATADIR%%/img/crazy/release_alternate.png
 %%DATADIR%%/img/crazy/reload.png
 %%DATADIR%%/img/crazy/reload_small.png
 %%DATADIR%%/img/crazy/remove.png
+%%DATADIR%%/img/crazy/remove_from_favorites.png
 %%DATADIR%%/img/crazy/rom.png
+%%DATADIR%%/img/crazy/rom_multiple.png
 %%DATADIR%%/img/crazy/search.png
+%%DATADIR%%/img/crazy/search_multiple.png
+%%DATADIR%%/img/crazy/sleep.png
+%%DATADIR%%/img/crazy/slot.png
 %%DATADIR%%/img/crazy/sound.png
 %%DATADIR%%/img/crazy/south.png
+%%DATADIR%%/img/crazy/speaker.png
 %%DATADIR%%/img/crazy/sphere_blue.png
 %%DATADIR%%/img/crazy/sphere_blue_bios.png
+%%DATADIR%%/img/crazy/sphere_blue_device.png
 %%DATADIR%%/img/crazy/sphere_green.png
 %%DATADIR%%/img/crazy/sphere_green_bios.png
+%%DATADIR%%/img/crazy/sphere_green_device.png
 %%DATADIR%%/img/crazy/sphere_grey.png
 %%DATADIR%%/img/crazy/sphere_grey_bios.png
+%%DATADIR%%/img/crazy/sphere_grey_device.png
 %%DATADIR%%/img/crazy/sphere_red.png
 %%DATADIR%%/img/crazy/sphere_red_bios.png
+%%DATADIR%%/img/crazy/sphere_red_device.png
 %%DATADIR%%/img/crazy/sphere_yellowgreen.png
 %%DATADIR%%/img/crazy/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/crazy/sphere_yellowgreen_device.png
 %%DATADIR%%/img/crazy/stop.png
+%%DATADIR%%/img/crazy/stop_browser.png
+%%DATADIR%%/img/crazy/swap.png
+%%DATADIR%%/img/crazy/tag.png
+%%DATADIR%%/img/crazy/tagged.png
+%%DATADIR%%/img/crazy/tagged_all.png
 %%DATADIR%%/img/crazy/tape.png
 %%DATADIR%%/img/crazy/terminate.png
 %%DATADIR%%/img/crazy/thumbnail.png
 %%DATADIR%%/img/crazy/time.png
 %%DATADIR%%/img/crazy/toggle_fullscreen.png
+%%DATADIR%%/img/crazy/trafficlight_green.png
+%%DATADIR%%/img/crazy/trafficlight_off.png
+%%DATADIR%%/img/crazy/trafficlight_red.png
+%%DATADIR%%/img/crazy/trafficlight_yellow.png
 %%DATADIR%%/img/crazy/undo.png
 %%DATADIR%%/img/crazy/unknown.png
 %%DATADIR%%/img/crazy/unlock.png
+%%DATADIR%%/img/crazy/untagged.png
+%%DATADIR%%/img/crazy/untagged_all.png
 %%DATADIR%%/img/crazy/up.png
+%%DATADIR%%/img/crazy/url.png
+%%DATADIR%%/img/crazy/version.png
 %%DATADIR%%/img/crazy/view_detail.png
 %%DATADIR%%/img/crazy/view_tree.png
 %%DATADIR%%/img/crazy/viewmag+.png
@@ -417,25 +690,55 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy/viewmagfit.png
 %%DATADIR%%/img/crazy/warning.png
 %%DATADIR%%/img/crazy/west.png
+%%DATADIR%%/img/crazy/wip.png
+%%DATADIR%%/img/crazy/wizard.png
 %%DATADIR%%/img/crazy/work.png
+%%DATADIR%%/img/crazy/world.png
 %%DATADIR%%/img/crazy/yes.png
+%%DATADIR%%/img/crazy/youtube.png
 %%DATADIR%%/img/crazy/zip.png
+%%DATADIR%%/img/crazy-black/activity_green.png
+%%DATADIR%%/img/crazy-black/activity_red.png
+%%DATADIR%%/img/crazy-black/add_to_favorites.png
 %%DATADIR%%/img/crazy-black/arcadebackground.png
 %%DATADIR%%/img/crazy-black/arcadecabinet.png
 %%DATADIR%%/img/crazy-black/arcadeforeground.png
 %%DATADIR%%/img/crazy-black/arcademode.png
 %%DATADIR%%/img/crazy-black/back.png
 %%DATADIR%%/img/crazy-black/broom.png
+%%DATADIR%%/img/crazy-black/browser.png
 %%DATADIR%%/img/crazy-black/calculator.png
 %%DATADIR%%/img/crazy-black/camera.png
+%%DATADIR%%/img/crazy-black/category.png
 %%DATADIR%%/img/crazy-black/cd.png
+%%DATADIR%%/img/crazy-black/circuit.png
 %%DATADIR%%/img/crazy-black/clock.png
+%%DATADIR%%/img/crazy-black/clone.png
 %%DATADIR%%/img/crazy-black/colors.png
+%%DATADIR%%/img/crazy-black/compressed.png
 %%DATADIR%%/img/crazy-black/configure.png
 %%DATADIR%%/img/crazy-black/controller.png
+%%DATADIR%%/img/crazy-black/detail.png
+%%DATADIR%%/img/crazy-black/dev_cartridge.png
+%%DATADIR%%/img/crazy-black/dev_cassette.png
+%%DATADIR%%/img/crazy-black/dev_cdrom.png
+%%DATADIR%%/img/crazy-black/dev_cylinder.png
+%%DATADIR%%/img/crazy-black/dev_floppydisk.png
+%%DATADIR%%/img/crazy-black/dev_harddisk.png
+%%DATADIR%%/img/crazy-black/dev_magtape.png
+%%DATADIR%%/img/crazy-black/dev_memcard.png
+%%DATADIR%%/img/crazy-black/dev_parallel.png
+%%DATADIR%%/img/crazy-black/dev_printer.png
+%%DATADIR%%/img/crazy-black/dev_punchtape.png
+%%DATADIR%%/img/crazy-black/dev_quickload.png
+%%DATADIR%%/img/crazy-black/dev_serial.png
+%%DATADIR%%/img/crazy-black/dev_snapshot.png
+%%DATADIR%%/img/crazy-black/dice.png
 %%DATADIR%%/img/crazy-black/disk.png
 %%DATADIR%%/img/crazy-black/disk2.png
+%%DATADIR%%/img/crazy-black/dock.png
 %%DATADIR%%/img/crazy-black/down.png
+%%DATADIR%%/img/crazy-black/download.png
 %%DATADIR%%/img/crazy-black/east.png
 %%DATADIR%%/img/crazy-black/edit.png
 %%DATADIR%%/img/crazy-black/editcopy.png
@@ -443,9 +746,14 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy-black/editdelete.png
 %%DATADIR%%/img/crazy-black/editpaste.png
 %%DATADIR%%/img/crazy-black/edittrash.png
+%%DATADIR%%/img/crazy-black/effect.png
+%%DATADIR%%/img/crazy-black/embed.png
+%%DATADIR%%/img/crazy-black/embed_multiple.png
 %%DATADIR%%/img/crazy-black/exit.png
 %%DATADIR%%/img/crazy-black/exit_small.png
+%%DATADIR%%/img/crazy-black/export_rom_status.png
 %%DATADIR%%/img/crazy-black/favorites.png
+%%DATADIR%%/img/crazy-black/favorites_multiple.png
 %%DATADIR%%/img/crazy-black/fileclose.png
 %%DATADIR%%/img/crazy-black/filefind.png
 %%DATADIR%%/img/crazy-black/filenew.png
@@ -455,26 +763,39 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy-black/filesaveas.png
 %%DATADIR%%/img/crazy-black/filter.png
 %%DATADIR%%/img/crazy-black/find.png
+%%DATADIR%%/img/crazy-black/flat.png
+%%DATADIR%%/img/crazy-black/flip.png
 %%DATADIR%%/img/crazy-black/fonts.png
 %%DATADIR%%/img/crazy-black/forward.png
 %%DATADIR%%/img/crazy-black/ghost.png
+%%DATADIR%%/img/crazy-black/ghost_video.png
+%%DATADIR%%/img/crazy-black/gradient1.png
+%%DATADIR%%/img/crazy-black/gradient2.png
 %%DATADIR%%/img/crazy-black/help.png
 %%DATADIR%%/img/crazy-black/hint.png
 %%DATADIR%%/img/crazy-black/hint_small.png
 %%DATADIR%%/img/crazy-black/home.png
 %%DATADIR%%/img/crazy-black/icon.png
 %%DATADIR%%/img/crazy-black/info.png
+%%DATADIR%%/img/crazy-black/inspect.png
+%%DATADIR%%/img/crazy-black/internet.png
+%%DATADIR%%/img/crazy-black/invert_tag.png
+%%DATADIR%%/img/crazy-black/invert_tag_all.png
 %%DATADIR%%/img/crazy-black/joystick.png
 %%DATADIR%%/img/crazy-black/keyboard.png
 %%DATADIR%%/img/crazy-black/kill.png
 %%DATADIR%%/img/crazy-black/launch.png
+%%DATADIR%%/img/crazy-black/launch_multiple.png
 %%DATADIR%%/img/crazy-black/led_off.png
 %%DATADIR%%/img/crazy-black/led_on.png
 %%DATADIR%%/img/crazy-black/locale.png
 %%DATADIR%%/img/crazy-black/lock.png
+%%DATADIR%%/img/crazy-black/mame.icns
 %%DATADIR%%/img/crazy-black/mame.ico
 %%DATADIR%%/img/crazy-black/mame.png
 %%DATADIR%%/img/crazy-black/marquee.png
+%%DATADIR%%/img/crazy-black/maws.png
+%%DATADIR%%/img/crazy-black/maximize.png
 %%DATADIR%%/img/crazy-black/media_back.png
 %%DATADIR%%/img/crazy-black/media_fastbackward.png
 %%DATADIR%%/img/crazy-black/media_fastforward.png
@@ -482,47 +803,92 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy-black/media_pause.png
 %%DATADIR%%/img/crazy-black/media_play.png
 %%DATADIR%%/img/crazy-black/media_stop.png
+%%DATADIR%%/img/crazy-black/merge.png
+%%DATADIR%%/img/crazy-black/merge_nok.png
+%%DATADIR%%/img/crazy-black/merge_ok.png
+%%DATADIR%%/img/crazy-black/mess.icns
 %%DATADIR%%/img/crazy-black/mess.ico
 %%DATADIR%%/img/crazy-black/mess.png
+%%DATADIR%%/img/crazy-black/minimize.png
+%%DATADIR%%/img/crazy-black/minus.png
+%%DATADIR%%/img/crazy-black/movie.png
+%%DATADIR%%/img/crazy-black/music.png
 %%DATADIR%%/img/crazy-black/next-sail.png
 %%DATADIR%%/img/crazy-black/next.png
 %%DATADIR%%/img/crazy-black/no.png
 %%DATADIR%%/img/crazy-black/north.png
+%%DATADIR%%/img/crazy-black/notes.png
+%%DATADIR%%/img/crazy-black/ok.png
 %%DATADIR%%/img/crazy-black/opengl.png
+%%DATADIR%%/img/crazy-black/pacman.png
 %%DATADIR%%/img/crazy-black/pencils.png
+%%DATADIR%%/img/crazy-black/plus.png
 %%DATADIR%%/img/crazy-black/previous-sail.png
 %%DATADIR%%/img/crazy-black/previous.png
+%%DATADIR%%/img/crazy-black/process.png
+%%DATADIR%%/img/crazy-black/process_multiple.png
+%%DATADIR%%/img/crazy-black/project_mess.png
 %%DATADIR%%/img/crazy-black/qmc2_logo_big.png
 %%DATADIR%%/img/crazy-black/qmc2_logo_small.png
+%%DATADIR%%/img/crazy-black/qmc2_mame_splash.png
+%%DATADIR%%/img/crazy-black/qmc2_mess_logo_big.png
+%%DATADIR%%/img/crazy-black/qmc2_mess_logo_small.png
+%%DATADIR%%/img/crazy-black/qmc2_mess_splash.png
 %%DATADIR%%/img/crazy-black/qt-logo.png
 %%DATADIR%%/img/crazy-black/redo.png
+%%DATADIR%%/img/crazy-black/release.png
+%%DATADIR%%/img/crazy-black/release_alternate.png
 %%DATADIR%%/img/crazy-black/reload.png
 %%DATADIR%%/img/crazy-black/reload_small.png
 %%DATADIR%%/img/crazy-black/remove.png
+%%DATADIR%%/img/crazy-black/remove_from_favorites.png
 %%DATADIR%%/img/crazy-black/rom.png
+%%DATADIR%%/img/crazy-black/rom_multiple.png
 %%DATADIR%%/img/crazy-black/search.png
+%%DATADIR%%/img/crazy-black/search_multiple.png
+%%DATADIR%%/img/crazy-black/sleep.png
+%%DATADIR%%/img/crazy-black/slot.png
 %%DATADIR%%/img/crazy-black/sound.png
 %%DATADIR%%/img/crazy-black/south.png
+%%DATADIR%%/img/crazy-black/speaker.png
 %%DATADIR%%/img/crazy-black/sphere_blue.png
 %%DATADIR%%/img/crazy-black/sphere_blue_bios.png
+%%DATADIR%%/img/crazy-black/sphere_blue_device.png
 %%DATADIR%%/img/crazy-black/sphere_green.png
 %%DATADIR%%/img/crazy-black/sphere_green_bios.png
+%%DATADIR%%/img/crazy-black/sphere_green_device.png
 %%DATADIR%%/img/crazy-black/sphere_grey.png
 %%DATADIR%%/img/crazy-black/sphere_grey_bios.png
+%%DATADIR%%/img/crazy-black/sphere_grey_device.png
 %%DATADIR%%/img/crazy-black/sphere_red.png
 %%DATADIR%%/img/crazy-black/sphere_red_bios.png
+%%DATADIR%%/img/crazy-black/sphere_red_device.png
 %%DATADIR%%/img/crazy-black/sphere_yellowgreen.png
 %%DATADIR%%/img/crazy-black/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/crazy-black/sphere_yellowgreen_device.png
 %%DATADIR%%/img/crazy-black/stop.png
+%%DATADIR%%/img/crazy-black/stop_browser.png
+%%DATADIR%%/img/crazy-black/swap.png
+%%DATADIR%%/img/crazy-black/tag.png
+%%DATADIR%%/img/crazy-black/tagged.png
+%%DATADIR%%/img/crazy-black/tagged_all.png
 %%DATADIR%%/img/crazy-black/tape.png
 %%DATADIR%%/img/crazy-black/terminate.png
 %%DATADIR%%/img/crazy-black/thumbnail.png
 %%DATADIR%%/img/crazy-black/time.png
 %%DATADIR%%/img/crazy-black/toggle_fullscreen.png
+%%DATADIR%%/img/crazy-black/trafficlight_green.png
+%%DATADIR%%/img/crazy-black/trafficlight_off.png
+%%DATADIR%%/img/crazy-black/trafficlight_red.png
+%%DATADIR%%/img/crazy-black/trafficlight_yellow.png
 %%DATADIR%%/img/crazy-black/undo.png
 %%DATADIR%%/img/crazy-black/unknown.png
 %%DATADIR%%/img/crazy-black/unlock.png
+%%DATADIR%%/img/crazy-black/untagged.png
+%%DATADIR%%/img/crazy-black/untagged_all.png
 %%DATADIR%%/img/crazy-black/up.png
+%%DATADIR%%/img/crazy-black/url.png
+%%DATADIR%%/img/crazy-black/version.png
 %%DATADIR%%/img/crazy-black/view_detail.png
 %%DATADIR%%/img/crazy-black/view_tree.png
 %%DATADIR%%/img/crazy-black/viewmag+.png
@@ -530,39 +896,435 @@ etc/qmc2/qmc2.ini
 %%DATADIR%%/img/crazy-black/viewmagfit.png
 %%DATADIR%%/img/crazy-black/warning.png
 %%DATADIR%%/img/crazy-black/west.png
+%%DATADIR%%/img/crazy-black/wip.png
+%%DATADIR%%/img/crazy-black/wizard.png
 %%DATADIR%%/img/crazy-black/work.png
+%%DATADIR%%/img/crazy-black/world.png
 %%DATADIR%%/img/crazy-black/yes.png
+%%DATADIR%%/img/crazy-black/youtube.png
 %%DATADIR%%/img/crazy-black/zip.png
+%%DATADIR%%/img/cubes/activity_green.png
+%%DATADIR%%/img/cubes/activity_red.png
+%%DATADIR%%/img/cubes/add_to_favorites.png
+%%DATADIR%%/img/cubes/arcadebackground.png
+%%DATADIR%%/img/cubes/arcadecabinet.png
+%%DATADIR%%/img/cubes/arcadeforeground.png
+%%DATADIR%%/img/cubes/arcademode.png
+%%DATADIR%%/img/cubes/back.png
+%%DATADIR%%/img/cubes/broom.png
+%%DATADIR%%/img/cubes/browser.png
+%%DATADIR%%/img/cubes/calculator.png
+%%DATADIR%%/img/cubes/camera.png
+%%DATADIR%%/img/cubes/category.png
+%%DATADIR%%/img/cubes/cd.png
+%%DATADIR%%/img/cubes/circuit.png
+%%DATADIR%%/img/cubes/clock.png
+%%DATADIR%%/img/cubes/clone.png
+%%DATADIR%%/img/cubes/colors.png
+%%DATADIR%%/img/cubes/compressed.png
+%%DATADIR%%/img/cubes/configure.png
+%%DATADIR%%/img/cubes/controller.png
+%%DATADIR%%/img/cubes/detail.png
+%%DATADIR%%/img/cubes/dev_cartridge.png
+%%DATADIR%%/img/cubes/dev_cassette.png
+%%DATADIR%%/img/cubes/dev_cdrom.png
+%%DATADIR%%/img/cubes/dev_cylinder.png
+%%DATADIR%%/img/cubes/dev_floppydisk.png
+%%DATADIR%%/img/cubes/dev_harddisk.png
+%%DATADIR%%/img/cubes/dev_magtape.png
+%%DATADIR%%/img/cubes/dev_memcard.png
+%%DATADIR%%/img/cubes/dev_parallel.png
+%%DATADIR%%/img/cubes/dev_printer.png
+%%DATADIR%%/img/cubes/dev_punchtape.png
+%%DATADIR%%/img/cubes/dev_quickload.png
+%%DATADIR%%/img/cubes/dev_serial.png
+%%DATADIR%%/img/cubes/dev_snapshot.png
+%%DATADIR%%/img/cubes/dice.png
+%%DATADIR%%/img/cubes/disk.png
+%%DATADIR%%/img/cubes/disk2.png
+%%DATADIR%%/img/cubes/dock.png
+%%DATADIR%%/img/cubes/down.png
+%%DATADIR%%/img/cubes/download.png
+%%DATADIR%%/img/cubes/east.png
+%%DATADIR%%/img/cubes/edit.png
+%%DATADIR%%/img/cubes/editcopy.png
+%%DATADIR%%/img/cubes/editcut.png
+%%DATADIR%%/img/cubes/editdelete.png
+%%DATADIR%%/img/cubes/editpaste.png
+%%DATADIR%%/img/cubes/edittrash.png
+%%DATADIR%%/img/cubes/effect.png
+%%DATADIR%%/img/cubes/embed.png
+%%DATADIR%%/img/cubes/embed_multiple.png
+%%DATADIR%%/img/cubes/exit.png
+%%DATADIR%%/img/cubes/exit_small.png
+%%DATADIR%%/img/cubes/export_rom_status.png
+%%DATADIR%%/img/cubes/favorites.png
+%%DATADIR%%/img/cubes/favorites_multiple.png
+%%DATADIR%%/img/cubes/fileclose.png
+%%DATADIR%%/img/cubes/filefind.png
+%%DATADIR%%/img/cubes/filenew.png
+%%DATADIR%%/img/cubes/fileopen.png
+%%DATADIR%%/img/cubes/fileprint.png
+%%DATADIR%%/img/cubes/filesave.png
+%%DATADIR%%/img/cubes/filesaveas.png
+%%DATADIR%%/img/cubes/filter.png
+%%DATADIR%%/img/cubes/find.png
+%%DATADIR%%/img/cubes/flat.png
+%%DATADIR%%/img/cubes/flip.png
+%%DATADIR%%/img/cubes/fonts.png
+%%DATADIR%%/img/cubes/forward.png
+%%DATADIR%%/img/cubes/ghost.png
+%%DATADIR%%/img/cubes/ghost_video.png
+%%DATADIR%%/img/cubes/gradient1.png
+%%DATADIR%%/img/cubes/gradient2.png
+%%DATADIR%%/img/cubes/help.png
+%%DATADIR%%/img/cubes/hint.png
+%%DATADIR%%/img/cubes/hint_small.png
+%%DATADIR%%/img/cubes/home.png
+%%DATADIR%%/img/cubes/icon.png
+%%DATADIR%%/img/cubes/info.png
+%%DATADIR%%/img/cubes/inspect.png
+%%DATADIR%%/img/cubes/internet.png
+%%DATADIR%%/img/cubes/invert_tag.png
+%%DATADIR%%/img/cubes/invert_tag_all.png
+%%DATADIR%%/img/cubes/joystick.png
+%%DATADIR%%/img/cubes/keyboard.png
+%%DATADIR%%/img/cubes/kill.png
+%%DATADIR%%/img/cubes/launch.png
+%%DATADIR%%/img/cubes/launch_multiple.png
+%%DATADIR%%/img/cubes/led_off.png
+%%DATADIR%%/img/cubes/led_on.png
+%%DATADIR%%/img/cubes/locale.png
+%%DATADIR%%/img/cubes/lock.png
+%%DATADIR%%/img/cubes/mame.icns
+%%DATADIR%%/img/cubes/mame.ico
+%%DATADIR%%/img/cubes/mame.png
+%%DATADIR%%/img/cubes/marquee.png
+%%DATADIR%%/img/cubes/maws.png
+%%DATADIR%%/img/cubes/maximize.png
+%%DATADIR%%/img/cubes/media_back.png
+%%DATADIR%%/img/cubes/media_fastbackward.png
+%%DATADIR%%/img/cubes/media_fastforward.png
+%%DATADIR%%/img/cubes/media_next.png
+%%DATADIR%%/img/cubes/media_pause.png
+%%DATADIR%%/img/cubes/media_play.png
+%%DATADIR%%/img/cubes/media_stop.png
+%%DATADIR%%/img/cubes/merge.png
+%%DATADIR%%/img/cubes/merge_nok.png
+%%DATADIR%%/img/cubes/merge_ok.png
+%%DATADIR%%/img/cubes/mess.icns
+%%DATADIR%%/img/cubes/mess.ico
+%%DATADIR%%/img/cubes/mess.png
+%%DATADIR%%/img/cubes/minimize.png
+%%DATADIR%%/img/cubes/minus.png
+%%DATADIR%%/img/cubes/movie.png
+%%DATADIR%%/img/cubes/music.png
+%%DATADIR%%/img/cubes/next-sail.png
+%%DATADIR%%/img/cubes/next.png
+%%DATADIR%%/img/cubes/no.png
+%%DATADIR%%/img/cubes/north.png
+%%DATADIR%%/img/cubes/notes.png
+%%DATADIR%%/img/cubes/ok.png
+%%DATADIR%%/img/cubes/opengl.png
+%%DATADIR%%/img/cubes/pacman.png
+%%DATADIR%%/img/cubes/pencils.png
+%%DATADIR%%/img/cubes/plus.png
+%%DATADIR%%/img/cubes/previous-sail.png
+%%DATADIR%%/img/cubes/previous.png
+%%DATADIR%%/img/cubes/process.png
+%%DATADIR%%/img/cubes/process_multiple.png
+%%DATADIR%%/img/cubes/project_mess.png
+%%DATADIR%%/img/cubes/qmc2_logo_big.png
+%%DATADIR%%/img/cubes/qmc2_logo_small.png
+%%DATADIR%%/img/cubes/qmc2_mame_splash.png
+%%DATADIR%%/img/cubes/qmc2_mess_logo_big.png
+%%DATADIR%%/img/cubes/qmc2_mess_logo_small.png
+%%DATADIR%%/img/cubes/qmc2_mess_splash.png
+%%DATADIR%%/img/cubes/qt-logo.png
+%%DATADIR%%/img/cubes/redo.png
+%%DATADIR%%/img/cubes/release.png
+%%DATADIR%%/img/cubes/release_alternate.png
+%%DATADIR%%/img/cubes/reload.png
+%%DATADIR%%/img/cubes/reload_small.png
+%%DATADIR%%/img/cubes/remove.png
+%%DATADIR%%/img/cubes/remove_from_favorites.png
+%%DATADIR%%/img/cubes/rom.png
+%%DATADIR%%/img/cubes/rom_multiple.png
+%%DATADIR%%/img/cubes/search.png
+%%DATADIR%%/img/cubes/search_multiple.png
+%%DATADIR%%/img/cubes/sleep.png
+%%DATADIR%%/img/cubes/slot.png
+%%DATADIR%%/img/cubes/sound.png
+%%DATADIR%%/img/cubes/south.png
+%%DATADIR%%/img/cubes/speaker.png
+%%DATADIR%%/img/cubes/sphere_blue.png
+%%DATADIR%%/img/cubes/sphere_blue_bios.png
+%%DATADIR%%/img/cubes/sphere_blue_device.png
+%%DATADIR%%/img/cubes/sphere_green.png
+%%DATADIR%%/img/cubes/sphere_green_bios.png
+%%DATADIR%%/img/cubes/sphere_green_device.png
+%%DATADIR%%/img/cubes/sphere_grey.png
+%%DATADIR%%/img/cubes/sphere_grey_bios.png
+%%DATADIR%%/img/cubes/sphere_grey_device.png
+%%DATADIR%%/img/cubes/sphere_red.png
+%%DATADIR%%/img/cubes/sphere_red_bios.png
+%%DATADIR%%/img/cubes/sphere_red_device.png
+%%DATADIR%%/img/cubes/sphere_yellowgreen.png
+%%DATADIR%%/img/cubes/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/cubes/sphere_yellowgreen_device.png
+%%DATADIR%%/img/cubes/stop.png
+%%DATADIR%%/img/cubes/stop_browser.png
+%%DATADIR%%/img/cubes/swap.png
+%%DATADIR%%/img/cubes/tag.png
+%%DATADIR%%/img/cubes/tagged.png
+%%DATADIR%%/img/cubes/tagged_all.png
+%%DATADIR%%/img/cubes/tape.png
+%%DATADIR%%/img/cubes/terminate.png
+%%DATADIR%%/img/cubes/thumbnail.png
+%%DATADIR%%/img/cubes/time.png
+%%DATADIR%%/img/cubes/toggle_fullscreen.png
+%%DATADIR%%/img/cubes/trafficlight_green.png
+%%DATADIR%%/img/cubes/trafficlight_off.png
+%%DATADIR%%/img/cubes/trafficlight_red.png
+%%DATADIR%%/img/cubes/trafficlight_yellow.png
+%%DATADIR%%/img/cubes/undo.png
+%%DATADIR%%/img/cubes/unknown.png
+%%DATADIR%%/img/cubes/unlock.png
+%%DATADIR%%/img/cubes/untagged.png
+%%DATADIR%%/img/cubes/untagged_all.png
+%%DATADIR%%/img/cubes/up.png
+%%DATADIR%%/img/cubes/url.png
+%%DATADIR%%/img/cubes/version.png
+%%DATADIR%%/img/cubes/view_detail.png
+%%DATADIR%%/img/cubes/view_tree.png
+%%DATADIR%%/img/cubes/viewmag+.png
+%%DATADIR%%/img/cubes/viewmag-.png
+%%DATADIR%%/img/cubes/viewmagfit.png
+%%DATADIR%%/img/cubes/warning.png
+%%DATADIR%%/img/cubes/west.png
+%%DATADIR%%/img/cubes/wip.png
+%%DATADIR%%/img/cubes/wizard.png
+%%DATADIR%%/img/cubes/work.png
+%%DATADIR%%/img/cubes/world.png
+%%DATADIR%%/img/cubes/yes.png
+%%DATADIR%%/img/cubes/youtube.png
+%%DATADIR%%/img/cubes/zip.png
+%%DATADIR%%/img/detail.png
+%%DATADIR%%/img/dev_cartridge.png
+%%DATADIR%%/img/dev_cassette.png
+%%DATADIR%%/img/dev_cdrom.png
+%%DATADIR%%/img/dev_cylinder.png
+%%DATADIR%%/img/dev_floppydisk.png
+%%DATADIR%%/img/dev_harddisk.png
+%%DATADIR%%/img/dev_magtape.png
+%%DATADIR%%/img/dev_memcard.png
+%%DATADIR%%/img/dev_parallel.png
+%%DATADIR%%/img/dev_printer.png
+%%DATADIR%%/img/dev_punchtape.png
+%%DATADIR%%/img/dev_quickload.png
+%%DATADIR%%/img/dev_serial.png
+%%DATADIR%%/img/dev_snapshot.png
+%%DATADIR%%/img/dice.png
+%%DATADIR%%/img/disk.png
+%%DATADIR%%/img/disk2.png
+%%DATADIR%%/img/dock.png
+%%DATADIR%%/img/down.png
+%%DATADIR%%/img/download.png
+%%DATADIR%%/img/east.png
+%%DATADIR%%/img/edit.png
+%%DATADIR%%/img/editcopy.png
+%%DATADIR%%/img/editcut.png
+%%DATADIR%%/img/editdelete.png
+%%DATADIR%%/img/editpaste.png
+%%DATADIR%%/img/edittrash.png
+%%DATADIR%%/img/effect.png
+%%DATADIR%%/img/embed.png
+%%DATADIR%%/img/embed_multiple.png
+%%DATADIR%%/img/exit.png
+%%DATADIR%%/img/exit_small.png
+%%DATADIR%%/img/export_rom_status.png
+%%DATADIR%%/img/favorites.png
+%%DATADIR%%/img/favorites_multiple.png
+%%DATADIR%%/img/fileclose.png
+%%DATADIR%%/img/filefind.png
+%%DATADIR%%/img/filenew.png
+%%DATADIR%%/img/fileopen.png
+%%DATADIR%%/img/fileprint.png
+%%DATADIR%%/img/filesave.png
+%%DATADIR%%/img/filesaveas.png
+%%DATADIR%%/img/filter.png
+%%DATADIR%%/img/find.png
+%%DATADIR%%/img/flat.png
+%%DATADIR%%/img/flip.png
+%%DATADIR%%/img/fonts.png
+%%DATADIR%%/img/forward.png
+%%DATADIR%%/img/ghost.png
+%%DATADIR%%/img/ghost_video.png
+%%DATADIR%%/img/gradient1.png
+%%DATADIR%%/img/gradient2.png
+%%DATADIR%%/img/help.png
+%%DATADIR%%/img/hint.png
+%%DATADIR%%/img/hint_small.png
+%%DATADIR%%/img/home.png
+%%DATADIR%%/img/icon.png
+%%DATADIR%%/img/info.png
+%%DATADIR%%/img/inspect.png
+%%DATADIR%%/img/internet.png
+%%DATADIR%%/img/invert_tag.png
+%%DATADIR%%/img/invert_tag_all.png
+%%DATADIR%%/img/joystick.png
+%%DATADIR%%/img/keyboard.png
+%%DATADIR%%/img/kill.png
+%%DATADIR%%/img/launch.png
+%%DATADIR%%/img/launch_multiple.png
+%%DATADIR%%/img/led_off.png
+%%DATADIR%%/img/led_on.png
+%%DATADIR%%/img/locale.png
+%%DATADIR%%/img/lock.png
+%%DATADIR%%/img/mame.icns
+%%DATADIR%%/img/mame.ico
+%%DATADIR%%/img/mame.png
+%%DATADIR%%/img/marquee.png
+%%DATADIR%%/img/maws.png
+%%DATADIR%%/img/maximize.png
+%%DATADIR%%/img/media_back.png
+%%DATADIR%%/img/media_fastbackward.png
+%%DATADIR%%/img/media_fastforward.png
+%%DATADIR%%/img/media_next.png
+%%DATADIR%%/img/media_pause.png
+%%DATADIR%%/img/media_play.png
+%%DATADIR%%/img/media_stop.png
+%%DATADIR%%/img/merge.png
+%%DATADIR%%/img/merge_nok.png
+%%DATADIR%%/img/merge_ok.png
+%%DATADIR%%/img/mess.icns
+%%DATADIR%%/img/mess.ico
+%%DATADIR%%/img/mess.png
+%%DATADIR%%/img/minimize.png
+%%DATADIR%%/img/minus.png
+%%DATADIR%%/img/movie.png
+%%DATADIR%%/img/music.png
+%%DATADIR%%/img/next-sail.png
+%%DATADIR%%/img/next.png
+%%DATADIR%%/img/no.png
+%%DATADIR%%/img/north.png
+%%DATADIR%%/img/notes.png
+%%DATADIR%%/img/ok.png
+%%DATADIR%%/img/opengl.png
+%%DATADIR%%/img/pacman.png
+%%DATADIR%%/img/pencils.png
+%%DATADIR%%/img/plus.png
+%%DATADIR%%/img/previous-sail.png
+%%DATADIR%%/img/previous.png
+%%DATADIR%%/img/process.png
+%%DATADIR%%/img/process_multiple.png
+%%DATADIR%%/img/project_mess.png
+%%DATADIR%%/img/qmc2_logo_big.png
+%%DATADIR%%/img/qmc2_logo_small.png
+%%DATADIR%%/img/qmc2_mame_splash.png
+%%DATADIR%%/img/qmc2_mess_logo_big.png
+%%DATADIR%%/img/qmc2_mess_logo_small.png
+%%DATADIR%%/img/qmc2_mess_splash.png
+%%DATADIR%%/img/qt-logo.png
+%%DATADIR%%/img/redo.png
+%%DATADIR%%/img/release.png
+%%DATADIR%%/img/release_alternate.png
+%%DATADIR%%/img/reload.png
+%%DATADIR%%/img/reload_small.png
+%%DATADIR%%/img/remove.png
+%%DATADIR%%/img/remove_from_favorites.png
+%%DATADIR%%/img/rom.png
+%%DATADIR%%/img/rom_multiple.png
+%%DATADIR%%/img/search.png
+%%DATADIR%%/img/search_multiple.png
+%%DATADIR%%/img/sleep.png
+%%DATADIR%%/img/slot.png
+%%DATADIR%%/img/sound.png
+%%DATADIR%%/img/south.png
+%%DATADIR%%/img/speaker.png
+%%DATADIR%%/img/sphere_blue.png
+%%DATADIR%%/img/sphere_blue_bios.png
+%%DATADIR%%/img/sphere_blue_device.png
+%%DATADIR%%/img/sphere_green.png
+%%DATADIR%%/img/sphere_green_bios.png
+%%DATADIR%%/img/sphere_green_device.png
+%%DATADIR%%/img/sphere_grey.png
+%%DATADIR%%/img/sphere_grey_bios.png
+%%DATADIR%%/img/sphere_grey_device.png
+%%DATADIR%%/img/sphere_red.png
+%%DATADIR%%/img/sphere_red_bios.png
+%%DATADIR%%/img/sphere_red_device.png
+%%DATADIR%%/img/sphere_yellowgreen.png
+%%DATADIR%%/img/sphere_yellowgreen_bios.png
+%%DATADIR%%/img/sphere_yellowgreen_device.png
+%%DATADIR%%/img/stop.png
+%%DATADIR%%/img/stop_browser.png
+%%DATADIR%%/img/swap.png
+%%DATADIR%%/img/tag.png
+%%DATADIR%%/img/tagged.png
+%%DATADIR%%/img/tagged_all.png
+%%DATADIR%%/img/tape.png
+%%DATADIR%%/img/terminate.png
+%%DATADIR%%/img/thumbnail.png
+%%DATADIR%%/img/time.png
+%%DATADIR%%/img/toggle_fullscreen.png
+%%DATADIR%%/img/trafficlight_green.png
+%%DATADIR%%/img/trafficlight_off.png
+%%DATADIR%%/img/trafficlight_red.png
+%%DATADIR%%/img/trafficlight_yellow.png
+%%DATADIR%%/img/undo.png
+%%DATADIR%%/img/unknown.png
+%%DATADIR%%/img/unlock.png
+%%DATADIR%%/img/untagged.png
+%%DATADIR%%/img/untagged_all.png
+%%DATADIR%%/img/up.png
+%%DATADIR%%/img/url.png
+%%DATADIR%%/img/version.png
+%%DATADIR%%/img/view_detail.png
+%%DATADIR%%/img/view_tree.png
+%%DATADIR%%/img/viewmag+.png
+%%DATADIR%%/img/viewmag-.png
+%%DATADIR%%/img/viewmagfit.png
+%%DATADIR%%/img/warning.png
+%%DATADIR%%/img/west.png
+%%DATADIR%%/img/wip.png
+%%DATADIR%%/img/wizard.png
+%%DATADIR%%/img/work.png
+%%DATADIR%%/img/world.png
+%%DATADIR%%/img/yes.png
+%%DATADIR%%/img/youtube.png
+%%DATADIR%%/img/zip.png
 %%DATADIR%%/lng/qmc2_de.qm
 %%DATADIR%%/lng/qmc2_fr.qm
 %%DATADIR%%/lng/qmc2_pl.qm
+%%DATADIR%%/lng/qmc2_pt.qm
 %%DATADIR%%/lng/qmc2_us.qm
-%%DATADIR%%/opt/SDLMAME/template.xml
-%%DATADIR%%/opt/SDLMESS/template.xml
 %%DATADIR%%/opt/MAME/template.xml
-%%DATADIR%%/opt/MESS/template.xml
 %%DATADIR%%/opt/MAMEUIFX32/template.xml
+%%DATADIR%%/opt/MESS/template.xml
+%%DATADIR%%/opt/SDLMAME/template.xml
+%%DATADIR%%/opt/SDLMESS/template.xml
 %%DATADIR%%/opt/template.xml
-@dirrm %%DATADIR%%/opt/SDLMAME
 @dirrm %%DATADIR%%/opt/SDLMESS
-@dirrm %%DATADIR%%/opt/MAME
+@dirrm %%DATADIR%%/opt/SDLMAME
 @dirrm %%DATADIR%%/opt/MESS
 @dirrm %%DATADIR%%/opt/MAMEUIFX32
+@dirrm %%DATADIR%%/opt/MAME
 @dirrm %%DATADIR%%/opt
 @dirrm %%DATADIR%%/lng
+@dirrm %%DATADIR%%/img/cubes
 @dirrm %%DATADIR%%/img/crazy-black
 @dirrm %%DATADIR%%/img/crazy
 @dirrm %%DATADIR%%/img/classic
+@dirrm %%DATADIR%%/img/circles
 @dirrm %%DATADIR%%/img
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/us/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/us
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pl/img
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/fr/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/de/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/de
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/qmc2
+@dirrmtry %%ETCDIR%%