* Update to 0.2

* Install the locale files
* Sort the plist

3 files changed, 211 insertions, 141 deletions

diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 1b21adc..181719c 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnome-themes-extras
-PORTVERSION=	0.1
-PORTREVISION=	3
+PORTVERSION=	0.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.1
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,6 +20,8 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 USE_GNOME=	gnomehack libgnomeui
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-themes/gnome-themes-extras/distinfo b/x11-themes/gnome-themes-extras/distinfo
index fe78bd8..826d27f 100644
--- a/x11-themes/gnome-themes-extras/distinfo
+++ b/x11-themes/gnome-themes-extras/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-extras-0.1.tar.bz2) = 3d37b14f4885a6c36287443d3400f6ca
+MD5 (gnome2/gnome-themes-extras-0.2.tar.bz2) = 04e0563d298b8419106813b1db0b15b0
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 61e0be6..7882bf7 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1,8 +1,50 @@
 lib/gtk-2.0/2.2.0/engines/libsmooth.so
+share/gnome/themes/BlueSphere/metacity-1/bg-bottom-rail.png
+share/gnome/themes/BlueSphere/metacity-1/bg-left-rail.png
+share/gnome/themes/BlueSphere/metacity-1/bg-right-rail.png
+share/gnome/themes/BlueSphere/metacity-1/bg-titlebar.png
+share/gnome/themes/BlueSphere/metacity-1/border-only-left-corner.png
+share/gnome/themes/BlueSphere/metacity-1/border-only-right-corner.png
+share/gnome/themes/BlueSphere/metacity-1/border-only-top.png
+share/gnome/themes/BlueSphere/metacity-1/button-close-down-shaded.png
+share/gnome/themes/BlueSphere/metacity-1/button-close-down.png
+share/gnome/themes/BlueSphere/metacity-1/button-close-up-shaded.png
+share/gnome/themes/BlueSphere/metacity-1/button-close-up.png
+share/gnome/themes/BlueSphere/metacity-1/button-maximize-down.png
+share/gnome/themes/BlueSphere/metacity-1/button-maximize-up.png
+share/gnome/themes/BlueSphere/metacity-1/button-minimize-down.png
+share/gnome/themes/BlueSphere/metacity-1/button-minimize-up.png
+share/gnome/themes/BlueSphere/metacity-1/corner-left-bottom.png
+share/gnome/themes/BlueSphere/metacity-1/corner-right-bottom.png
+share/gnome/themes/BlueSphere/metacity-1/metacity-theme-1.xml
+share/gnome/themes/BlueSphere/metacity-1/titlebar-left-bumper.png
+share/gnome/themes/BlueSphere/metacity-1/titlebar-left-iconbg-shaded.png
+share/gnome/themes/BlueSphere/metacity-1/titlebar-left-iconbg.png
+share/gnome/themes/BlueSphere/metacity-1/titlebar-left-title.png
+share/gnome/themes/BlueSphere/metacity-1/titlebar-right-bumper.png
+share/gnome/themes/Lush/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Nuvola/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Nuvola/metacity-1/wm-close.png
+share/gnome/themes/Nuvola/metacity-1/wm-inac.png
+share/gnome/themes/Nuvola/metacity-1/wm-max.png
+share/gnome/themes/Nuvola/metacity-1/wm-menu.png
+share/gnome/themes/Nuvola/metacity-1/wm-min.png
+share/gnome/themes/Nuvola/metacity-1/wm-restore.png
+share/gnome/themes/Wasp/metacity-1/close-active.png
+share/gnome/themes/Wasp/metacity-1/close-inactive.png
+share/gnome/themes/Wasp/metacity-1/maximize-active.png
+share/gnome/themes/Wasp/metacity-1/maximize-inactive.png
+share/gnome/themes/Wasp/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Wasp/metacity-1/mid-title-active.png
+share/gnome/themes/Wasp/metacity-1/minimize-active.png
+share/gnome/themes/Wasp/metacity-1/minimize-inactive.png
+share/gnome/themes/Wasp/metacity-1/restore-active.png
+share/gnome/themes/Wasp/metacity-1/restore-inactive.png
+share/icons/BlueSphere/index.theme
 share/icons/BlueSphere/scalable/stock/3downarrow.svg
 share/icons/BlueSphere/scalable/stock/3uparrow.svg
-share/icons/BlueSphere/scalable/stock/arrow-down-dash.svg
 share/icons/BlueSphere/scalable/stock/arrow-down-2.0.svg
+share/icons/BlueSphere/scalable/stock/arrow-down-dash.svg
 share/icons/BlueSphere/scalable/stock/arrow-left.svg
 share/icons/BlueSphere/scalable/stock/arrow-right-2.0.svg
 share/icons/BlueSphere/scalable/stock/arrow-up-dash-2.0.svg
@@ -22,8 +64,8 @@ share/icons/BlueSphere/scalable/stock/exit.svg
 share/icons/BlueSphere/scalable/stock/filenew.svg
 share/icons/BlueSphere/scalable/stock/fileopen.svg
 share/icons/BlueSphere/scalable/stock/filesave-2.1.svg
-share/icons/BlueSphere/scalable/stock/filesaveas.svg
 share/icons/BlueSphere/scalable/stock/filesave-small.svg
+share/icons/BlueSphere/scalable/stock/filesaveas.svg
 share/icons/BlueSphere/scalable/stock/find.svg
 share/icons/BlueSphere/scalable/stock/gohome-2.2.svg
 share/icons/BlueSphere/scalable/stock/help.svg
@@ -58,7 +100,11 @@ share/icons/BlueSphere/scalable/stock/text_under.svg
 share/icons/BlueSphere/scalable/stock/undo-3.2.svg
 share/icons/BlueSphere/scalable/stock/viewmag-_2.svg
 share/icons/BlueSphere/scalable/stock/viewmagfit.svg
-share/icons/BlueSphere/index.theme
+share/icons/Lush/index.theme
+share/icons/Lush/scalable/apps/gnome-gimp.svg
+share/icons/Lush/scalable/apps/gnome-palette.svg
+share/icons/Lush/scalable/apps/mozilla-star.svg
+share/icons/Lush/scalable/apps/redhat-web-browser.svg
 share/icons/Lush/scalable/devices/gnome-dev-cdrom-audio.svg
 share/icons/Lush/scalable/devices/gnome-dev-cdrom.svg
 share/icons/Lush/scalable/devices/gnome-dev-cdwriter.svg
@@ -67,11 +113,11 @@ share/icons/Lush/scalable/devices/gnome-dev-floppy.svg
 share/icons/Lush/scalable/devices/gnome-dev-harddisk.svg
 share/icons/Lush/scalable/devices/gnome-dev-joystick.svg
 share/icons/Lush/scalable/devices/gnome-dev-mouse.svg
-share/icons/Lush/scalable/devices/gnome-dev-printer.svg
-share/icons/Lush/scalable/devices/gnome-dev-zipdisk.svg
-share/icons/Lush/scalable/devices/gnome-dev-symlink.svg
 share/icons/Lush/scalable/devices/gnome-dev-network.svg
+share/icons/Lush/scalable/devices/gnome-dev-printer.svg
 share/icons/Lush/scalable/devices/gnome-dev-scanner.svg
+share/icons/Lush/scalable/devices/gnome-dev-symlink.svg
+share/icons/Lush/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/Lush/scalable/emblems/emblem-audio.svg
 share/icons/Lush/scalable/emblems/emblem-camera.svg
 share/icons/Lush/scalable/emblems/emblem-cool.svg
@@ -81,24 +127,24 @@ share/icons/Lush/scalable/emblems/emblem-documents.svg
 share/icons/Lush/scalable/emblems/emblem-fun.svg
 share/icons/Lush/scalable/emblems/emblem-generic.svg
 share/icons/Lush/scalable/emblems/emblem-important.svg
+share/icons/Lush/scalable/emblems/emblem-mail.svg
+share/icons/Lush/scalable/emblems/emblem-multimedia.svg
 share/icons/Lush/scalable/emblems/emblem-noread.svg
 share/icons/Lush/scalable/emblems/emblem-nowrite.svg
-share/icons/Lush/scalable/emblems/emblem-mail.svg
 share/icons/Lush/scalable/emblems/emblem-ohno.svg
 share/icons/Lush/scalable/emblems/emblem-package.svg
 share/icons/Lush/scalable/emblems/emblem-pictures.svg
 share/icons/Lush/scalable/emblems/emblem-relax.svg
 share/icons/Lush/scalable/emblems/emblem-symbolic-link.svg
-share/icons/Lush/scalable/emblems/emblem-multimedia.svg
 share/icons/Lush/scalable/emblems/emblem-web.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-blockdev.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-bookmark-missing.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-bookmark.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Lush/scalable/filesystems/gnome-fs-directory-accept.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Lush/scalable/filesystems/gnome-fs-directory.svg
+share/icons/Lush/scalable/filesystems/gnome-fs-directory-accept.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-directory.icon
+share/icons/Lush/scalable/filesystems/gnome-fs-directory.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-executable.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-ftp.svg
 share/icons/Lush/scalable/filesystems/gnome-fs-home.svg
@@ -126,32 +172,40 @@ share/icons/Lush/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.s
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-deb.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font-type1.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-font.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-gzip.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-jar.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-objectfile.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-ogg.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-php.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-reject.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-rpm.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-audio-basic.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-audio.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-audio-x-midi.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-audio-x-pn-realaudio.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-image.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-audio.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-image-xcf.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-image.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-html.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-asm.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c++.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c-header.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-c++.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-fortran.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-pascal.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-install.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-java.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-asm.svg
-share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-yacc.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-pascal.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-readme.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-text-x-yacc.svg
+share/icons/Lush/scalable/mimetypes/gnome-mime-text.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-video-mpeg.svg
 share/icons/Lush/scalable/mimetypes/gnome-mime-video.svg
 share/icons/Lush/scalable/mimetypes/gnome-package.svg
@@ -164,22 +218,36 @@ share/icons/Lush/scalable/stock/editpaste.svg
 share/icons/Lush/scalable/stock/edittrash.svg
 share/icons/Lush/scalable/stock/filenew.svg
 share/icons/Lush/scalable/stock/fileopen.svg
-share/icons/Lush/scalable/stock/filesaveas.svg
 share/icons/Lush/scalable/stock/filesave.svg
+share/icons/Lush/scalable/stock/filesaveas.svg
 share/icons/Lush/scalable/stock/forward.svg
 share/icons/Lush/scalable/stock/gohome.svg
 share/icons/Lush/scalable/stock/help.svg
 share/icons/Lush/scalable/stock/info.svg
+share/icons/Lush/scalable/stock/print.svg
 share/icons/Lush/scalable/stock/reload.svg
 share/icons/Lush/scalable/stock/up.svg
-share/icons/Lush/scalable/stock/print.svg
-share/icons/Lush/index.theme
+share/icons/Nuvola/index.theme
+share/icons/Nuvola/scalable/apps/evolution-1.4.svg
+share/icons/Nuvola/scalable/apps/gnome-applications.svg
 share/icons/Nuvola/scalable/apps/gnome-envelope.svg
+share/icons/Nuvola/scalable/apps/gnome-favorites.svg
 share/icons/Nuvola/scalable/apps/gnome-gimp.svg
+share/icons/Nuvola/scalable/apps/gnome-globe.svg
+share/icons/Nuvola/scalable/apps/gnome-graphics.svg
+share/icons/Nuvola/scalable/apps/gnome-joystick.svg
 share/icons/Nuvola/scalable/apps/gnome-logo.svg
+share/icons/Nuvola/scalable/apps/gnome-multimedia.svg
+share/icons/Nuvola/scalable/apps/gnome-palette.svg
+share/icons/Nuvola/scalable/apps/gnome-searchtool.svg
 share/icons/Nuvola/scalable/apps/gnome-terminal.svg
+share/icons/Nuvola/scalable/apps/go.svg
+share/icons/Nuvola/scalable/apps/mozilla-star.svg
 share/icons/Nuvola/scalable/apps/my-computer.svg
+share/icons/Nuvola/scalable/apps/realplayer.svg
 share/icons/Nuvola/scalable/apps/redhat-email.svg
+share/icons/Nuvola/scalable/apps/redhat-web-browser.svg
+share/icons/Nuvola/scalable/apps/system-search-32.svg
 share/icons/Nuvola/scalable/apps/web-browser.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-cdrom-audio.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-cdrom.svg
@@ -202,23 +270,23 @@ share/icons/Nuvola/scalable/emblems/emblem-favourite.svg
 share/icons/Nuvola/scalable/emblems/emblem-fun.svg
 share/icons/Nuvola/scalable/emblems/emblem-generic.svg
 share/icons/Nuvola/scalable/emblems/emblem-important.svg
+share/icons/Nuvola/scalable/emblems/emblem-multimedia.svg
 share/icons/Nuvola/scalable/emblems/emblem-noread.svg
 share/icons/Nuvola/scalable/emblems/emblem-nowrite.svg
 share/icons/Nuvola/scalable/emblems/emblem-ohno.svg
 share/icons/Nuvola/scalable/emblems/emblem-package.svg
 share/icons/Nuvola/scalable/emblems/emblem-pictures.svg
 share/icons/Nuvola/scalable/emblems/emblem-relax.svg
-share/icons/Nuvola/scalable/emblems/emblem-multimedia.svg
 share/icons/Nuvola/scalable/emblems/emblem-symbolic-link.svg
 share/icons/Nuvola/scalable/emblems/emblem-web.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-blockdev.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-bookmark-missing.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-bookmark.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Nuvola/scalable/filesystems/gnome-fs-directory.svg
+share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-directory.icon
+share/icons/Nuvola/scalable/filesystems/gnome-fs-directory.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-executable.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-ftp.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-home.svg
@@ -241,72 +309,94 @@ share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.sv
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.draw.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-abiword.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-deb.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-dvi.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-executable-binary.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-type1.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-iso-image.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-ogg.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-rpm.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio-x-midi.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio-x-pn-realaudio.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-text.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-audio.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-xcf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-image.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Nuvola/scalable/stock/back.svg
-share/icons/Nuvola/scalable/stock/bookmark_add.svg
+share/icons/Nuvola/scalable/stock/applets-screenshooter.svg
 share/icons/Nuvola/scalable/stock/bookmark.svg
+share/icons/Nuvola/scalable/stock/bookmark_add.svg
 share/icons/Nuvola/scalable/stock/brokenimage.svg
-share/icons/Nuvola/scalable/stock/down.svg
+share/icons/Nuvola/scalable/stock/edit.svg
 share/icons/Nuvola/scalable/stock/editcopy.svg
 share/icons/Nuvola/scalable/stock/editdelete.svg
 share/icons/Nuvola/scalable/stock/editpaste.svg
-share/icons/Nuvola/scalable/stock/edit.svg
 share/icons/Nuvola/scalable/stock/filenew.svg
 share/icons/Nuvola/scalable/stock/fileopen.svg
 share/icons/Nuvola/scalable/stock/filesave.svg
-share/icons/Nuvola/scalable/stock/findreplace.svg
-share/icons/Nuvola/scalable/stock/find.svg
 share/icons/Nuvola/scalable/stock/filesaveas.svg
-share/icons/Nuvola/scalable/stock/folder_new.svg
+share/icons/Nuvola/scalable/stock/find.svg
+share/icons/Nuvola/scalable/stock/findreplace.svg
 share/icons/Nuvola/scalable/stock/folder.svg
-share/icons/Nuvola/scalable/stock/forward.svg
+share/icons/Nuvola/scalable/stock/folder_new.svg
 share/icons/Nuvola/scalable/stock/gnome-logo.svg
-share/icons/Nuvola/scalable/stock/home.svg
+share/icons/Nuvola/scalable/stock/print-preview.svg
 share/icons/Nuvola/scalable/stock/printer.svg
-share/icons/Nuvola/scalable/stock/up.svg
 share/icons/Nuvola/scalable/stock/recycled.svg
 share/icons/Nuvola/scalable/stock/reload.svg
-share/icons/Nuvola/scalable/stock/stop.svg
-share/icons/Nuvola/index.theme
+share/icons/Nuvola/scalable/stock/stock_cdrom.svg
+share/icons/Nuvola/scalable/stock/stock_go-back.svg
+share/icons/Nuvola/scalable/stock/stock_go-down.svg
+share/icons/Nuvola/scalable/stock/stock_go-forward.svg
+share/icons/Nuvola/scalable/stock/stock_go-up.svg
+share/icons/Nuvola/scalable/stock/stock_home.svg
+share/icons/Nuvola/scalable/stock/stock_stop.svg
+share/icons/Wasp/index.theme
 share/icons/Wasp/scalable/apps/applets-screenshooter.svg
 share/icons/Wasp/scalable/apps/bluefish.svg
-share/icons/Wasp/scalable/apps/control-center2.svg
-share/icons/Wasp/scalable/apps/editor-bitmap.svg
+share/icons/Wasp/scalable/apps/evolution-1.4.svg
+share/icons/Wasp/scalable/apps/file-manager.svg
 share/icons/Wasp/scalable/apps/fonts-capplet.svg
 share/icons/Wasp/scalable/apps/gdm.svg
 share/icons/Wasp/scalable/apps/gedit-icon.svg
-share/icons/Wasp/scalable/apps/gimp.svg
 share/icons/Wasp/scalable/apps/gnome-audio2.svg
 share/icons/Wasp/scalable/apps/gnome-cd-player.svg
 share/icons/Wasp/scalable/apps/gnome-devel.svg
+share/icons/Wasp/scalable/apps/gnome-envelope.svg
+share/icons/Wasp/scalable/apps/gnome-favorites.svg
 share/icons/Wasp/scalable/apps/gnome-gimp.svg
 share/icons/Wasp/scalable/apps/gnome-globe.svg
 share/icons/Wasp/scalable/apps/gnome-joystick.svg
+share/icons/Wasp/scalable/apps/gnome-media-player.svg
+share/icons/Wasp/scalable/apps/gnome-monitor.svg
+share/icons/Wasp/scalable/apps/gnome-multimedia.svg
+share/icons/Wasp/scalable/apps/gnome-palette.svg
 share/icons/Wasp/scalable/apps/gnome-printer-properties.svg
+share/icons/Wasp/scalable/apps/gnome-terminal.svg
+share/icons/Wasp/scalable/apps/gnome-util.svg
 share/icons/Wasp/scalable/apps/gnumeric.svg
+share/icons/Wasp/scalable/apps/gpdf.svg
 share/icons/Wasp/scalable/apps/keyboard.svg
-share/icons/Wasp/scalable/apps/mozilla.svg
-share/icons/Wasp/scalable/apps/procman.svg
+share/icons/Wasp/scalable/apps/mozilla-star.svg
+share/icons/Wasp/scalable/apps/my-computer.svg
 share/icons/Wasp/scalable/apps/properties-screensaver.svg
 share/icons/Wasp/scalable/apps/redhat-config-users.svg
-share/icons/Wasp/scalable/apps/redhat-email.svg
 share/icons/Wasp/scalable/apps/redhat-web-browser.svg
+share/icons/Wasp/scalable/apps/system-tools.svg
+share/icons/Wasp/scalable/apps/vanity.svg
 share/icons/Wasp/scalable/apps/web-browser.svg
+share/icons/Wasp/scalable/apps/xmms.svg
 share/icons/Wasp/scalable/devices/gnome-dev-camera.svg
 share/icons/Wasp/scalable/devices/gnome-dev-cdrom-audio.svg
 share/icons/Wasp/scalable/devices/gnome-dev-cdrom.svg
@@ -315,14 +405,14 @@ share/icons/Wasp/scalable/devices/gnome-dev-dvd.svg
 share/icons/Wasp/scalable/devices/gnome-dev-firewire.svg
 share/icons/Wasp/scalable/devices/gnome-dev-floppy.svg
 share/icons/Wasp/scalable/devices/gnome-dev-harddisk.svg
+share/icons/Wasp/scalable/devices/gnome-dev-network.svg
 share/icons/Wasp/scalable/devices/gnome-dev-palm.svg
 share/icons/Wasp/scalable/devices/gnome-dev-printer.svg
-share/icons/Wasp/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/Wasp/scalable/devices/gnome-dev-symlink.svg
 share/icons/Wasp/scalable/devices/gnome-dev-tape.svg
 share/icons/Wasp/scalable/devices/gnome-dev-tv.svg
 share/icons/Wasp/scalable/devices/gnome-dev-usb.svg
-share/icons/Wasp/scalable/devices/gnome-dev-network.svg
+share/icons/Wasp/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/Wasp/scalable/emblems/emblem-audio.svg
 share/icons/Wasp/scalable/emblems/emblem-camera.svg
 share/icons/Wasp/scalable/emblems/emblem-cool.svg
@@ -332,23 +422,23 @@ share/icons/Wasp/scalable/emblems/emblem-documents.svg
 share/icons/Wasp/scalable/emblems/emblem-fun.svg
 share/icons/Wasp/scalable/emblems/emblem-generic.svg
 share/icons/Wasp/scalable/emblems/emblem-important.svg
+share/icons/Wasp/scalable/emblems/emblem-mail.svg
+share/icons/Wasp/scalable/emblems/emblem-multimedia.svg
 share/icons/Wasp/scalable/emblems/emblem-noread.svg
 share/icons/Wasp/scalable/emblems/emblem-nowrite.svg
-share/icons/Wasp/scalable/emblems/emblem-mail.svg
 share/icons/Wasp/scalable/emblems/emblem-package.svg
 share/icons/Wasp/scalable/emblems/emblem-pictures.svg
 share/icons/Wasp/scalable/emblems/emblem-relax.svg
 share/icons/Wasp/scalable/emblems/emblem-symbolic-link.svg
 share/icons/Wasp/scalable/emblems/emblem-web.svg
-share/icons/Wasp/scalable/emblems/emblem-multimedia.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-blockdev.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-bookmark-missing.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-bookmark.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-chardev.svg
-share/icons/Wasp/scalable/filesystems/gnome-fs-directory-accept.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-directory-accept.icon
-share/icons/Wasp/scalable/filesystems/gnome-fs-directory.svg
+share/icons/Wasp/scalable/filesystems/gnome-fs-directory-accept.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-directory.icon
+share/icons/Wasp/scalable/filesystems/gnome-fs-directory.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-executable.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-home.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-loading-icon.svg
@@ -359,44 +449,53 @@ share/icons/Wasp/scalable/filesystems/gnome-fs-smb.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-trash-empty.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-trash-full.svg
 share/icons/Wasp/scalable/filesystems/gnome-fs-web.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-application-pgp.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-image.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-image-xcf.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-package.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-html.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-c-header.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-c.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-java.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-pdf.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-pgp.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-rtf.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-text.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-deb.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font-type1.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-font.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-gnome-app-info.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-ogg.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-php.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-rpm.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-tar.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-application-x-zip.svg
-share/icons/Wasp/scalable/mimetypes/gnome-mime-audio.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-audio-x-aiff.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-audio-x-mp3.svg
 share/icons/Wasp/scalable/mimetypes/gnome-mime-audio-x-wav.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-audio.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-image-xcf.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-image.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-package.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-c-header.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-c.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-text-x-java.svg
+share/icons/Wasp/scalable/mimetypes/gnome-mime-video.svg
+share/icons/Wasp/scalable/stock/checkmark.svg
 share/icons/Wasp/scalable/stock/clipboard.svg
-share/icons/Wasp/scalable/stock/folder.svg
-share/icons/Wasp/scalable/stock/help_book.svg
 share/icons/Wasp/scalable/stock/disk-floppy.svg
 share/icons/Wasp/scalable/stock/filenew.svg
-share/icons/Wasp/scalable/stock/findreplace.svg
 share/icons/Wasp/scalable/stock/find.svg
+share/icons/Wasp/scalable/stock/findreplace.svg
+share/icons/Wasp/scalable/stock/folder.svg
+share/icons/Wasp/scalable/stock/help_book.svg
 share/icons/Wasp/scalable/stock/home.svg
 share/icons/Wasp/scalable/stock/information.svg
-share/icons/Wasp/scalable/stock/checkmark.svg
 share/icons/Wasp/scalable/stock/navigation_down.svg
-share/icons/Wasp/scalable/stock/navigation_up.svg
 share/icons/Wasp/scalable/stock/navigation_left.svg
-share/icons/Wasp/scalable/stock/navigation_right.svg
 share/icons/Wasp/scalable/stock/navigation_reload.svg
+share/icons/Wasp/scalable/stock/navigation_right.svg
 share/icons/Wasp/scalable/stock/navigation_stop.svg
+share/icons/Wasp/scalable/stock/navigation_up.svg
 share/icons/Wasp/scalable/stock/print.svg
 share/icons/Wasp/scalable/stock/stickies.svg
 share/icons/Wasp/scalable/stock/stock_accessories.svg
@@ -405,75 +504,42 @@ share/icons/Wasp/scalable/stock/stock_internet.svg
 share/icons/Wasp/scalable/stock/stock_lockscreen.svg
 share/icons/Wasp/scalable/stock/stock_multimedia.svg
 share/icons/Wasp/scalable/stock/stock_searchtool.svg
-share/icons/Wasp/index.theme
-share/gnome/themes/BlueSphere/metacity-1/metacity-theme-1.xml
-share/gnome/themes/BlueSphere/metacity-1/bg-bottom-rail.png
-share/gnome/themes/BlueSphere/metacity-1/bg-left-rail.png
-share/gnome/themes/BlueSphere/metacity-1/bg-right-rail.png
-share/gnome/themes/BlueSphere/metacity-1/bg-titlebar.png
-share/gnome/themes/BlueSphere/metacity-1/border-only-left-corner.png
-share/gnome/themes/BlueSphere/metacity-1/border-only-right-corner.png
-share/gnome/themes/BlueSphere/metacity-1/border-only-top.png
-share/gnome/themes/BlueSphere/metacity-1/button-close-down.png
-share/gnome/themes/BlueSphere/metacity-1/button-close-down-shaded.png
-share/gnome/themes/BlueSphere/metacity-1/button-close-up.png
-share/gnome/themes/BlueSphere/metacity-1/button-close-up-shaded.png
-share/gnome/themes/BlueSphere/metacity-1/button-maximize-down.png
-share/gnome/themes/BlueSphere/metacity-1/button-maximize-up.png
-share/gnome/themes/BlueSphere/metacity-1/button-minimize-down.png
-share/gnome/themes/BlueSphere/metacity-1/button-minimize-up.png
-share/gnome/themes/BlueSphere/metacity-1/corner-left-bottom.png
-share/gnome/themes/BlueSphere/metacity-1/corner-right-bottom.png
-share/gnome/themes/BlueSphere/metacity-1/titlebar-left-bumper.png
-share/gnome/themes/BlueSphere/metacity-1/titlebar-left-iconbg.png
-share/gnome/themes/BlueSphere/metacity-1/titlebar-left-iconbg-shaded.png
-share/gnome/themes/BlueSphere/metacity-1/titlebar-left-title.png
-share/gnome/themes/BlueSphere/metacity-1/titlebar-right-bumper.png
-share/gnome/themes/Lush/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Nuvola/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Nuvola/metacity-1/wm-inac.png
-share/gnome/themes/Nuvola/metacity-1/wm-min.png
-share/gnome/themes/Nuvola/metacity-1/wm-max.png
-share/gnome/themes/Nuvola/metacity-1/wm-restore.png
-share/gnome/themes/Nuvola/metacity-1/wm-close.png
-share/gnome/themes/Nuvola/metacity-1/wm-menu.png
-share/gnome/themes/Wasp/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Wasp/metacity-1/close-active.png
-share/gnome/themes/Wasp/metacity-1/close-inactive.png
-share/gnome/themes/Wasp/metacity-1/maximize-active.png
-share/gnome/themes/Wasp/metacity-1/maximize-inactive.png
-share/gnome/themes/Wasp/metacity-1/mid-title-active.png
-share/gnome/themes/Wasp/metacity-1/minimize-active.png
-share/gnome/themes/Wasp/metacity-1/minimize-inactive.png
-share/gnome/themes/Wasp/metacity-1/restore-active.png
-share/gnome/themes/Wasp/metacity-1/restore-inactive.png
-share/themes/BlueSphere/gtk-2.0/gtkrc
-share/themes/BlueSphere/gtk-2.0/iconrc
+share/locale/ca/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/cs/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/de/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/es/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/fr/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/he/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/pl/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/pt/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/sv/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/tr/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-themes-extra.mo
 share/themes/BlueSphere/gtk-2.0/arrow_down_clicked.svg
 share/themes/BlueSphere/gtk-2.0/arrow_down_normal.svg
-share/themes/BlueSphere/gtk-2.0/arrow_left_normal.svg
 share/themes/BlueSphere/gtk-2.0/arrow_left_clicked.svg
+share/themes/BlueSphere/gtk-2.0/arrow_left_normal.svg
 share/themes/BlueSphere/gtk-2.0/arrow_right_clicked.svg
 share/themes/BlueSphere/gtk-2.0/arrow_right_normal.svg
 share/themes/BlueSphere/gtk-2.0/arrow_up_clicked.svg
 share/themes/BlueSphere/gtk-2.0/arrow_up_normal.svg
 share/themes/BlueSphere/gtk-2.0/background.png
 share/themes/BlueSphere/gtk-2.0/blank.png
+share/themes/BlueSphere/gtk-2.0/box_gap_bottom.png
 share/themes/BlueSphere/gtk-2.0/box_gap_bottom_end.png
 share/themes/BlueSphere/gtk-2.0/box_gap_bottom_focus.png
-share/themes/BlueSphere/gtk-2.0/box_gap_bottom.png
 share/themes/BlueSphere/gtk-2.0/box_gap_bottom_start.png
 share/themes/BlueSphere/gtk-2.0/box_gap_left.png
 share/themes/BlueSphere/gtk-2.0/box_gap_left_end.png
 share/themes/BlueSphere/gtk-2.0/box_gap_left_focus.png
 share/themes/BlueSphere/gtk-2.0/box_gap_left_start.png
+share/themes/BlueSphere/gtk-2.0/box_gap_right.png
 share/themes/BlueSphere/gtk-2.0/box_gap_right_end.png
 share/themes/BlueSphere/gtk-2.0/box_gap_right_focus.png
-share/themes/BlueSphere/gtk-2.0/box_gap_right.png
 share/themes/BlueSphere/gtk-2.0/box_gap_right_start.png
+share/themes/BlueSphere/gtk-2.0/box_gap_top.png
 share/themes/BlueSphere/gtk-2.0/box_gap_top_end.png
 share/themes/BlueSphere/gtk-2.0/box_gap_top_focus.png
-share/themes/BlueSphere/gtk-2.0/box_gap_top.png
 share/themes/BlueSphere/gtk-2.0/box_gap_top_start.png
 share/themes/BlueSphere/gtk-2.0/button_active_in.png
 share/themes/BlueSphere/gtk-2.0/button_insensitive_in.png
@@ -497,27 +563,29 @@ share/themes/BlueSphere/gtk-2.0/extraB_box.png
 share/themes/BlueSphere/gtk-2.0/frame_gap.png
 share/themes/BlueSphere/gtk-2.0/frame_gap_top_end.png
 share/themes/BlueSphere/gtk-2.0/frame_gap_top_start.png
+share/themes/BlueSphere/gtk-2.0/gtkrc
 share/themes/BlueSphere/gtk-2.0/handle_bar.png
-share/themes/BlueSphere/gtk-2.0/handlebox.png
 share/themes/BlueSphere/gtk-2.0/handle_vert_thumb.png
+share/themes/BlueSphere/gtk-2.0/handlebox.png
 share/themes/BlueSphere/gtk-2.0/horizontal_line.png
 share/themes/BlueSphere/gtk-2.0/horizontal_trough.png
 share/themes/BlueSphere/gtk-2.0/horzontal_ruler.png
-share/themes/BlueSphere/gtk-2.0/item_insensitive.png
+share/themes/BlueSphere/gtk-2.0/iconrc
 share/themes/BlueSphere/gtk-2.0/item.png
+share/themes/BlueSphere/gtk-2.0/item_insensitive.png
 share/themes/BlueSphere/gtk-2.0/menu_background.png
-share/themes/BlueSphere/gtk-2.0/menubar_background.png
-share/themes/BlueSphere/gtk-2.0/menubar_option.png
 share/themes/BlueSphere/gtk-2.0/menu_hi-light.png
 share/themes/BlueSphere/gtk-2.0/menu_shadow.png
+share/themes/BlueSphere/gtk-2.0/menubar_background.png
+share/themes/BlueSphere/gtk-2.0/menubar_option.png
 share/themes/BlueSphere/gtk-2.0/notebook_active_bottom.png
 share/themes/BlueSphere/gtk-2.0/notebook_active_top.png
 share/themes/BlueSphere/gtk-2.0/notebook_bottom.png
 share/themes/BlueSphere/gtk-2.0/notebook_top.png
 share/themes/BlueSphere/gtk-2.0/notebook_unattached.png
-share/themes/BlueSphere/gtk-2.0/paned.png
 share/themes/BlueSphere/gtk-2.0/option_in.png
 share/themes/BlueSphere/gtk-2.0/option_out.png
+share/themes/BlueSphere/gtk-2.0/paned.png
 share/themes/BlueSphere/gtk-2.0/progressbar.png
 share/themes/BlueSphere/gtk-2.0/scrollbar_horizontal.svg
 share/themes/BlueSphere/gtk-2.0/scrollbar_prelight_horizontal.svg
@@ -526,8 +594,8 @@ share/themes/BlueSphere/gtk-2.0/scrollbar_vertical.svg
 share/themes/BlueSphere/gtk-2.0/shadow_in.png
 share/themes/BlueSphere/gtk-2.0/shadow_out.png
 share/themes/BlueSphere/gtk-2.0/text_insensitive.png
-share/themes/BlueSphere/gtk-2.0/text_selected_insensitive.png
 share/themes/BlueSphere/gtk-2.0/text_selected.png
+share/themes/BlueSphere/gtk-2.0/text_selected_insensitive.png
 share/themes/BlueSphere/gtk-2.0/toggle_clicked.png
 share/themes/BlueSphere/gtk-2.0/toggle_default.png
 share/themes/BlueSphere/gtk-2.0/tooltip.png
@@ -545,14 +613,14 @@ share/themes/Nuvola/index.theme
 share/themes/Wasp/gtk-2.0/gtkrc
 share/themes/Wasp/gtk-2.0/iconrc
 share/themes/Wasp/index.theme
-@dirrm share/gnome/themes/Wasp/metacity-1
-@dirrm share/gnome/themes/Wasp
-@dirrm share/gnome/themes/Nuvola/metacity-1
-@dirrm share/gnome/themes/Nuvola
-@dirrm share/gnome/themes/Lush/metacity-1
-@dirrm share/gnome/themes/Lush
-@dirrm share/gnome/themes/BlueSphere/metacity-1
-@dirrm share/gnome/themes/BlueSphere
+@dirrm share/themes/Wasp/gtk-2.0
+@dirrm share/themes/Wasp
+@dirrm share/themes/Nuvola/gtk-2.0
+@dirrm share/themes/Nuvola
+@dirrm share/themes/Lush/gtk-2.0
+@dirrm share/themes/Lush
+@dirrm share/themes/BlueSphere/gtk-2.0
+@dirrm share/themes/BlueSphere
 @dirrm share/icons/Wasp/scalable/stock
 @dirrm share/icons/Wasp/scalable/mimetypes
 @dirrm share/icons/Wasp/scalable/filesystems
@@ -574,16 +642,17 @@ share/themes/Wasp/index.theme
 @dirrm share/icons/Lush/scalable/filesystems
 @dirrm share/icons/Lush/scalable/emblems
 @dirrm share/icons/Lush/scalable/devices
+@dirrm share/icons/Lush/scalable/apps
 @dirrm share/icons/Lush/scalable
 @dirrm share/icons/Lush
 @dirrm share/icons/BlueSphere/scalable/stock
 @dirrm share/icons/BlueSphere/scalable
 @dirrm share/icons/BlueSphere
-@dirrm share/themes/Wasp/gtk-2.0
-@dirrm share/themes/Wasp
-@dirrm share/themes/Nuvola/gtk-2.0
-@dirrm share/themes/Nuvola
-@dirrm share/themes/Lush/gtk-2.0
-@dirrm share/themes/Lush
-@dirrm share/themes/BlueSphere/gtk-2.0
-@dirrm share/themes/BlueSphere
+@dirrm share/gnome/themes/Wasp/metacity-1
+@dirrm share/gnome/themes/Wasp
+@dirrm share/gnome/themes/Nuvola/metacity-1
+@dirrm share/gnome/themes/Nuvola
+@dirrm share/gnome/themes/Lush/metacity-1
+@dirrm share/gnome/themes/Lush
+@dirrm share/gnome/themes/BlueSphere/metacity-1
+@dirrm share/gnome/themes/BlueSphere