diff --git a/profiles/base/desktop/make.defaults b/profiles/base/desktop/make.defaults
index cc94ccda3..bff5e3c94 100644
--- a/profiles/base/desktop/make.defaults
+++ b/profiles/base/desktop/make.defaults
@@ -1,61 +1,2 @@
-# Audio
-USE="${USE} alsa amr -arts audiofile cdda cue id3tag flac gstreamer mad mikmod mp3 mpeg ogg oggvorbis openal opencore-amr opus portaudio pulseaudio taglib wavpack vorbis vpx"
-
-# CD and DVD
-USE="${USE} cdparanoia cdr css dvd dvdr dvdread vcd"
-
-# Decoration
-USE="${USE} -branding -wallpapers"
-
-# Devices
-USE="${USE} ios ipod udev"
-
-# Documentation format
-USE="${USE} chm djvu ebook"
-
-# Guard and security
-USE="${USE} crypt ssl"
-
-# Hardware
-USE="${USE} acpi cairo cpudetection dbus dri ieee1394 gpm opengl pm-utils scanner smp usb vdpau -video_cards_dummy -video_cards_fbdev -video_cards_v4l video_cards_via xcomposite"
-
-# Internet Messager
-USE="${USE} irc jabber oscar"
-
-# Image support
-USE="${USE} X fdftk gd imagemagick openexr pdf png raw svg xmp webp wmf wxwindows" 
-
-# Locale and Fonts
-USE="${USE} spell"
-
-# Mail
-USE="${USE} mbox"
-
-# Network protocols
-USE="${USE} rdesktop"
-
-# Photo
-USE="${USE} gphoto2"
-
-# System
-USE="${USE} consolekit networkmanager nsplugin policykit udisks"
-
-# Video
-USE="${USE} a52 aac -aalib avi cddb dv encode faac ffmpeg flash lzo matroska mplayer musepack real sdl speex srt -svga tga quicktime theora vaapi v4l v4l2 vidix win32codecs xanim x264 x265 xinerama xv xvid xvmc"
-
-# Web
-#USE="${USE} -apache apache2 javascript"
-USE="${USE} libwww vhosts webkit"
-
-# Wireless
-USE="${USE} bluetooth wimax"
-
-# Window manager and speciality
-USE="${USE} gtk libnotify semantic-desktop qt3support -gnome"
-
-CAMERAS="*"
-INPUT_DEVICES="${INPUT_DEVICES} evdev mutouch synaptics"
-LIRC_DEVICES="devinput"
 PORTAGE_NICENESS="19"
 PORTAGE_IONICE_COMMAND="ionice -c 3 -p \${PID}"
-VIDEO_CARDS="amdgpu i915 i965 intel nouveau nv nvidia r100 r200 r300 r600 radeon radeonsi vesa"
diff --git a/profiles/base/desktop/package.use b/profiles/base/desktop/package.use
new file mode 100644
index 000000000..fbb02f957
--- /dev/null
+++ b/profiles/base/desktop/package.use
@@ -0,0 +1,6 @@
+# include backup, client, desktop, console and console-gui modules
+sys-apps/calculate-utils backup client desktop console qt4
+
+# Calculate themes dependence
+sys-kernel/calculate-sources themes
+
diff --git a/profiles/base/desktop/package.use/abi_x86_32 b/profiles/base/desktop/package.use/abi_x86_32
deleted file mode 100644
index 324166f59..000000000
--- a/profiles/base/desktop/package.use/abi_x86_32
+++ /dev/null
@@ -1,169 +0,0 @@
-app-accessibility/at-spi2-atk abi_x86_32
-app-accessibility/at-spi2-core abi_x86_32
-app-arch/bzip2 abi_x86_32
-dev-lang/orc abi_x86_32
-dev-libs/atk abi_x86_32
-dev-libs/elfutils abi_x86_32
-dev-libs/expat abi_x86_32
-dev-libs/glib abi_x86_32
-dev-libs/gmp abi_x86_32
-dev-libs/icu abi_x86_32
-dev-libs/json-c abi_x86_32
-dev-libs/libcroco abi_x86_32
-dev-libs/libffi abi_x86_32
-dev-libs/libgcrypt abi_x86_32
-dev-libs/libgpg-error abi_x86_32
-dev-libs/libltdl abi_x86_32
-dev-libs/libpcre abi_x86_32
-dev-libs/libpthread-stubs abi_x86_32
-dev-libs/libtasn1 abi_x86_32
-dev-libs/libusb abi_x86_32
-dev-libs/libusb-compat abi_x86_32
-dev-libs/libxml2 abi_x86_32
-dev-libs/libxslt abi_x86_32
-dev-libs/lzo abi_x86_32
-dev-libs/nettle abi_x86_32
-dev-libs/wayland abi_x86_32
-dev-qt/qt3support abi_x86_32
-dev-qt/qtcore abi_x86_32
-dev-qt/qtdbus abi_x86_32
-dev-qt/qtgui abi_x86_32
-dev-qt/qtscript abi_x86_32
-dev-qt/qtsql abi_x86_32
-dev-qt/qtwebkit abi_x86_32
-dev-qt/qtxmlpatterns abi_x86_32
-dev-util/pkgconfig abi_x86_32
-gnome-base/librsvg abi_x86_32
-media-gfx/graphite2 abi_x86_32
-media-gfx/sane-backends abi_x86_32
-media-libs/alsa-lib abi_x86_32
-media-libs/audiofile abi_x86_32
-media-libs/faac abi_x86_32
-media-libs/flac abi_x86_32
-media-libs/fontconfig abi_x86_32
-media-libs/freeglut abi_x86_32
-media-libs/freetype abi_x86_32
-media-libs/gd abi_x86_32
-media-libs/glu abi_x86_32
-media-libs/gst-plugins-base abi_x86_32
-media-libs/gstreamer abi_x86_32
-media-libs/harfbuzz abi_x86_32
-media-libs/jasper abi_x86_32
-media-libs/lcms abi_x86_32
-media-libs/libdc1394 abi_x86_32
-media-libs/libepoxy abi_x86_32
-media-libs/libexif abi_x86_32
-media-libs/libgphoto2 abi_x86_32
-media-libs/libjpeg-turbo abi_x86_32
-media-libs/libmng abi_x86_32
-media-libs/libogg abi_x86_32
-media-libs/libpng abi_x86_32
-media-libs/libsdl2 abi_x86_32
-media-libs/libsdl abi_x86_32
-media-libs/libsndfile abi_x86_32
-media-libs/libtheora abi_x86_32
-media-libs/libv4l abi_x86_32
-media-libs/libvorbis abi_x86_32
-media-libs/libvpx abi_x86_32
-media-libs/libwebp abi_x86_32
-media-libs/mesa abi_x86_32
-media-libs/openal abi_x86_32
-media-libs/opencore-amr abi_x86_32
-media-libs/openjpeg abi_x86_32
-media-libs/opus abi_x86_32
-media-libs/portaudio abi_x86_32
-media-libs/speex abi_x86_32
-media-libs/tiff abi_x86_32
-media-libs/vo-aacenc abi_x86_32
-media-libs/x264 abi_x86_32
-media-libs/x265 abi_x86_32
-media-libs/xvid abi_x86_32
-media-plugins/alsa-plugins abi_x86_32
-media-sound/lame abi_x86_32
-media-sound/mpg123 abi_x86_32
-media-sound/pulseaudio abi_x86_32
-media-sound/wavpack abi_x86_32
-media-video/ffmpeg abi_x86_32
-net-libs/gnutls abi_x86_32
-net-libs/libasyncns abi_x86_32
-net-print/cups abi_x86_32
-sys-apps/attr abi_x86_32
-sys-apps/dbus abi_x86_32
-sys-apps/tcp-wrappers abi_x86_32
-sys-apps/util-linux abi_x86_32
-sys-devel/gettext abi_x86_32
-sys-devel/llvm abi_x86_32
-sys-fs/eudev abi_x86_32
-sys-libs/binutils-libs abi_x86_32
-sys-libs/gpm abi_x86_32
-sys-libs/libcap abi_x86_32
-sys-libs/libraw1394 abi_x86_32
-virtual/ffmpeg abi_x86_32
-virtual/glu abi_x86_32
-virtual/jpeg abi_x86_32
-virtual/libelf abi_x86_32
-virtual/libffi abi_x86_32
-virtual/libiconv abi_x86_32
-virtual/libintl abi_x86_32
-virtual/libudev abi_x86_32
-virtual/libusb abi_x86_32
-virtual/mysql abi_x86_32
-virtual/opengl abi_x86_32
-virtual/pkgconfig abi_x86_32
-x11-libs/cairo abi_x86_32
-x11-libs/gdk-pixbuf abi_x86_32
-x11-libs/gtk+ abi_x86_32
-x11-libs/libdrm abi_x86_32
-x11-libs/libICE abi_x86_32
-x11-libs/libpciaccess abi_x86_32
-x11-libs/libSM abi_x86_32
-x11-libs/libva abi_x86_32
-x11-libs/libva-intel-driver abi_x86_32
-x11-libs/libva-vdpau-driver abi_x86_32
-x11-libs/libvdpau abi_x86_32
-x11-libs/libX11 abi_x86_32
-x11-libs/libXau abi_x86_32
-x11-libs/libxcb abi_x86_32
-x11-libs/libXcomposite abi_x86_32
-x11-libs/libXcursor abi_x86_32
-x11-libs/libXdamage abi_x86_32
-x11-libs/libXdmcp abi_x86_32
-x11-libs/libXext abi_x86_32
-x11-libs/libXfixes abi_x86_32
-x11-libs/libXft abi_x86_32
-x11-libs/libXi abi_x86_32
-x11-libs/libXinerama abi_x86_32
-x11-libs/libxkbcommon abi_x86_32
-x11-libs/libXmu abi_x86_32
-x11-libs/libXrandr abi_x86_32
-x11-libs/libXrender abi_x86_32
-x11-libs/libXScrnSaver abi_x86_32
-x11-libs/libxshmfence abi_x86_32
-x11-libs/libXt abi_x86_32
-x11-libs/libXtst abi_x86_32
-x11-libs/libXv abi_x86_32
-x11-libs/libXvMC abi_x86_32
-x11-libs/libXxf86vm abi_x86_32
-x11-libs/pango abi_x86_32
-x11-libs/pixman abi_x86_32
-x11-proto/compositeproto abi_x86_32
-x11-proto/damageproto abi_x86_32
-x11-proto/dri2proto abi_x86_32
-x11-proto/dri3proto abi_x86_32
-x11-proto/fixesproto abi_x86_32
-x11-proto/glproto abi_x86_32
-x11-proto/inputproto abi_x86_32
-x11-proto/kbproto abi_x86_32
-x11-proto/presentproto abi_x86_32
-x11-proto/randrproto abi_x86_32
-x11-proto/recordproto abi_x86_32
-x11-proto/renderproto abi_x86_32
-x11-proto/scrnsaverproto abi_x86_32
-x11-proto/videoproto abi_x86_32
-x11-proto/xcb-proto abi_x86_32
-x11-proto/xextproto abi_x86_32
-x11-proto/xf86bigfontproto abi_x86_32
-x11-proto/xf86driproto abi_x86_32
-x11-proto/xf86vidmodeproto abi_x86_32
-x11-proto/xineramaproto abi_x86_32
-x11-proto/xproto abi_x86_32
diff --git a/profiles/base/desktop/virtuals b/profiles/base/desktop/virtuals
deleted file mode 100644
index 3a4f6b58e..000000000
--- a/profiles/base/desktop/virtuals
+++ /dev/null
@@ -1,2 +0,0 @@
-virtual/bittorrent      net-p2p/ktorrent
-virtual/ooo             app-office/libreoffice
\ No newline at end of file
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 8709e737d..30681d153 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,17 +1,41 @@
-# Image support
-USE="${USE} exif gif jpeg jpeg2k png tiff -mng"
+# Audio
+USE="${USE} alsa amr -arts audiofile cdda cue id3tag flac gstreamer mad mikmod mp3 mpeg ogg oggvorbis openal opencore-amr opus portaudio pulseaudio taglib wavpack vorbis vpx"
+
+# CD and DVD
+USE="${USE} cdparanoia cdr css dvd dvdr dvdread vcd"
+
+# Decoration
+USE="${USE} -branding -wallpapers"
+
+# Devices
+USE="${USE} ios ipod udev"
+
+# Documentation format
+USE="${USE} chm djvu ebook"
+
+# Guard and security
+USE="${USE} crypt ssl"
 
 # Hardware
+USE="${USE} acpi cairo cpudetection dbus dri ieee1394 gpm opengl pm-utils scanner smp usb vdpau -video_cards_dummy -video_cards_fbdev -video_cards_v4l video_cards_via xcomposite"
+
+# Hardware CPU
 USE="${USE} 3dnow 3dnowext aes avx fma3 fma4 lm_sensors mmx mmxext padlock popcnt sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3 xop"
 
+# Internet Messager
+USE="${USE} irc jabber oscar"
+
+# Image support
+USE="${USE} X fexif dftk gd gif imagemagick jpeg jpeg2k -mng openexr pdf png raw svg tiff xmp webp wmf wxwindows" 
+
 # Locale and Fonts
-USE="${USE} truetype userlocales"
+USE="${USE} spell truetype userlocales"
 
 # Mail
-USE="${USE} imap smtp"
+USE="${USE} mimap box smtp"
 
 # Net protocols
-USE="${USE} bittorrent ftp idn nfs samba sasl"
+USE="${USE} bittorrent ftp idn nfs rdesktop samba sasl"
 
 # Network connections
 USE="${USE} ppp"
@@ -19,6 +43,9 @@ USE="${USE} ppp"
 # Office
 USE="${USE} -aspell -spell hunspell"
 
+# Photo
+USE="${USE} gphoto2"
+
 # Printing
 USE="${USE} cups foomaticdb"
 
@@ -26,20 +53,37 @@ USE="${USE} cups foomaticdb"
 USE="${USE} ruby_targets_ruby21 -ruby_targets_ruby20 -ruby_targets_ruby19"
 
 # System
-USE="${USE} introspection logrotate threads"
+USE="${USE} consolekit introspection logrotate networkmanager nsplugin policykit threads udisks"
+
+# Video
+USE="${USE} a52 aac -aalib avi cddb dv encode faac ffmpeg flash lzo matroska mplayer musepack real sdl speex srt -svga tga quicktime theora vaapi v4l v4l2 vidix win32codecs xanim x264 x265 xinerama xv xvid xvmc"
+
+# Web
+#USE="${USE} -apache apache2 javascript"
+USE="${USE} libwww vhosts webkit"
+
+# Wireless
+USE="${USE} bluetooth wimax"
+
+# Window manager and speciality
+USE="${USE} gtk libnotify semantic-desktop qt3support -gnome"
 
 LINGUAS="en be be_BY bg bg_BG bs cs cs_CZ da da_DK de de_DE en_GB es es_AR es_ES es_LA es_UY es_VE et et_EE fi fi_FI fr fr_CA fr_FR hr hr_HR hu hu_HU it it_IT kk kk_KZ lt lt_LT lv lv_LV nl nl_NL pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sk sk_SK sl sl_SI sq sq_AL sr sr_RS sv sv_SE uk uk_UA"
 L10N="${LINGUAS} de-1901 en-GB pt-BR"
 
 ACCEPT_LICENSE="*"
 AUTOCLEAN="yes"
+CAMERAS="*"
 CPU_FLAGS_X86="3dnow 3dnowext mmx sse sse2 *"
 DISTDIR="/var/calculate/remote/distfiles"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --binpkg-changed-deps=n --quiet-build=n --binpkg-respect-use=y --jobs=4"
 FEATURES="getbinpkg parallel-install -userpriv"
 GENTOO_MIRRORS="http://mirror.yandex.ru/gentoo-distfiles http://distfiles.gentoo.org"
+INPUT_DEVICES="${INPUT_DEVICES} evdev mutouch synaptics"
 INSTALL_MASK="/etc/systemd /usr/lib*/systemd"
 LDFLAGS="-Wl,--as-needed"
+LIRC_DEVICES="devinput"
 NPTL_KERN_VER="4.1.0"
 PORTAGE_TMPDIR="/var/calculate/tmp"
 USE_EXPAND="CALCULATE THEMES"
+VIDEO_CARDS="amdgpu i915 i965 intel nouveau nv nvidia r100 r200 r300 r600 radeon radeonsi vesa"
diff --git a/profiles/base/package.use/abi_x86_32 b/profiles/base/package.use/abi_x86_32
index 9ed832642..a4a2fa361 100644
--- a/profiles/base/package.use/abi_x86_32
+++ b/profiles/base/package.use/abi_x86_32
@@ -1,8 +1,177 @@
+app-accessibility/at-spi2-atk abi_x86_32
+app-accessibility/at-spi2-core abi_x86_32
+app-arch/bzip2 abi_x86_32
 dev-db/mariadb abi_x86_32
 dev-db/mysql abi_x86_32
 dev-db/sqlite abi_x86_32
+dev-lang/orc abi_x86_32
+dev-libs/atk abi_x86_32
+dev-libs/elfutils abi_x86_32
+dev-libs/expat abi_x86_32
+dev-libs/glib abi_x86_32
+dev-libs/gmp abi_x86_32
+dev-libs/icu abi_x86_32
+dev-libs/json-c abi_x86_32
+dev-libs/libcroco abi_x86_32
+dev-libs/libffi abi_x86_32
+dev-libs/libgcrypt abi_x86_32
+dev-libs/libgpg-error abi_x86_32
+dev-libs/libltdl abi_x86_32
+dev-libs/libpcre abi_x86_32
+dev-libs/libpthread-stubs abi_x86_32
+dev-libs/libtasn1 abi_x86_32
+dev-libs/libusb abi_x86_32
+dev-libs/libusb-compat abi_x86_32
+dev-libs/libxml2 abi_x86_32
+dev-libs/libxslt abi_x86_32
+dev-libs/lzo abi_x86_32
+dev-libs/nettle abi_x86_32
 dev-libs/openssl abi_x86_32
+dev-libs/wayland abi_x86_32
+dev-qt/qt3support abi_x86_32
+dev-qt/qtcore abi_x86_32
+dev-qt/qtdbus abi_x86_32
+dev-qt/qtgui abi_x86_32
+dev-qt/qtscript abi_x86_32
+dev-qt/qtsql abi_x86_32
+dev-qt/qtwebkit abi_x86_32
+dev-qt/qtxmlpatterns abi_x86_32
+dev-util/pkgconfig abi_x86_32
+gnome-base/librsvg abi_x86_32
+media-gfx/graphite2 abi_x86_32
+media-gfx/sane-backends abi_x86_32
+media-libs/alsa-lib abi_x86_32
+media-libs/audiofile abi_x86_32
+media-libs/faac abi_x86_32
+media-libs/flac abi_x86_32
+media-libs/fontconfig abi_x86_32
+media-libs/freeglut abi_x86_32
+media-libs/freetype abi_x86_32
+media-libs/gd abi_x86_32
+media-libs/glu abi_x86_32
+media-libs/gst-plugins-base abi_x86_32
+media-libs/gstreamer abi_x86_32
+media-libs/harfbuzz abi_x86_32
+media-libs/jasper abi_x86_32
+media-libs/lcms abi_x86_32
+media-libs/libdc1394 abi_x86_32
+media-libs/libepoxy abi_x86_32
+media-libs/libexif abi_x86_32
+media-libs/libgphoto2 abi_x86_32
+media-libs/libjpeg-turbo abi_x86_32
+media-libs/libmng abi_x86_32
+media-libs/libogg abi_x86_32
+media-libs/libpng abi_x86_32
+media-libs/libsdl2 abi_x86_32
+media-libs/libsdl abi_x86_32
+media-libs/libsndfile abi_x86_32
+media-libs/libtheora abi_x86_32
+media-libs/libv4l abi_x86_32
+media-libs/libvorbis abi_x86_32
+media-libs/libvpx abi_x86_32
+media-libs/libwebp abi_x86_32
+media-libs/mesa abi_x86_32
+media-libs/openal abi_x86_32
+media-libs/opencore-amr abi_x86_32
+media-libs/openjpeg abi_x86_32
+media-libs/opus abi_x86_32
+media-libs/portaudio abi_x86_32
+media-libs/speex abi_x86_32
+media-libs/tiff abi_x86_32
+media-libs/vo-aacenc abi_x86_32
+media-libs/x264 abi_x86_32
+media-libs/x265 abi_x86_32
+media-libs/xvid abi_x86_32
+media-plugins/alsa-plugins abi_x86_32
+media-sound/lame abi_x86_32
+media-sound/mpg123 abi_x86_32
+media-sound/pulseaudio abi_x86_32
+media-sound/wavpack abi_x86_32
+media-video/ffmpeg abi_x86_32
+net-libs/gnutls abi_x86_32
+net-libs/libasyncns abi_x86_32
+net-print/cups abi_x86_32
+sys-apps/attr abi_x86_32
+sys-apps/dbus abi_x86_32
+sys-apps/tcp-wrappers abi_x86_32
+sys-apps/util-linux abi_x86_32
+sys-devel/gettext abi_x86_32
+sys-devel/llvm abi_x86_32
+sys-fs/eudev abi_x86_32
+sys-libs/binutils-libs abi_x86_32
+sys-libs/gpm abi_x86_32
+sys-libs/libcap abi_x86_32
+sys-libs/libraw1394 abi_x86_32
 sys-libs/ncurses abi_x86_32
 sys-libs/readline abi_x86_32
 sys-libs/zlib abi_x86_32
+virtual/ffmpeg abi_x86_32
+virtual/glu abi_x86_32
+virtual/jpeg abi_x86_32
+virtual/libelf abi_x86_32
+virtual/libffi abi_x86_32
+virtual/libiconv abi_x86_32
+virtual/libintl abi_x86_32
 virtual/libmysqlclient abi_x86_32
+virtual/libudev abi_x86_32
+virtual/libusb abi_x86_32
+virtual/mysql abi_x86_32
+virtual/opengl abi_x86_32
+virtual/pkgconfig abi_x86_32
+x11-libs/cairo abi_x86_32
+x11-libs/gdk-pixbuf abi_x86_32
+x11-libs/gtk+ abi_x86_32
+x11-libs/libdrm abi_x86_32
+x11-libs/libICE abi_x86_32
+x11-libs/libpciaccess abi_x86_32
+x11-libs/libSM abi_x86_32
+x11-libs/libva abi_x86_32
+x11-libs/libva-intel-driver abi_x86_32
+x11-libs/libva-vdpau-driver abi_x86_32
+x11-libs/libvdpau abi_x86_32
+x11-libs/libX11 abi_x86_32
+x11-libs/libXau abi_x86_32
+x11-libs/libxcb abi_x86_32
+x11-libs/libXcomposite abi_x86_32
+x11-libs/libXcursor abi_x86_32
+x11-libs/libXdamage abi_x86_32
+x11-libs/libXdmcp abi_x86_32
+x11-libs/libXext abi_x86_32
+x11-libs/libXfixes abi_x86_32
+x11-libs/libXft abi_x86_32
+x11-libs/libXi abi_x86_32
+x11-libs/libXinerama abi_x86_32
+x11-libs/libxkbcommon abi_x86_32
+x11-libs/libXmu abi_x86_32
+x11-libs/libXrandr abi_x86_32
+x11-libs/libXrender abi_x86_32
+x11-libs/libXScrnSaver abi_x86_32
+x11-libs/libxshmfence abi_x86_32
+x11-libs/libXt abi_x86_32
+x11-libs/libXtst abi_x86_32
+x11-libs/libXv abi_x86_32
+x11-libs/libXvMC abi_x86_32
+x11-libs/libXxf86vm abi_x86_32
+x11-libs/pango abi_x86_32
+x11-libs/pixman abi_x86_32
+x11-proto/compositeproto abi_x86_32
+x11-proto/damageproto abi_x86_32
+x11-proto/dri2proto abi_x86_32
+x11-proto/dri3proto abi_x86_32
+x11-proto/fixesproto abi_x86_32
+x11-proto/glproto abi_x86_32
+x11-proto/inputproto abi_x86_32
+x11-proto/kbproto abi_x86_32
+x11-proto/presentproto abi_x86_32
+x11-proto/randrproto abi_x86_32
+x11-proto/recordproto abi_x86_32
+x11-proto/renderproto abi_x86_32
+x11-proto/scrnsaverproto abi_x86_32
+x11-proto/videoproto abi_x86_32
+x11-proto/xcb-proto abi_x86_32
+x11-proto/xextproto abi_x86_32
+x11-proto/xf86bigfontproto abi_x86_32
+x11-proto/xf86driproto abi_x86_32
+x11-proto/xf86vidmodeproto abi_x86_32
+x11-proto/xineramaproto abi_x86_32
+x11-proto/xproto abi_x86_32
diff --git a/profiles/base/desktop/package.use/blocks b/profiles/base/package.use/blocks
similarity index 100%
rename from profiles/base/desktop/package.use/blocks
rename to profiles/base/package.use/blocks
diff --git a/profiles/base/desktop/package.use/cinnamon b/profiles/base/package.use/cinnamon
similarity index 100%
rename from profiles/base/desktop/package.use/cinnamon
rename to profiles/base/package.use/cinnamon
diff --git a/profiles/base/desktop/package.use/default b/profiles/base/package.use/default.desktop
similarity index 100%
rename from profiles/base/desktop/package.use/default
rename to profiles/base/package.use/default.desktop
diff --git a/profiles/base/desktop/package.use/depends b/profiles/base/package.use/depends.desktop
similarity index 100%
rename from profiles/base/desktop/package.use/depends
rename to profiles/base/package.use/depends.desktop
diff --git a/profiles/base/desktop/package.use/fix b/profiles/base/package.use/fix
similarity index 100%
rename from profiles/base/desktop/package.use/fix
rename to profiles/base/package.use/fix
diff --git a/profiles/base/desktop/package.use/kde5 b/profiles/base/package.use/kde5
similarity index 100%
rename from profiles/base/desktop/package.use/kde5
rename to profiles/base/package.use/kde5
diff --git a/profiles/base/desktop/package.use/mate b/profiles/base/package.use/mate
similarity index 100%
rename from profiles/base/desktop/package.use/mate
rename to profiles/base/package.use/mate
diff --git a/profiles/base/desktop/package.use/python b/profiles/base/package.use/python
similarity index 100%
rename from profiles/base/desktop/package.use/python
rename to profiles/base/package.use/python
diff --git a/profiles/base/desktop/package.use/qt5 b/profiles/base/package.use/qt5
similarity index 100%
rename from profiles/base/desktop/package.use/qt5
rename to profiles/base/package.use/qt5
diff --git a/profiles/base/server/make.defaults b/profiles/base/server/make.defaults
deleted file mode 100644
index 4da681e8c..000000000
--- a/profiles/base/server/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mail
-USE="${USE} maildir"
-
-# Window manager and speciality
-USE="${USE} -gtk3 -qt4"
diff --git a/profiles/base/server/virtuals b/profiles/base/server/virtuals
deleted file mode 100644
index 47c3f69be..000000000
--- a/profiles/base/server/virtuals
+++ /dev/null
@@ -1,3 +0,0 @@
-virtual/imapd		net-mail/dovecot
-virtual/jabber-server	net-im/ejabberd
-virtual/mta		mail-mta/postfix
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index 6f348dd7a..b3f10e2bb 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/virtuals
@@ -1,4 +1,9 @@
+virtual/bittorrent	net-p2p/ktorrent
 virtual/editor		app-editors/nano
+virtual/imapd		net-mail/dovecot
+virtual/jabber-server	net-im/ejabberd
 virtual/linux-sources	sys-kernel/calculate-sources
 virtual/logger		app-admin/syslog-ng
 virtual/man		sys-apps/man-db
+virtual/mta		mail-mta/postfix
+virtual/ooo		app-office/libreoffice