8 files changed, 162 insertions, 132 deletions

diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 13229e93b76a..305ad420f495 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.6
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-themes/gnome-themes-extras/distinfo b/x11-themes/gnome-themes-extras/distinfo
index 074626434f3b..dcc5762e5008 100644
--- a/x11-themes/gnome-themes-extras/distinfo
+++ b/x11-themes/gnome-themes-extras/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-extras-0.6.tar.bz2) = 3f52f75d013bab11c5c17bc1d3465037
-SIZE (gnome2/gnome-themes-extras-0.6.tar.bz2) = 1931052
+MD5 (gnome2/gnome-themes-extras-0.7.tar.bz2) = 5069fedb0d8404c89d98fe8de6825bca
+SIZE (gnome2/gnome-themes-extras-0.7.tar.bz2) = 3600402
diff --git a/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c b/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c
deleted file mode 100644
index d3728a2302da..000000000000
--- a/x11-themes/gnome-themes-extras/files/patch-Smooth::smooth_style.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- Smooth/smooth_style.c.orig	Thu Dec 11 10:05:56 2003
-+++ Smooth/smooth_style.c	Thu Dec 11 10:06:13 2003
-@@ -707,7 +707,7 @@
- {
-   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
- 
--  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO(widget->parent)))) 
-+  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO_BOX(widget->parent)))) 
-   {
-        gtk_paint_flat_box(style, window, widget->state, GTK_SHADOW_NONE, area, widget, "entry_bg", x, y, width, height);
- 
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index e1d9519c4a2b..ff2b0da04ba6 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -22,8 +22,8 @@ share/gnome/themes/Gorilla/metacity-1/wm-restore.svg
 share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
 share/gnome/themes/Lush/metacity-1/BT-fermer.png
 share/gnome/themes/Lush/metacity-1/BT-neutre.png
-share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
 share/gnome/themes/Lush/metacity-1/BT-reduire.png
+share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
 share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
 share/gnome/themes/Lush/metacity-1/coindroit-bas.png
 share/gnome/themes/Lush/metacity-1/coingauche-bas.png
@@ -57,17 +57,20 @@ share/icons/Amaranth/scalable/apps/accessibility-keyboard-capplet.svg
 share/icons/Amaranth/scalable/apps/accessories.svg
 share/icons/Amaranth/scalable/apps/advanced-directory.svg
 share/icons/Amaranth/scalable/apps/apacheconf.svg
+share/icons/Amaranth/scalable/apps/blender.svg
 share/icons/Amaranth/scalable/apps/camera.svg
 share/icons/Amaranth/scalable/apps/disks.svg
 share/icons/Amaranth/scalable/apps/downloadmanager.svg
 share/icons/Amaranth/scalable/apps/email.svg
 share/icons/Amaranth/scalable/apps/evolution-1.4.svg
 share/icons/Amaranth/scalable/apps/evolution.svg
+share/icons/Amaranth/scalable/apps/file-manager.svg
 share/icons/Amaranth/scalable/apps/file-roller.svg
 share/icons/Amaranth/scalable/apps/gaim.svg
 share/icons/Amaranth/scalable/apps/gcalctool.svg
 share/icons/Amaranth/scalable/apps/gedit-icon.svg
 share/icons/Amaranth/scalable/apps/gedit.svg
+share/icons/Amaranth/scalable/apps/gftp.svg
 share/icons/Amaranth/scalable/apps/gimp.svg
 share/icons/Amaranth/scalable/apps/gnome-aisleriot.svg
 share/icons/Amaranth/scalable/apps/gnome-applications.svg
@@ -94,21 +97,10 @@ share/icons/Amaranth/scalable/apps/gnome-mouse.svg
 share/icons/Amaranth/scalable/apps/gnome-multimedia.svg
 share/icons/Amaranth/scalable/apps/gnome-palette.svg
 share/icons/Amaranth/scalable/apps/gnome-pdf.svg
-share/icons/Amaranth/scalable/apps/gnome-settings.svg
 share/icons/Amaranth/scalable/apps/gnome-starthere.svg
-share/icons/Amaranth/scalable/apps/gnome-terminal.svg
-share/icons/Amaranth/scalable/apps/gnumeric.svg
 share/icons/Amaranth/scalable/apps/gripicon.svg
-share/icons/Amaranth/scalable/apps/gucharmap.svg
-share/icons/Amaranth/scalable/apps/icon-system-tools.svg
-share/icons/Amaranth/scalable/apps/monitor.svg
-share/icons/Amaranth/scalable/apps/mouse-capplet.svg
-share/icons/Amaranth/scalable/apps/mozilla-icon.svg
 share/icons/Amaranth/scalable/apps/mozilla-mail-icon.svg
 share/icons/Amaranth/scalable/apps/mozilla-star.svg
-share/icons/Amaranth/scalable/apps/my-computer.svg
-share/icons/Amaranth/scalable/apps/netscape.svg
-share/icons/Amaranth/scalable/apps/opera.svg
 share/icons/Amaranth/scalable/apps/redhat-accessories.svg
 share/icons/Amaranth/scalable/apps/redhat-config-xfree86.svg
 share/icons/Amaranth/scalable/apps/redhat-email.svg
@@ -124,15 +116,9 @@ share/icons/Amaranth/scalable/apps/redhat-sound_video.svg
 share/icons/Amaranth/scalable/apps/redhat-system_settings.svg
 share/icons/Amaranth/scalable/apps/redhat-system_tools.svg
 share/icons/Amaranth/scalable/apps/redhat-web-browser.svg
-share/icons/Amaranth/scalable/apps/sambaconf.svg
-share/icons/Amaranth/scalable/apps/seti.svg
-share/icons/Amaranth/scalable/apps/sound-juicer.svg
-share/icons/Amaranth/scalable/apps/system-floppy.svg
 share/icons/Amaranth/scalable/apps/system-tools-32.svg
-share/icons/Amaranth/scalable/apps/tex.svg
 share/icons/Amaranth/scalable/apps/up2date.svg
 share/icons/Amaranth/scalable/apps/web-browser.svg
-share/icons/Amaranth/scalable/apps/xmms.svg
 share/icons/Amaranth/scalable/apps/xpdf.svg
 share/icons/Amaranth/scalable/devices/gnome-dev-cdrom-audio.svg
 share/icons/Amaranth/scalable/devices/gnome-dev-cdrom.svg
@@ -169,7 +155,9 @@ share/icons/Amaranth/scalable/filesystems/gnome-fs-directory.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-executable.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-home.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-loading-icon.svg
+share/icons/Amaranth/scalable/filesystems/gnome-fs-network.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-regular.svg
+share/icons/Amaranth/scalable/filesystems/gnome-fs-server.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-smb.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-trash-empty.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-trash-full.svg
@@ -230,6 +218,7 @@ share/icons/Amaranth/scalable/stock/stock_redo.svg
 share/icons/Amaranth/scalable/stock/stock_refresh.svg
 share/icons/Amaranth/scalable/stock/stock_replace.svg
 share/icons/Amaranth/scalable/stock/stock_reset.svg
+share/icons/Amaranth/scalable/stock/stock_save_as.svg
 share/icons/Amaranth/scalable/stock/stock_screenshot.svg
 share/icons/Amaranth/scalable/stock/stock_search.svg
 share/icons/Amaranth/scalable/stock/stock_stop.svg
@@ -573,6 +562,8 @@ share/icons/Nuvola/scalable/apps/evolution-1.4.svg
 share/icons/Nuvola/scalable/apps/gaim.svg
 share/icons/Nuvola/scalable/apps/gcalctool.svg
 share/icons/Nuvola/scalable/apps/gdict.svg
+share/icons/Nuvola/scalable/apps/gedit-icon.svg
+share/icons/Nuvola/scalable/apps/gedit.svg
 share/icons/Nuvola/scalable/apps/gnome-applications.svg
 share/icons/Nuvola/scalable/apps/gnome-audio.svg
 share/icons/Nuvola/scalable/apps/gnome-ccdesktop.svg
@@ -638,6 +629,7 @@ share/icons/Nuvola/scalable/devices/gnome-dev-floppy.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-harddisk.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-mouse.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-network.svg
+share/icons/Nuvola/scalable/devices/gnome-dev-printer.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-scanner.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-symlink.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-zipdisk.svg
@@ -665,8 +657,11 @@ 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-client.svg
+share/icons/Nuvola/scalable/filesystems/gnome-fs-desktop.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.icon
 share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.svg
+share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-visiting.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
@@ -689,38 +684,59 @@ share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pgp-encrypted.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pgp.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-postscript.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-text.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
 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-backup.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-core-file.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-afm.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-psf.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-jar.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kword.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-application-x-stuffit.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-tex.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-tgz.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-audio.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-svg.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-x-cdr.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-css.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-c.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-credits.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-install.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-java.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-lyx.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-makefile.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-patch.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-readme.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sql.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-troff-man.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-video-quicktime.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-video.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-x-readme.svg
 share/icons/Nuvola/scalable/stock/applets-screenshooter.svg
@@ -745,8 +761,6 @@ share/icons/Nuvola/scalable/stock/panel-lockscreen.svg
 share/icons/Nuvola/scalable/stock/print-preview.svg
 share/icons/Nuvola/scalable/stock/printer.svg
 share/icons/Nuvola/scalable/stock/recycled.svg
-share/icons/Nuvola/scalable/stock/stock_gtk-goto-first.svg
-share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
 share/icons/Nuvola/scalable/stock/stock-gtk-remove.svg
 share/icons/Nuvola/scalable/stock/stock-media-eject.svg
 share/icons/Nuvola/scalable/stock/stock-media-ffwd.svg
@@ -768,6 +782,8 @@ 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_gtk-goto-first.svg
+share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
 share/icons/Nuvola/scalable/stock/stock_help.svg
 share/icons/Nuvola/scalable/stock/stock_home.svg
 share/icons/Nuvola/scalable/stock/stock_quit.svg
@@ -781,6 +797,7 @@ share/icons/Wasp/scalable/apps/advanced-directory.svg
 share/icons/Wasp/scalable/apps/applets-screenshooter.svg
 share/icons/Wasp/scalable/apps/background-capplet.svg
 share/icons/Wasp/scalable/apps/bluefish.svg
+share/icons/Wasp/scalable/apps/control-center2.svg
 share/icons/Wasp/scalable/apps/evolution-1.4.svg
 share/icons/Wasp/scalable/apps/file-manager.svg
 share/icons/Wasp/scalable/apps/file-roller.svg
@@ -813,6 +830,7 @@ share/icons/Wasp/scalable/apps/gnome-printers-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/hwbrowser.svg
 share/icons/Wasp/scalable/apps/keyboard-capplet.svg
 share/icons/Wasp/scalable/apps/keyboard-shortcut.svg
 share/icons/Wasp/scalable/apps/keyboard.svg
@@ -826,6 +844,7 @@ share/icons/Wasp/scalable/apps/procman.svg
 share/icons/Wasp/scalable/apps/redhat-config-date.svg
 share/icons/Wasp/scalable/apps/redhat-config-users.svg
 share/icons/Wasp/scalable/apps/redhat-config-xfree86.svg
+share/icons/Wasp/scalable/apps/redhat-email.svg
 share/icons/Wasp/scalable/apps/redhat-games.svg
 share/icons/Wasp/scalable/apps/redhat-home.svg
 share/icons/Wasp/scalable/apps/redhat-internet.svg
@@ -841,6 +860,7 @@ share/icons/Wasp/scalable/apps/system-tools.svg
 share/icons/Wasp/scalable/apps/user_auth.svg
 share/icons/Wasp/scalable/apps/vanity.svg
 share/icons/Wasp/scalable/apps/web-browser.svg
+share/icons/Wasp/scalable/apps/webbrowser.svg
 share/icons/Wasp/scalable/apps/ximian-evolution-calendar.svg
 share/icons/Wasp/scalable/apps/ximian-redhat-config-nfs.svg
 share/icons/Wasp/scalable/apps/xmms.svg
@@ -863,6 +883,7 @@ share/icons/Wasp/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/Wasp/scalable/emblems/emblem-camera.svg
 share/icons/Wasp/scalable/emblems/emblem-cool.svg
 share/icons/Wasp/scalable/emblems/emblem-danger.svg
+share/icons/Wasp/scalable/emblems/emblem-desktop.svg
 share/icons/Wasp/scalable/emblems/emblem-distinguished.svg
 share/icons/Wasp/scalable/emblems/emblem-documents.svg
 share/icons/Wasp/scalable/emblems/emblem-favorite.svg
@@ -936,6 +957,11 @@ share/icons/Wasp/scalable/stock/filenew.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/gaim_auth.svg
+share/icons/Wasp/scalable/stock/gaim_error.svg
+share/icons/Wasp/scalable/stock/gaim_info.svg
+share/icons/Wasp/scalable/stock/gaim_offline.svg
+share/icons/Wasp/scalable/stock/gaim_online.svg
 share/icons/Wasp/scalable/stock/help_book.svg
 share/icons/Wasp/scalable/stock/home.svg
 share/icons/Wasp/scalable/stock/information.svg
@@ -950,39 +976,40 @@ share/icons/Wasp/scalable/stock/stickies.svg
 share/icons/Wasp/scalable/stock/stock_accessories.svg
 share/icons/Wasp/scalable/stock/stock_amusements.svg
 share/icons/Wasp/scalable/stock/stock_dialog_info.svg
-share/icons/Wasp/scalable/stock/gaim_auth.svg
-share/icons/Wasp/scalable/stock/gaim_error.svg
-share/icons/Wasp/scalable/stock/gaim_info.svg
-share/icons/Wasp/scalable/stock/gaim_offline.svg
-share/icons/Wasp/scalable/stock/gaim_online.svg
 share/icons/Wasp/scalable/stock/stock_gnome-logo.svg
 share/icons/Wasp/scalable/stock/stock_internet.svg
 share/icons/Wasp/scalable/stock/stock_lockscreen.svg
 share/icons/Wasp/scalable/stock/stock_logout.svg
 share/icons/Wasp/scalable/stock/stock_multimedia.svg
 share/icons/Wasp/scalable/stock/stock_searchtool.svg
-share/locale/az/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/ca/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/cs/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/da/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/de/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/el/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/ja/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/ko/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/nl/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/no/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/sk/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/sr/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/sr@Latn/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_CN/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/az/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ca/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/cs/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/da/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/de/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/el/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/en_GB/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/es/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/fr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/he/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/hr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/it/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ja/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ko/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/lt/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/nl/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/no/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/pa/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/pl/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/pt/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sk/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sq/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sv/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/tr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-themes-extras.mo
 share/themes/Amaranth/gtk-2.0/gtkrc
 share/themes/Amaranth/gtk-2.0/iconrc
 share/themes/Amaranth/index.theme
@@ -1081,9 +1108,9 @@ share/themes/Wasp/index.theme
 @dirrm share/icons/Amaranth
 @dirrm share/gnome/themes/Wasp/metacity-1
 @dirrm share/gnome/themes/Wasp
+@dirrm share/gnome/themes/Nuvola/metacity-1
 @dirrm share/gnome/themes/Nuvola-old/metacity-1
 @dirrm share/gnome/themes/Nuvola-old
-@dirrm share/gnome/themes/Nuvola/metacity-1
 @dirrm share/gnome/themes/Nuvola
 @dirrm share/gnome/themes/Lush/metacity-1
 @dirrm share/gnome/themes/Lush
diff --git a/x11-toolkits/gnome-themes-extras/Makefile b/x11-toolkits/gnome-themes-extras/Makefile
index 13229e93b76a..305ad420f495 100644
--- a/x11-toolkits/gnome-themes-extras/Makefile
+++ b/x11-toolkits/gnome-themes-extras/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnome-themes-extras
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gnome-themes-extras/distinfo b/x11-toolkits/gnome-themes-extras/distinfo
index 074626434f3b..dcc5762e5008 100644
--- a/x11-toolkits/gnome-themes-extras/distinfo
+++ b/x11-toolkits/gnome-themes-extras/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-extras-0.6.tar.bz2) = 3f52f75d013bab11c5c17bc1d3465037
-SIZE (gnome2/gnome-themes-extras-0.6.tar.bz2) = 1931052
+MD5 (gnome2/gnome-themes-extras-0.7.tar.bz2) = 5069fedb0d8404c89d98fe8de6825bca
+SIZE (gnome2/gnome-themes-extras-0.7.tar.bz2) = 3600402
diff --git a/x11-toolkits/gnome-themes-extras/files/patch-Smooth::smooth_style.c b/x11-toolkits/gnome-themes-extras/files/patch-Smooth::smooth_style.c
deleted file mode 100644
index d3728a2302da..000000000000
--- a/x11-toolkits/gnome-themes-extras/files/patch-Smooth::smooth_style.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- Smooth/smooth_style.c.orig	Thu Dec 11 10:05:56 2003
-+++ Smooth/smooth_style.c	Thu Dec 11 10:06:13 2003
-@@ -707,7 +707,7 @@
- {
-   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
- 
--  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO(widget->parent)))) 
-+  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO_BOX(widget->parent)))) 
-   {
-        gtk_paint_flat_box(style, window, widget->state, GTK_SHADOW_NONE, area, widget, "entry_bg", x, y, width, height);
- 
diff --git a/x11-toolkits/gnome-themes-extras/pkg-plist b/x11-toolkits/gnome-themes-extras/pkg-plist
index e1d9519c4a2b..ff2b0da04ba6 100644
--- a/x11-toolkits/gnome-themes-extras/pkg-plist
+++ b/x11-toolkits/gnome-themes-extras/pkg-plist
@@ -22,8 +22,8 @@ share/gnome/themes/Gorilla/metacity-1/wm-restore.svg
 share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
 share/gnome/themes/Lush/metacity-1/BT-fermer.png
 share/gnome/themes/Lush/metacity-1/BT-neutre.png
-share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
 share/gnome/themes/Lush/metacity-1/BT-reduire.png
+share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
 share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
 share/gnome/themes/Lush/metacity-1/coindroit-bas.png
 share/gnome/themes/Lush/metacity-1/coingauche-bas.png
@@ -57,17 +57,20 @@ share/icons/Amaranth/scalable/apps/accessibility-keyboard-capplet.svg
 share/icons/Amaranth/scalable/apps/accessories.svg
 share/icons/Amaranth/scalable/apps/advanced-directory.svg
 share/icons/Amaranth/scalable/apps/apacheconf.svg
+share/icons/Amaranth/scalable/apps/blender.svg
 share/icons/Amaranth/scalable/apps/camera.svg
 share/icons/Amaranth/scalable/apps/disks.svg
 share/icons/Amaranth/scalable/apps/downloadmanager.svg
 share/icons/Amaranth/scalable/apps/email.svg
 share/icons/Amaranth/scalable/apps/evolution-1.4.svg
 share/icons/Amaranth/scalable/apps/evolution.svg
+share/icons/Amaranth/scalable/apps/file-manager.svg
 share/icons/Amaranth/scalable/apps/file-roller.svg
 share/icons/Amaranth/scalable/apps/gaim.svg
 share/icons/Amaranth/scalable/apps/gcalctool.svg
 share/icons/Amaranth/scalable/apps/gedit-icon.svg
 share/icons/Amaranth/scalable/apps/gedit.svg
+share/icons/Amaranth/scalable/apps/gftp.svg
 share/icons/Amaranth/scalable/apps/gimp.svg
 share/icons/Amaranth/scalable/apps/gnome-aisleriot.svg
 share/icons/Amaranth/scalable/apps/gnome-applications.svg
@@ -94,21 +97,10 @@ share/icons/Amaranth/scalable/apps/gnome-mouse.svg
 share/icons/Amaranth/scalable/apps/gnome-multimedia.svg
 share/icons/Amaranth/scalable/apps/gnome-palette.svg
 share/icons/Amaranth/scalable/apps/gnome-pdf.svg
-share/icons/Amaranth/scalable/apps/gnome-settings.svg
 share/icons/Amaranth/scalable/apps/gnome-starthere.svg
-share/icons/Amaranth/scalable/apps/gnome-terminal.svg
-share/icons/Amaranth/scalable/apps/gnumeric.svg
 share/icons/Amaranth/scalable/apps/gripicon.svg
-share/icons/Amaranth/scalable/apps/gucharmap.svg
-share/icons/Amaranth/scalable/apps/icon-system-tools.svg
-share/icons/Amaranth/scalable/apps/monitor.svg
-share/icons/Amaranth/scalable/apps/mouse-capplet.svg
-share/icons/Amaranth/scalable/apps/mozilla-icon.svg
 share/icons/Amaranth/scalable/apps/mozilla-mail-icon.svg
 share/icons/Amaranth/scalable/apps/mozilla-star.svg
-share/icons/Amaranth/scalable/apps/my-computer.svg
-share/icons/Amaranth/scalable/apps/netscape.svg
-share/icons/Amaranth/scalable/apps/opera.svg
 share/icons/Amaranth/scalable/apps/redhat-accessories.svg
 share/icons/Amaranth/scalable/apps/redhat-config-xfree86.svg
 share/icons/Amaranth/scalable/apps/redhat-email.svg
@@ -124,15 +116,9 @@ share/icons/Amaranth/scalable/apps/redhat-sound_video.svg
 share/icons/Amaranth/scalable/apps/redhat-system_settings.svg
 share/icons/Amaranth/scalable/apps/redhat-system_tools.svg
 share/icons/Amaranth/scalable/apps/redhat-web-browser.svg
-share/icons/Amaranth/scalable/apps/sambaconf.svg
-share/icons/Amaranth/scalable/apps/seti.svg
-share/icons/Amaranth/scalable/apps/sound-juicer.svg
-share/icons/Amaranth/scalable/apps/system-floppy.svg
 share/icons/Amaranth/scalable/apps/system-tools-32.svg
-share/icons/Amaranth/scalable/apps/tex.svg
 share/icons/Amaranth/scalable/apps/up2date.svg
 share/icons/Amaranth/scalable/apps/web-browser.svg
-share/icons/Amaranth/scalable/apps/xmms.svg
 share/icons/Amaranth/scalable/apps/xpdf.svg
 share/icons/Amaranth/scalable/devices/gnome-dev-cdrom-audio.svg
 share/icons/Amaranth/scalable/devices/gnome-dev-cdrom.svg
@@ -169,7 +155,9 @@ share/icons/Amaranth/scalable/filesystems/gnome-fs-directory.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-executable.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-home.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-loading-icon.svg
+share/icons/Amaranth/scalable/filesystems/gnome-fs-network.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-regular.svg
+share/icons/Amaranth/scalable/filesystems/gnome-fs-server.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-smb.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-trash-empty.svg
 share/icons/Amaranth/scalable/filesystems/gnome-fs-trash-full.svg
@@ -230,6 +218,7 @@ share/icons/Amaranth/scalable/stock/stock_redo.svg
 share/icons/Amaranth/scalable/stock/stock_refresh.svg
 share/icons/Amaranth/scalable/stock/stock_replace.svg
 share/icons/Amaranth/scalable/stock/stock_reset.svg
+share/icons/Amaranth/scalable/stock/stock_save_as.svg
 share/icons/Amaranth/scalable/stock/stock_screenshot.svg
 share/icons/Amaranth/scalable/stock/stock_search.svg
 share/icons/Amaranth/scalable/stock/stock_stop.svg
@@ -573,6 +562,8 @@ share/icons/Nuvola/scalable/apps/evolution-1.4.svg
 share/icons/Nuvola/scalable/apps/gaim.svg
 share/icons/Nuvola/scalable/apps/gcalctool.svg
 share/icons/Nuvola/scalable/apps/gdict.svg
+share/icons/Nuvola/scalable/apps/gedit-icon.svg
+share/icons/Nuvola/scalable/apps/gedit.svg
 share/icons/Nuvola/scalable/apps/gnome-applications.svg
 share/icons/Nuvola/scalable/apps/gnome-audio.svg
 share/icons/Nuvola/scalable/apps/gnome-ccdesktop.svg
@@ -638,6 +629,7 @@ share/icons/Nuvola/scalable/devices/gnome-dev-floppy.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-harddisk.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-mouse.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-network.svg
+share/icons/Nuvola/scalable/devices/gnome-dev-printer.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-scanner.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-symlink.svg
 share/icons/Nuvola/scalable/devices/gnome-dev-zipdisk.svg
@@ -665,8 +657,11 @@ 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-client.svg
+share/icons/Nuvola/scalable/filesystems/gnome-fs-desktop.svg
 share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.icon
 share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-accept.svg
+share/icons/Nuvola/scalable/filesystems/gnome-fs-directory-visiting.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
@@ -689,38 +684,59 @@ share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pgp-encrypted.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-pgp.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-postscript.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-text.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
 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-backup.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-core-file.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-afm.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-psf.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-jar.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-kword.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-application-x-stuffit.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-tex.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-tgz.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-audio.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-svg.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-image-x-cdr.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-css.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-c.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-credits.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-install.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-java.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-lyx.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-makefile.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-patch.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-readme.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-sql.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-text-x-troff-man.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-text.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-video-quicktime.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-video.svg
 share/icons/Nuvola/scalable/mimetypes/gnome-mime-x-readme.svg
 share/icons/Nuvola/scalable/stock/applets-screenshooter.svg
@@ -745,8 +761,6 @@ share/icons/Nuvola/scalable/stock/panel-lockscreen.svg
 share/icons/Nuvola/scalable/stock/print-preview.svg
 share/icons/Nuvola/scalable/stock/printer.svg
 share/icons/Nuvola/scalable/stock/recycled.svg
-share/icons/Nuvola/scalable/stock/stock_gtk-goto-first.svg
-share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
 share/icons/Nuvola/scalable/stock/stock-gtk-remove.svg
 share/icons/Nuvola/scalable/stock/stock-media-eject.svg
 share/icons/Nuvola/scalable/stock/stock-media-ffwd.svg
@@ -768,6 +782,8 @@ 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_gtk-goto-first.svg
+share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
 share/icons/Nuvola/scalable/stock/stock_help.svg
 share/icons/Nuvola/scalable/stock/stock_home.svg
 share/icons/Nuvola/scalable/stock/stock_quit.svg
@@ -781,6 +797,7 @@ share/icons/Wasp/scalable/apps/advanced-directory.svg
 share/icons/Wasp/scalable/apps/applets-screenshooter.svg
 share/icons/Wasp/scalable/apps/background-capplet.svg
 share/icons/Wasp/scalable/apps/bluefish.svg
+share/icons/Wasp/scalable/apps/control-center2.svg
 share/icons/Wasp/scalable/apps/evolution-1.4.svg
 share/icons/Wasp/scalable/apps/file-manager.svg
 share/icons/Wasp/scalable/apps/file-roller.svg
@@ -813,6 +830,7 @@ share/icons/Wasp/scalable/apps/gnome-printers-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/hwbrowser.svg
 share/icons/Wasp/scalable/apps/keyboard-capplet.svg
 share/icons/Wasp/scalable/apps/keyboard-shortcut.svg
 share/icons/Wasp/scalable/apps/keyboard.svg
@@ -826,6 +844,7 @@ share/icons/Wasp/scalable/apps/procman.svg
 share/icons/Wasp/scalable/apps/redhat-config-date.svg
 share/icons/Wasp/scalable/apps/redhat-config-users.svg
 share/icons/Wasp/scalable/apps/redhat-config-xfree86.svg
+share/icons/Wasp/scalable/apps/redhat-email.svg
 share/icons/Wasp/scalable/apps/redhat-games.svg
 share/icons/Wasp/scalable/apps/redhat-home.svg
 share/icons/Wasp/scalable/apps/redhat-internet.svg
@@ -841,6 +860,7 @@ share/icons/Wasp/scalable/apps/system-tools.svg
 share/icons/Wasp/scalable/apps/user_auth.svg
 share/icons/Wasp/scalable/apps/vanity.svg
 share/icons/Wasp/scalable/apps/web-browser.svg
+share/icons/Wasp/scalable/apps/webbrowser.svg
 share/icons/Wasp/scalable/apps/ximian-evolution-calendar.svg
 share/icons/Wasp/scalable/apps/ximian-redhat-config-nfs.svg
 share/icons/Wasp/scalable/apps/xmms.svg
@@ -863,6 +883,7 @@ share/icons/Wasp/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/Wasp/scalable/emblems/emblem-camera.svg
 share/icons/Wasp/scalable/emblems/emblem-cool.svg
 share/icons/Wasp/scalable/emblems/emblem-danger.svg
+share/icons/Wasp/scalable/emblems/emblem-desktop.svg
 share/icons/Wasp/scalable/emblems/emblem-distinguished.svg
 share/icons/Wasp/scalable/emblems/emblem-documents.svg
 share/icons/Wasp/scalable/emblems/emblem-favorite.svg
@@ -936,6 +957,11 @@ share/icons/Wasp/scalable/stock/filenew.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/gaim_auth.svg
+share/icons/Wasp/scalable/stock/gaim_error.svg
+share/icons/Wasp/scalable/stock/gaim_info.svg
+share/icons/Wasp/scalable/stock/gaim_offline.svg
+share/icons/Wasp/scalable/stock/gaim_online.svg
 share/icons/Wasp/scalable/stock/help_book.svg
 share/icons/Wasp/scalable/stock/home.svg
 share/icons/Wasp/scalable/stock/information.svg
@@ -950,39 +976,40 @@ share/icons/Wasp/scalable/stock/stickies.svg
 share/icons/Wasp/scalable/stock/stock_accessories.svg
 share/icons/Wasp/scalable/stock/stock_amusements.svg
 share/icons/Wasp/scalable/stock/stock_dialog_info.svg
-share/icons/Wasp/scalable/stock/gaim_auth.svg
-share/icons/Wasp/scalable/stock/gaim_error.svg
-share/icons/Wasp/scalable/stock/gaim_info.svg
-share/icons/Wasp/scalable/stock/gaim_offline.svg
-share/icons/Wasp/scalable/stock/gaim_online.svg
 share/icons/Wasp/scalable/stock/stock_gnome-logo.svg
 share/icons/Wasp/scalable/stock/stock_internet.svg
 share/icons/Wasp/scalable/stock/stock_lockscreen.svg
 share/icons/Wasp/scalable/stock/stock_logout.svg
 share/icons/Wasp/scalable/stock/stock_multimedia.svg
 share/icons/Wasp/scalable/stock/stock_searchtool.svg
-share/locale/az/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/ca/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/cs/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/da/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/de/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/el/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/ja/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/ko/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/nl/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/no/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/sk/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/sr/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/sr@Latn/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_CN/LC_MESSAGES/gnome-themes-extra.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/az/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ca/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/cs/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/da/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/de/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/el/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/en_GB/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/es/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/fr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/he/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/hr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/it/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ja/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ko/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/lt/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/nl/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/no/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/pa/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/pl/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/pt/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sk/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sq/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/sv/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/tr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-themes-extras.mo
 share/themes/Amaranth/gtk-2.0/gtkrc
 share/themes/Amaranth/gtk-2.0/iconrc
 share/themes/Amaranth/index.theme
@@ -1081,9 +1108,9 @@ share/themes/Wasp/index.theme
 @dirrm share/icons/Amaranth
 @dirrm share/gnome/themes/Wasp/metacity-1
 @dirrm share/gnome/themes/Wasp
+@dirrm share/gnome/themes/Nuvola/metacity-1
 @dirrm share/gnome/themes/Nuvola-old/metacity-1
 @dirrm share/gnome/themes/Nuvola-old
-@dirrm share/gnome/themes/Nuvola/metacity-1
 @dirrm share/gnome/themes/Nuvola
 @dirrm share/gnome/themes/Lush/metacity-1
 @dirrm share/gnome/themes/Lush