diff --git a/profile.csh b/profile.csh
index 7360adb..156052e 100644
--- a/profile.csh
+++ b/profile.csh
@@ -2,8 +2,8 @@
 # This file has been automatically generated.
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin'
 setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 setenv DISTCC_LOG ''
 setenv DCCC_PATH '/usr/lib64/distcc/bin'
diff --git a/profile.env b/profile.env
index 3716445..41cbca1 100644
--- a/profile.env
+++ b/profile.env
@@ -1,45 +1,44 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.
-# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES
-# GO INTO /etc/profile NOT /etc/profile.env
-
-export ADA_INCLUDE_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude'
-export ADA_OBJECTS_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib'
-export CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume'
-export CAVE_SEARCH_INDEX='~/cave-search-index'
-export CG_COMPILER_EXE='/opt/bin/cgc'
-export CG_INC_PATH='/opt/nvidia-cg-toolkit/include'
-export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
-export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config'
-export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
-export DCCC_PATH='/usr/lib64/distcc/bin'
-export DISTCC_LOG=''
-export DISTCC_VERBOSE='0'
-export GCC_SPECS=''
-export GSETTINGS_BACKEND='dconf'
-export GUILE_LOAD_PATH='/usr/share/guile/1.8'
-export HG='/usr/bin/hg'
+# Configuration file for eselect
+# This file has been automatically generated.
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
 export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
+export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+export DISTCC_LOG=''
+export DCCC_PATH='/usr/lib64/distcc/bin'
+export DISTCC_VERBOSE='0'
 export LANG='de_DE.utf8'
 export LC_COLLATE='C'
 export LC_MESSAGES='en_US.utf8'
-export LESS='-R -M --shift 5'
-export LESSOPEN='|lesspipe %s'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
-export MULTIOSDIRS='../lib64:../lib32'
 export OPENCL_PROFILE='nvidia'
 export OPENGL_PROFILE='nvidia'
-export PACKAGE_MANAGER='paludis'
-export PAGER='/usr/bin/most'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin'
-export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
-export QT_GRAPHICSSYSTEM='raster'
-export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin'
+export GCC_SPECS=''
+export MULTIOSDIRS='../lib64:../lib32'
 export RUBYOPT='-rauto_gem'
+export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config'
+export XDG_DATA_DIRS='/usr/local/share:/usr/share'
+export COLON_SEPARATED='QT_PLUGIN_PATH'
+export QT_GRAPHICSSYSTEM='raster'
+export GSETTINGS_BACKEND='dconf'
+export GUILE_LOAD_PATH='/usr/share/guile/1.8'
+export PACKAGE_MANAGER='paludis'
 export SBCL_HOME='/usr/lib64/sbcl'
 export SBCL_SOURCE_ROOT='/usr/lib64/sbcl/src'
-export SGML_CATALOG_FILES='/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-lite.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.2.cat'
+export ADA_INCLUDE_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude'
+export ADA_OBJECTS_PATH='/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib'
+export LESSOPEN='|lesspipe %s'
+export LESS='-R -M --shift 5'
+export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
+export CG_COMPILER_EXE='/opt/bin/cgc'
+export CG_INC_PATH='/opt/nvidia-cg-toolkit/include'
+export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
+export HG='/usr/bin/hg'
+export CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume'
+export CAVE_SEARCH_INDEX='/root/cave-search-index'
+export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
 export VBOX_APP_HOME='/usr/lib64/virtualbox'
 export XDG_CONFIG_DIRS='/etc/xdg'
-export XDG_DATA_DIRS='/usr/local/share:/usr/share'
 export XSESSION='Xfce4'
+export SGML_CATALOG_FILES='/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-lite.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.2.cat'
+export PAGER='/usr/bin/most'