diff --git a/profiles/desktop/package.accept_keywords b/profiles/desktop/package.accept_keywords
index da870681..60541c0c 100644
--- a/profiles/desktop/package.accept_keywords
+++ b/profiles/desktop/package.accept_keywords
@@ -9,6 +9,7 @@
 <app-admin/python-updater-1 ~amd64
 <app-antivirus/clamav-1 ~amd64
 <app-antivirus/clamtk-6 ~amd64
+<app-arch/lbzip2-2.6 ~amd64
 <app-arch/lrzip-1 ~amd64
 <app-arch/p7zip-16 ~amd64
 <app-benchmarks/gtkperf-1 ~amd64
@@ -219,6 +220,7 @@
 <sys-apps/gcp-1 ~amd64
 <sys-apps/gptfdisk-1.1 ~amd64
 =sys-apps/hardinform-9999 **
+<sys-apps/hwids-20170101 ~amd64
 <sys-apps/i2c-tools-3.2 ~amd64
 <sys-apps/kmod-23 ~amd64
 <sys-apps/microcode-data-20170101 ~amd64
diff --git a/profiles/server/package.accept_keywords b/profiles/server/package.accept_keywords
index f24b282a..af288dcb 100644
--- a/profiles/server/package.accept_keywords
+++ b/profiles/server/package.accept_keywords
@@ -1,259 +1,103 @@
-app-accessibility/festival-ru ~amd64
-app-admin/cpuset ~amd64
-<app-admin/eselect-1.5 ~amd64
-app-admin/eselect-python ~amd64
-app-admin/eselect-vala ~amd64
+<app-admin/eselect-vala-1 ~amd64
 =app-admin/gentoo-upgrade-9999 **
-=app-admin/glance-2014.1.9999 **
 =app-admin/htpasswd-9999 **
-app-admin/logcheck ~amd64
-app-admin/paxtest ~amd64
-app-admin/python-updater ~amd64
-app-antivirus/clamav ~amd64
-app-arch/lbzip2 ~amd64
-app-arch/p7zip ~amd64
-app-editors/gvim ~amd64
-app-editors/vim ~amd64
-app-editors/vim-core ~amd64
-<app-eselect/eselect-php-0.10 ~amd64
-app-emulation/libvirt ~amd64
-app-emulation/qemu ~amd64
-app-misc/c_rehash ~amd64
-<app-misc/sphinx-2.2 ~amd64
-app-misc/tmux ~amd64
-app-portage/deltup ~amd64
-app-portage/eix ~amd64
-app-portage/ewo ~amd64
+<app-admin/logcheck-1.4 ~amd64
+<app-admin/paxtest-1 ~amd64
+<app-admin/python-updater-1 ~amd64
+<app-antivirus/clamav-1 ~amd64
+<app-arch/lbzip2-2.6 ~amd64
+<app-arch/p7zip-16 ~amd64
+<app-editors/gvim-7.5 ~amd64
+<app-editors/vim-7.5 ~amd64
+<app-editors/vim-core-7.5 ~amd64
+<app-portage/deltup-1 ~amd64
+<app-portage/eix-0.32 ~amd64
+<app-portage/ewo-1 ~amd64
 =app-portage/findcruftfiles-9999 **
-app-portage/genlop ~amd64
+<app-portage/genlop-0.31 ~amd64
 <app-portage/gentoolkit-3.2 ~amd64
-app-portage/getdelta ~amd64
-app-portage/smart-live-rebuild ~amd64
-=app-shells/bash-completion-2.1-r91 ~amd64
-app-shells/gentoo-zsh-completions ~amd64
-app-shells/zsh-completions ~amd64
-app-text/cuneiform ~amd64
-app-text/dos2unix ~amd64
-app-text/dvipsk ~amd64
-app-text/manpager ~amd64
-app-text/ps2pkm ~amd64
-app-text/texlive ~amd64
-app-text/texlive-core ~amd64
-app-vim/cctree ~amd64
-app-vim/pathogen ~amd64
-app-vim/screen ~amd64
-app-vim/youcompleteme ~amd64
-dev-games/irrlicht ~amd64
-<dev-lang/python-exec-2.1 ~amd64
+<app-portage/getdelta-1 ~amd64
+<app-shells/gentoo-zsh-completions-20170101 ~amd64
+<app-shells/zsh-completions-1 ~amd64
+<app-text/dos2unix-7.4 ~amd64
+<app-text/dvipsk-6 ~amd64
+<app-text/ps2pkm-1.8 ~amd64
+<app-text/texlive-2016 ~amd64
+<app-text/texlive-core-2016 ~amd64
+<app-vim/cctree-2 ~amd64
+<app-vim/screen-2 ~amd64
+<app-vim/youcompleteme-20170101 ~amd64
 <dev-lang/php-5.7 ~amd64 # security fixes
-dev-lang/vala ~amd64
-dev-libs/libgee ~amd64
+<dev-lang/vala-1 ~amd64
+<dev-libs/libgee-1 ~amd64
 <dev-libs/libpipeline-1.5 ~amd64
 <dev-libs/libuv-1.9 ~amd64
-<dev-libs/lzo-2.1 ~amd64
-<dev-libs/openssl-1.1 ~amd64
-dev-libs/vala-common ~amd64
-dev-perl/PHP-Serialization ~amd64
-dev-python/alembic ~amd64
-dev-python/amqplib ~amd64
-dev-python/anyjson ~amd64
-dev-python/Babel ~amd64
-dev-python/boto ~amd64
-dev-python/cffi ~amd64
-dev-python/charade ~amd64
-dev-python/chardet ~amd64
-dev-python/cliff ~amd64
-dev-python/cmd2 ~amd64
-dev-python/colorama ~amd64
-dev-python/d2to1 ~amd64
-dev-python/django-appconf ~amd64
-dev-python/django-compressor ~amd64
-dev-python/django-openstack-auth ~amd64
-dev-python/ecdsa ~amd64
-dev-python/dogpile-cache ~amd64
-dev-python/dogpile-core ~amd64
-dev-python/enum34 ~amd64
-dev-python/eventlet ~amd64
-dev-python/futures ~amd64
-dev-python/greenlet ~amd64
-dev-python/httplib2 ~amd64
-dev-python/idna ~amd64
-dev-python/imaging ~amd64
-dev-python/ipaddress ~amd64
-dev-python/iso8601 ~amd64
-dev-python/jsonpatch ~amd64
-dev-python/jsonpointer ~amd64
-dev-python/jsonrpclib ~amd64
-dev-python/jsonschema ~amd64
-dev-python/kombu ~amd64
-dev-python/lesscpy ~amd64
-dev-python/libvirt-python ~amd64
-dev-python/mock ~amd64
-dev-python/mox ~amd64
-dev-python/netaddr ~amd64
-dev-python/networkx ~amd64
-dev-python/nosehtmloutput ~amd64
-dev-python/nosexcover ~amd64
-dev-python/oauth2 ~amd64
-dev-python/oauthlib ~amd64
-dev-python/openstack-nose-plugin ~amd64
-dev-python/oslo-config ~amd64
-dev-python/oslo-i18n ~amd64
-dev-python/oslo-messaging ~amd64
-dev-python/oslo-rootwrap ~amd64
-dev-python/oslo-serialization ~amd64
-dev-python/oslo-utils ~amd64
-dev-python/oslo-vmware ~amd64
-dev-python/paramiko ~amd64
-dev-python/passlib ~amd64
-dev-python/paste ~amd64
-dev-python/pastedeploy ~amd64
-dev-python/pbr ~amd64
-dev-python/pep8 ~amd64
-dev-python/posix_ipc ~amd64
-dev-python/prettytable ~amd64
-dev-python/progressbar ~amd64
-dev-python/py-amqp ~amd64
-dev-python/py-bcrypt ~amd64
+<dev-libs/lzo-2.10 ~amd64
+<dev-libs/vala-common-1 ~amd64
+<dev-python/cffi-1.5 ~amd64
+<dev-python/chardet-2.4 ~amd64
+<dev-python/enum34-1.2 ~amd64
+<dev-python/ipaddress-1.1 ~amd64
 <dev-python/pyasn1-0.2 ~amd64
-dev-python/pycadf ~amd64
-dev-python/pycrypto ~amd64
-dev-python/cryptography ~amd64
-dev-python/pyopenssl ~amd64
-dev-python/pyparsing ~amd64
-dev-python/python-ceilometerclient ~amd64
-dev-python/python-cinderclient ~amd64
-dev-python/python-exec ~amd64
-dev-python/python-glanceclient ~amd64
-dev-python/python-heatclient ~amd64
-dev-python/python-keyring ~amd64
-dev-python/python-keystoneclient ~amd64
-dev-python/python-neutronclient ~amd64
-dev-python/python-novaclient ~amd64
-dev-python/python-pam ~amd64
-dev-python/python-quantumclient ~amd64
-dev-python/python-swiftclient ~amd64
-dev-python/python-troveclient ~amd64
-dev-python/pyjwt ~amd64
-dev-python/pytz ~amd64
-dev-python/pyzmq ~amd64
-dev-python/repoze-lru ~amd64
-dev-python/requests ~amd64
-dev-python/routes ~amd64
-dev-python/rtslib-fb ~amd64
-dev-python/setuptools-git ~amd64
-dev-python/six ~amd64
-dev-python/stevedore ~amd64
-dev-python/sqlalchemy ~amd64
-dev-python/sqlalchemy-migrate ~amd64
-dev-python/suds ~amd64
-dev-python/taskflow ~amd64
-dev-python/tempita ~amd64
-dev-python/termcolor ~amd64
-dev-python/urllib3 ~amd64
-dev-python/versiontools ~amd64
-dev-python/warlock ~amd64
-dev-python/webob ~amd64
-dev-python/websockify ~amd64
-dev-python/webtest ~amd64
-dev-python/xhtml2pdf ~amd64
-dev-tex/bibtexu ~amd64
-<dev-tex/pgf-3.1 ~amd64
-dev-texlive/texlive-basic ~amd64
-dev-texlive/texlive-fontsextra ~amd64
-dev-texlive/texlive-fontsrecommended ~amd64
-dev-texlive/texlive-fontutils ~amd64
-dev-texlive/texlive-genericextra ~amd64
-dev-texlive/texlive-genericrecommended ~amd64
-dev-texlive/texlive-langcyrillic ~amd64
-dev-texlive/texlive-latex ~amd64
-dev-texlive/texlive-latexextra ~amd64
-dev-texlive/texlive-latexrecommended ~amd64
-dev-texlive/texlive-pictures ~amd64
-dev-texlive/texlive-pstricks ~amd64
-dev-texlive/texlive-science ~amd64
-dev-texlive/texlive-texinfo ~amd64
-dev-util/colormake ~amd64
-dev-util/perf ~amd64
+<dev-python/cryptography-1.3 ~amd64
+<dev-tex/bibtexu-4 ~amd64
+<dev-texlive/texlive-basic-2016 ~amd64
+<dev-texlive/texlive-fontsextra-2016 ~amd64
+<dev-texlive/texlive-fontsrecommended-2016 ~amd64
+<dev-texlive/texlive-fontutils-2016 ~amd64
+<dev-texlive/texlive-genericextra-2016 ~amd64
+<dev-texlive/texlive-genericrecommended-2016 ~amd64
+<dev-texlive/texlive-langcyrillic-2016 ~amd64
+<dev-texlive/texlive-latex-2016 ~amd64
+<dev-texlive/texlive-latexextra-2016 ~amd64
+<dev-texlive/texlive-latexrecommended-2016 ~amd64
+<dev-texlive/texlive-pictures-2016 ~amd64
+<dev-texlive/texlive-pstricks-2016 ~amd64
+<dev-texlive/texlive-science-2016 ~amd64
+<dev-util/colormake-1 ~amd64
+<dev-util/perf-5 ~amd64
 =dev-util/valadoc-9999 **
-dev-util/valgrind ~amd64
-<dev-vcs/git-2 ~amd64
-dev-vcs/gitosis-gentoo ~amd64
-dev-vcs/gitstats ~amd64
-games-action/minetest ~amd64
-games-action/minetest_game ~amd64
-games-action/minetest_common ~amd64
-games-fps/urbanterror ~amd64
-mail-filter/dovecot-antispam ~amd64
-mail-filter/dovecot_deleted_to_trash ~amd64
-media-gfx/graphviz ~amd64
-media-libs/freetype ~amd64
-media-libs/libmediainfo ~amd64
+<dev-util/valgrind-3.12 ~amd64
+<dev-vcs/gitstats-1 ~amd64
+<games-action/minetest-1 ~amd64
+<games-action/minetest_game-1 ~amd64
+<games-fps/urbanterror-5 ~amd64
+<mail-filter/dovecot-antispam-2.1 ~amd64
+<mail-filter/dovecot_deleted_to_trash-1 ~amd64
+<media-libs/freetype-2.7 ~amd64
+<media-libs/libmediainfo-1 ~amd64
 <media-libs/libpng-1.7 ~amd64
 <media-plugins/caps-plugins-0.9.10 ~amd64 # higher brokes alsaequal
-media-plugins/gst-plugins-ffmpeg ~amd64
-media-sound/mp3unicode ~amd64
-media-video/ffmpeg ~amd64
-media-video/mediainfo ~amd64
+<media-sound/mp3unicode-2 ~amd64
+<media-video/ffmpeg-2.9 ~amd64
+<media-video/mediainfo-1 ~amd64
 =net-analyzer/fail2ban-99999999 **
-net-analyzer/hping ~amd64
-net-analyzer/ntop ~amd64
-net-im/pyicq-t ~amd64
-<net-libs/gnutls-4 ~amd64
+<net-analyzer/hping-4 ~amd64
+<net-analyzer/ntop-6 ~amd64
+<net-libs/gnutls-3.4 ~amd64
 <net-libs/http-parser-2.7 ~amd64
-net-libs/libtorrent ~amd64
-net-libs/nodejs ~amd64
+<net-libs/nodejs-64 ~amd64
 <net-misc/netifrc-0.4 ~amd64
-net-misc/openvpn ~amd64
-net-misc/openvswitch ~amd64
-net-misc/rabbitmq-server ~amd64
-net-misc/tor ~amd64
+<net-misc/openvpn-2.4 ~amd64
+<net-misc/openvswitch-2.5 ~amd64
 <net-misc/wget-1.17 ~amd64
-net-p2p/rtorrent ~amd64
-net-proxy/squid ~amd64
-net-proxy/tinyproxy ~amd64
-perl-core/Module-Load ~amd64
-sys-apps/gcp ~amd64
-<sys-apps/gentoo-functions-1.0 ~amd64
+<sys-apps/gcp-1 ~amd64
 <sys-apps/gptfdisk-1.1 ~amd64
-sys-apps/hwids ~amd64
-sys-apps/i2c-tools ~amd64
-sys-apps/man-db ~amd64
-sys-apps/microcode-data ~amd64
+<sys-apps/hwids-20170101 ~amd64
+<sys-apps/i2c-tools-3.2 ~amd64
+<sys-apps/microcode-data-20170101 ~amd64
 <sys-apps/portage-2.3 **
 <sys-apps/util-linux-2.28 ~amd64
-sys-auth/keystone ~amd64
-=sys-auth/keystone-2014.1.9999 **
-sys-block/whdd ~amd64
-=sys-cluster/cinder-2014.1.9999 **
-=sys-cluster/neutron-2014.1.9999 **
-=sys-cluster/nova-2014.1.9999 **
-=sys-cluster/openstack-meta-2014.1.9999 **
-=sys-cluster/swift-2014.1.9999 **
+<sys-block/whdd-3 ~amd64
 <sys-devel/binutils-config-6 ~amd64
-sys-devel/crossdev ~amd64
 <sys-devel/gcc-4.10 ~amd64
-<sys-devel/gdb-7.11 ~amd64
-sys-firmware/amd-ucode ~amd64
-sys-firmware/ipxe ~amd64
-~sys-firmware/seabios-1.7.5 ~amd64
-sys-kernel/dracut ~amd64
 <sys-kernel/genkernel-3.5 ~amd64
-sys-kernel/hardened-sources ~amd64
-sys-kernel/linux-firmware ~amd64
-sys-kernel/linux-headers ~amd64
+<sys-kernel/hardened-sources-4.2 ~amd64
+<sys-kernel/linux-headers-5 ~amd64
 <sys-libs/binutils-libs-3 ~amd64
-<sys-libs/tdb-1.4 ~amd64
-sys-libs/timezone-data ~amd64
-sys-power/powertop ~amd64
+<sys-libs/timezone-data-2017 ~amd64
+<sys-power/powertop-2.9 ~amd64
 <sys-process/procps-3.4 ~amd64
-sys-fs/mtpfs ~amd64
-virtual/perl-Module-Load ~amd64
-virtual/pyparsing ~amd64
-=www-apps/horizon-2014.1.9999 **
-www-apps/novnc ~amd64
-www-apps/tt-rss ~amd64
-www-misc/zoneminder ~amd64
-www-servers/lighttpd ~amd64
-www-servers/thin ~amd64
-x11-libs/cairo ~amd64
+<www-apps/tt-rss-20170101 ~amd64
+<www-servers/lighttpd-1.5 ~amd64
+<x11-libs/cairo-1.15 ~amd64