diff --git a/tools-uclibc/desktop/portage/env/bind-tools.conf b/tools-uclibc/desktop/portage/env/bind-tools
similarity index 100%
rename from tools-uclibc/desktop/portage/env/bind-tools.conf
rename to tools-uclibc/desktop/portage/env/bind-tools
diff --git a/tools-uclibc/desktop/portage/env/cmake.conf b/tools-uclibc/desktop/portage/env/cmake
similarity index 100%
rename from tools-uclibc/desktop/portage/env/cmake.conf
rename to tools-uclibc/desktop/portage/env/cmake
diff --git a/tools-uclibc/desktop/portage/env/cups-filters.conf b/tools-uclibc/desktop/portage/env/cups-filters
similarity index 100%
rename from tools-uclibc/desktop/portage/env/cups-filters.conf
rename to tools-uclibc/desktop/portage/env/cups-filters
diff --git a/tools-uclibc/desktop/portage/env/dovecot.conf b/tools-uclibc/desktop/portage/env/dovecot
similarity index 100%
rename from tools-uclibc/desktop/portage/env/dovecot.conf
rename to tools-uclibc/desktop/portage/env/dovecot
diff --git a/tools-uclibc/desktop/portage/env/ffmpeg.conf b/tools-uclibc/desktop/portage/env/ffmpeg
similarity index 100%
rename from tools-uclibc/desktop/portage/env/ffmpeg.conf
rename to tools-uclibc/desktop/portage/env/ffmpeg
diff --git a/tools-uclibc/desktop/portage/env/fontforge.conf b/tools-uclibc/desktop/portage/env/fontforge
similarity index 100%
rename from tools-uclibc/desktop/portage/env/fontforge.conf
rename to tools-uclibc/desktop/portage/env/fontforge
diff --git a/tools-uclibc/desktop/portage/env/gdk-pixbuf.conf b/tools-uclibc/desktop/portage/env/gdk-pixbuf
similarity index 100%
rename from tools-uclibc/desktop/portage/env/gdk-pixbuf.conf
rename to tools-uclibc/desktop/portage/env/gdk-pixbuf
diff --git a/tools-uclibc/desktop/portage/env/git.conf b/tools-uclibc/desktop/portage/env/git
similarity index 100%
rename from tools-uclibc/desktop/portage/env/git.conf
rename to tools-uclibc/desktop/portage/env/git
diff --git a/tools-uclibc/desktop/portage/env/glamor.conf b/tools-uclibc/desktop/portage/env/glamor
similarity index 100%
rename from tools-uclibc/desktop/portage/env/glamor.conf
rename to tools-uclibc/desktop/portage/env/glamor
diff --git a/tools-uclibc/desktop/portage/env/gnome-desktop.conf b/tools-uclibc/desktop/portage/env/gnome-desktop
similarity index 100%
rename from tools-uclibc/desktop/portage/env/gnome-desktop.conf
rename to tools-uclibc/desktop/portage/env/gnome-desktop
diff --git a/tools-uclibc/desktop/portage/env/gnome-doc-utils.conf b/tools-uclibc/desktop/portage/env/gnome-doc-utils
similarity index 100%
rename from tools-uclibc/desktop/portage/env/gnome-doc-utils.conf
rename to tools-uclibc/desktop/portage/env/gnome-doc-utils
diff --git a/tools-uclibc/desktop/portage/env/gpgme.conf b/tools-uclibc/desktop/portage/env/gpgme
similarity index 100%
rename from tools-uclibc/desktop/portage/env/gpgme.conf
rename to tools-uclibc/desktop/portage/env/gpgme
diff --git a/tools-uclibc/desktop/portage/env/libav.conf b/tools-uclibc/desktop/portage/env/libav
similarity index 100%
rename from tools-uclibc/desktop/portage/env/libav.conf
rename to tools-uclibc/desktop/portage/env/libav
diff --git a/tools-uclibc/desktop/portage/env/libquicktime.conf b/tools-uclibc/desktop/portage/env/libquicktime
similarity index 100%
rename from tools-uclibc/desktop/portage/env/libquicktime.conf
rename to tools-uclibc/desktop/portage/env/libquicktime
diff --git a/tools-uclibc/desktop/portage/env/mplayer2.conf b/tools-uclibc/desktop/portage/env/mplayer2
similarity index 100%
rename from tools-uclibc/desktop/portage/env/mplayer2.conf
rename to tools-uclibc/desktop/portage/env/mplayer2
diff --git a/tools-uclibc/desktop/portage/env/pakchois.conf b/tools-uclibc/desktop/portage/env/pakchois
similarity index 100%
rename from tools-uclibc/desktop/portage/env/pakchois.conf
rename to tools-uclibc/desktop/portage/env/pakchois
diff --git a/tools-uclibc/desktop/portage/env/pinentry.conf b/tools-uclibc/desktop/portage/env/pinentry
similarity index 100%
rename from tools-uclibc/desktop/portage/env/pinentry.conf
rename to tools-uclibc/desktop/portage/env/pinentry
diff --git a/tools-uclibc/desktop/portage/env/pygobject.conf b/tools-uclibc/desktop/portage/env/pygobject
similarity index 100%
rename from tools-uclibc/desktop/portage/env/pygobject.conf
rename to tools-uclibc/desktop/portage/env/pygobject
diff --git a/tools-uclibc/desktop/portage/env/qtcore.conf b/tools-uclibc/desktop/portage/env/qtcore
similarity index 100%
rename from tools-uclibc/desktop/portage/env/qtcore.conf
rename to tools-uclibc/desktop/portage/env/qtcore
diff --git a/tools-uclibc/desktop/portage/env/slim.conf b/tools-uclibc/desktop/portage/env/slim
similarity index 100%
rename from tools-uclibc/desktop/portage/env/slim.conf
rename to tools-uclibc/desktop/portage/env/slim
diff --git a/tools-uclibc/desktop/portage/env/transmission.conf b/tools-uclibc/desktop/portage/env/transmission
similarity index 100%
rename from tools-uclibc/desktop/portage/env/transmission.conf
rename to tools-uclibc/desktop/portage/env/transmission
diff --git a/tools-uclibc/desktop/portage/env/x86-video-intel.conf b/tools-uclibc/desktop/portage/env/x86-video-intel
similarity index 100%
rename from tools-uclibc/desktop/portage/env/x86-video-intel.conf
rename to tools-uclibc/desktop/portage/env/x86-video-intel
diff --git a/tools-uclibc/desktop/portage/env/xanim.conf b/tools-uclibc/desktop/portage/env/xanim
similarity index 100%
rename from tools-uclibc/desktop/portage/env/xanim.conf
rename to tools-uclibc/desktop/portage/env/xanim
diff --git a/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf b/tools-uclibc/desktop/portage/env/xdg-user-dirs
similarity index 100%
rename from tools-uclibc/desktop/portage/env/xdg-user-dirs.conf
rename to tools-uclibc/desktop/portage/env/xdg-user-dirs
diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env
index b0098b19..3cf18d3e 100644
--- a/tools-uclibc/desktop/portage/package.env
+++ b/tools-uclibc/desktop/portage/package.env
@@ -1,25 +1,24 @@
-app-crypt/gpgme gpgme.conf
-app-crypt/pinentry pinentry.conf
-app-text/gnome-doc-utils gnome-doc-utils.conf
-dev-libs/pakchois pakchois.conf
-dev-python/pygobject pygobject.conf
-dev-qt/qtcore qtcore.conf
-dev-util/cmake cmake.conf
-dev-vcs/git git.conf
-gnome-base/gnome-desktop gnome-desktop.conf
-media-gfx/fontforge fontforge.conf
-media-libs/libquicktime libquicktime.conf
-media-video/ffmpeg ffmpeg.conf
-media-video/libav libav.conf
-media-video/mplayer2 mplayer2.conf
-media-video/xanim xanim.conf
-net-dns/bind-tools bind-tools.conf
-net-mail/dovecot dovecot.conf
-net-p2p/transmission transmission.conf
-net-print/cups-filters cups-filters.conf
-sys-apps/coreutils coreutils.conf
-x11-drivers/xf86-video-intel x86-video-intel.conf
-x11-libs/gdk-pixbuf gdk-pixbuf.conf
-x11-libs/glamor glamor.conf
-x11-misc/slim slim.conf
-x11-misc/xdg-user-dirs xdg-user-dirs.conf
+app-crypt/gpgme gpgme
+app-crypt/pinentry pinentry
+app-text/gnome-doc-utils gnome-doc-utils
+dev-libs/pakchois pakchois
+dev-python/pygobject pygobject
+dev-qt/qtcore qtcore
+dev-util/cmake cmake
+dev-vcs/git git
+gnome-base/gnome-desktop gnome-desktop
+media-gfx/fontforge fontforge
+media-libs/libquicktime libquicktime
+media-video/ffmpeg ffmpeg
+media-video/libav libav
+media-video/mplayer2 mplayer2
+media-video/xanim xanim
+net-dns/bind-tools bind-tools
+net-mail/dovecot dovecot
+net-p2p/transmission transmission
+net-print/cups-filters cups-filters
+x11-drivers/xf86-video-intel x86-video-intel
+x11-libs/gdk-pixbuf gdk-pixbuf
+x11-libs/glamor glamor
+x11-misc/slim slim
+x11-misc/xdg-user-dirs xdg-user-dirs
diff --git a/tools-uclibc/desktop/world.1 b/tools-uclibc/desktop/world.1
index 8631b708..8f2828ec 100644
--- a/tools-uclibc/desktop/world.1
+++ b/tools-uclibc/desktop/world.1
@@ -4,7 +4,7 @@ app-arch/file-roller
 app-editors/gedit
 app-editors/nano
 app-editors/vim
-app-misc/screen
+app-misc/tmux
 app-office/abiword
 app-portage/gentoolkit
 app-portage/layman
diff --git a/tools-uclibc/desktop/world.2 b/tools-uclibc/desktop/world.2
index 8232e97d..e87a212f 100644
--- a/tools-uclibc/desktop/world.2
+++ b/tools-uclibc/desktop/world.2
@@ -4,7 +4,7 @@ app-arch/file-roller
 app-editors/gedit
 app-editors/nano
 app-editors/vim
-app-misc/screen
+app-misc/tmux
 app-office/abiword
 app-office/gnumeric
 app-portage/gentoolkit