diff --git a/gnome/package.use b/gnome/package.use
index 58ee5cc..8d0db47 100644
--- a/gnome/package.use
+++ b/gnome/package.use
@@ -5,17 +5,17 @@ sys-kernel/gentoo-sources symlink
 sys-libs/ncurses minimal
 
 # for gnome
->=gnome-extra/evolution-data-server-2.30 weather
 app-crypt/pinentry gtk
 app-text/enchant hunspell
 app-text/poppler cairo
 dev-db/sqlite extensions
 dev-libs/libxml2 python
 dev-python/pygobject threads
+gnome-base/gconf gtk
 gnome-base/gnome-menus python
 gnome-base/gnome-panel bonobo
 gnome-base/gvfs cdda gdu udev
-gnome-extra/evolution-data-server ssl
+gnome-extra/evolution-data-server ssl weather
 mail-client/evolution ssl
 media-libs/libcanberra gtk
 media-libs/libtheora encode
@@ -25,16 +25,13 @@ net-libs/libsoup gnome ssl
 net-misc/curl ssl
 net-print/cups dbus gnutls
 sys-apps/dbus X
+sys-apps/hwids udev
 sys-auth/consolekit policykit
 sys-auth/pambase consolekit
 sys-block/parted device-mapper
 sys-fs/udev gudev hwdb
+virtual/udev gudev hwdb
 x11-libs/cairo glib svg X
 x11-libs/gdk-pixbuf X jpeg
 x11-libs/gtk+ jpeg X
 x11-libs/pango X
-virtual/udev gudev hwdb
-
-#net-libs/xulrunner cups
-#app-text/poppler utils
-#app-text/ghostscript-gpl cups
diff --git a/gnome/world b/gnome/world
index 9d923ff..e627df9 100644
--- a/gnome/world
+++ b/gnome/world
@@ -1,4 +1,4 @@
 gnome-base/gnome
 media-fonts/dejavu
-media-fonts/freefont-ttf
+media-fonts/freefont
 x11-apps/xauth