diff --git a/profiles/base/package.keywords b/profiles/base/package.keywords
index cdd9b8333..673581187 100644
--- a/profiles/base/package.keywords
+++ b/profiles/base/package.keywords
@@ -1,38 +1,33 @@
-~media-gfx/calculate-wallpapers-14 amd64 x86
-~media-gfx/dm-themes-calculate-14 amd64 x86
-~media-gfx/grub-splashes-calculate-14 amd64 x86
-~media-gfx/kdm-themes-calculate-14 amd64 x86
-~media-gfx/lightdm-themes-calculate-14 amd64 x86
-~media-gfx/plymouth-themes-calculate-14 amd64 x86
-~media-gfx/syslinux-themes-calculate-14 amd64 x86
-~x11-themes/calculate-icon-theme-14 amd64 x86
-
-# Should fix CVE-2014-6278
-~app-shells/bash-4.2_p53 amd64 x86
-
 =app-cdr/cdrtools-3.01_alpha24 amd64 x86
-~app-crypt/sbsigntool-0.6 amd64 x86
-=app-crypt/shim-signed-0.2 amd64 x86
-~app-emulation/emul-linux-x86-bjdeps-0.1 amd64 x86
 ~app-i18n/man-pages-ru-3.56.2172.1866.20140202 amd64 x86
-~dev-libs/libnatspec-0.2.6 amd64 x86
 ~dev-python/py-smbpasswd-1.0.1 amd64
 ~dev-python/reportlab-3.1.8 amd64 x86
-~dev-python/soaplib-1.0.0 amd64 x86
-~net-print/cnijfilter-3.80 amd64 x86
 ~net-print/hplip-3.14.6 amd64 x86
 ~net-print/hplip-plugin-3.14.6 amd64 x86
 ~net-wireless/broadcom-sta-6.30.223.248 amd64 x86
 ~net-wireless/madwimax-0.1.1 amd64 x86
 ~perl-core/ExtUtils-Manifest-1.630.0 amd64 x86
-=sys-block/thin-provisioning-tools-0.3.2 amd64 x86
 ~sys-boot/plymouth-openrc-plugin-0.1.2 amd64 x86
 ~sys-firmware/b43-firmware-6.30.163.46 amd64 x86
-~sys-fs/btrfs-progs-3.16 amd64 x86
-~sys-fs/lvm2-2.02.109 amd64 x86
+~sys-fs/btrfs-progs-3.16.2 amd64 x86
 ~sys-fs/nilfs-utils-2.1.6 amd64 x86
 ~sys-fs/squashfs-tools-4.3 amd64 x86
 ~sys-kernel/dracut-037 amd64 x86
-~sys-kernel/linux-firmware-20140809 amd64 x86
+~sys-kernel/linux-firmware-20140902 amd64 x86
 ~sys-power/cpupower-3.14 amd64 x86
-~sys-process/procps-3.3.9 amd64 x86
+
+# from the overlay
+=app-crypt/shim-signed-0.2 amd64 x86
+~app-emulation/emul-linux-x86-bjdeps-0.1 amd64 x86
+~dev-python/soaplib-1.0.0 amd64 x86
+~net-print/cnijfilter-3.80 amd64 x86
+
+# theme
+~media-gfx/calculate-wallpapers-14 amd64 x86
+~media-gfx/dm-themes-calculate-14 amd64 x86
+~media-gfx/grub-splashes-calculate-14 amd64 x86
+~media-gfx/kdm-themes-calculate-14 amd64 x86
+~media-gfx/lightdm-themes-calculate-14 amd64 x86
+~media-gfx/plymouth-themes-calculate-14 amd64 x86
+~media-gfx/syslinux-themes-calculate-14 amd64 x86
+~x11-themes/calculate-icon-theme-14 amd64 x86
diff --git a/profiles/desktop/package.keywords b/profiles/desktop/package.keywords
index 3689a2ed7..e6b1ca34a 100644
--- a/profiles/desktop/package.keywords
+++ b/profiles/desktop/package.keywords
@@ -1,16 +1,11 @@
-~sys-apps/keyexec-0.1.2 amd64 x86
-www-plugins/chrome-binary-plugins:stable amd64 x86
-
-=app-office/libreoffice-4.2.6.3 x86
-=app-office/libreoffice-l10n-4.2.6.3-r1 x86
+~media-libs/mesa-10.3.0 amd64 x86
+~x11-libs/libdrm-2.4.56 amd64 x86
 
 ~dev-util/bin_replace_string-0.2 amd64 x86
-~gnome-extra/nm-applet-0.9.8.10 amd64 x86
 ~media-gfx/gimp-2.8.14 amd64 x86
 ~media-sound/pavucontrol-2.0 amd64 x86
 ~net-im/skype-4.3.0.37 amd64 x86
 ~net-misc/modemmanager-1.2.0 amd64 x86
-~net-misc/networkmanager-0.9.8.10 amd64 x86
 ~net-misc/rdesktop-1.8.2 amd64 x86
 ~net-print/foomatic-db-4.0.20140105 amd64 x86
 ~net-print/foomatic-db-engine-4.0.11 amd64 x86
@@ -18,11 +13,8 @@ www-plugins/chrome-binary-plugins:stable amd64 x86
 ~sys-fs/ecryptfs-utils-104 amd64 x86
 ~sys-power/upower-pm-utils-0.9.23 amd64 x86
 ~x11-drivers/ati-drivers-14.6_beta2 amd64 x86
-
-# http://www.calculate-linux.ru/boards/7/topics/26175
-~x11-libs/libva-1.3.1 amd64 x86
-~x11-libs/libva-intel-driver-1.3.1 amd64 x86
-~x11-libs/libva-vdpau-driver-0.7.4 amd64 x86
-
 ~x11-libs/libvdpau-0.8 amd64 x86
 
+~sys-apps/keyexec-0.1.2 amd64 x86
+www-plugins/chrome-binary-plugins:stable amd64 x86
+
diff --git a/profiles/desktop/package.use b/profiles/desktop/package.use
index c202ee2a6..35b9e5aac 100644
--- a/profiles/desktop/package.use
+++ b/profiles/desktop/package.use
@@ -1,12 +1,3 @@
-app-crypt/pinentry gtk
-dev-vcs/git tk
-gnome-extra/nm-applet -bluetooth
-sys-fs/ecryptfs-utils suid pam
-net-libs/webkit-gtk -introspection
-net-misc/networkmanager connection-sharing dhclient -dhcpcd modemmanager
-net-wireless/blueman network
-
-
 # required by x11-libs/glamor [gdm]
 media-libs/mesa gbm
 
@@ -25,12 +16,14 @@ dev-python/pyside script
 
 # Removed unnecessary dependence
 dev-vcs/git -gtk
+gnome-extra/nm-applet -bluetooth
 net-analyzer/nmap -gtk
 net-print/cndrvcups-capt -gtk
 sys-fs/mtools -X
 x11-drivers/nvidia-drivers -gtk
 www-client/links -X
 
+
 # Add support for access point mode
 net-wireless/wpa_supplicant ap
 
@@ -40,6 +33,9 @@ media-fonts/terminus-font -X
 # SMplayer support
 media-video/mplayer bidi -video_cards_tdfx
 
+# select dhcp client, support modemmanager
+net-misc/networkmanager connection-sharing dhclient -dhcpcd modemmanager
+
 # Enable fax, support work over networks, IJS driver for cups, exclude scanner GUI (use XSane)
 net-print/hplip fax snmp hpijs -X
 
@@ -51,9 +47,15 @@ dev-lang/python sqlite
 # remove the sound when changing volume in pulseaudio
 media-libs/libcanberra -sound
 
+# Add functionality
+net-wireless/blueman network
+
 # Remove unsupported languages
 www-client/chromium -linguas_am -linguas_ar -linguas_bn -linguas_ca -linguas_cs -linguas_da -linguas_el -linguas_en_GB -linguas_es_LA -linguas_et -linguas_fa -linguas_fi -linguas_fil -linguas_gu -linguas_he -linguas_hi -linguas_hr -linguas_hu -linguas_id -linguas_ja -linguas_kn -linguas_ko -linguas_lt -linguas_lv -linguas_ml -linguas_mr -linguas_ms -linguas_nb -linguas_nl -linguas_sk -linguas_sl -linguas_sr -linguas_sv -linguas_sw -linguas_ta -linguas_te -linguas_th -linguas_tr -linguas_vi -linguas_zh_CN -linguas_zh_TW
 
+# Support for encrypted user directories
+sys-fs/ecryptfs-utils suid
+
 # Name Service Cache Daemon
 sys-libs/glibc nscd