diff --git a/package.keywords/all b/package.keywords/all
index df1ee31..f5c746b 100644
--- a/package.keywords/all
+++ b/package.keywords/all
@@ -9,13 +9,13 @@ app-crypt/tpm-emulator ~x86 ~amd64
 app-emulation/vagrant ~x86 ~amd64
 =app-emulation/xen-4.9.1-r1 ~x86 ~amd64
 =app-emulation/xen-tools-4.9.1-r1 ~x86 ~amd64
-=app-metrics/prometheus-2.2.1 ~amd64
-=app-metrics/alertmanager-0.14.0-r1 ~amd64
+=app-metrics/prometheus-2.3.1 ~amd64
+=app-metrics/alertmanager-0.15.0 ~amd64
 =app-metrics/blackbox_exporter-0.12.0 ~amd64
 =app-metrics/mysqld_exporter-0.10.0-r1 ~amd64
-=app-metrics/node_exporter-0.15.2 ~amd64
-=app-metrics/snmp_exporter-0.9.0 ~amd64
-<app-misc/elasticsearch-5.7 ~x86 ~amd64
+=app-metrics/node_exporter-0.16.0 ~amd64
+=app-metrics/snmp_exporter-0.11.0 ~amd64
+<app-misc/elasticsearch-6 ~x86 ~amd64
 =app-misc/jail-2.0-r1 ~x86 ~amd64
 <=app-shells/ksh-93.20140625 ~x86 ~amd64
 app-text/FoxitReader ~x86 ~amd64
@@ -68,6 +68,7 @@ dev-ruby/log4r ~x86 ~amd64
 dev-ruby/webmock ~x86 ~amd64
 dev-util/gazpacho ~x86 ~amd64
 =dev-util/intltool-0.51.0-r2 ~x86 ~amd64
+dev-util/peg ~x86 ~amd64
 media-gfx/darktable ~x86 ~amd64
 media-gfx/ipe ~x86 ~amd64
 media-gfx/opencsg ~x86 ~amd64
@@ -89,8 +90,6 @@ media-sound/wavplay ~x86 ~amd64
 net-analyzer/ntopng ~x86 ~amd64
 =net-analyzer/ttcp-1.12-r2 ~x86 ~amd64
 net-analyzer/zabbix ~x86 ~amd64
-<net-fs/cifs-utils-6.6 ~x86 ~amd64
-=net-fs/samba-4.5.15 ~x86 ~amd64
 net-im/skype ~x86 ~amd64
 net-libs/nDPI ~x86 ~amd64
 =net-mail/dovecot-2.2.36 ~x86 ~amd64
@@ -103,16 +102,14 @@ net-wireless/broadcom-sta ~x86 ~amd64
 sci-mathematics/cgal ~x86 ~amd64
 sys-apps/pcsc-tools ~x86 ~amd64
 sys-block/hpacucli ~x86 ~amd64
-<sys-devel/gcc-8 ~x86 ~amd64
 sys-cluster/corosync ~x86 ~amd64
 sys-kernel/linux-firmware ~x86 ~amd64
 sys-libs/libudev-compat ~*
 www-apps/grafana-bin ~amd64
 www-apps/icingaweb2-module-director ~amd64
-<www-apps/kibana-bin-5.7 ~x86 ~amd64
+<www-apps/kibana-bin-6 ~x86 ~amd64
 www-client/google-chrome ~amd64
-=x11-apps/intel-gpu-tools-1.15 ~x86 ~amd64
-=x11-drivers/xf86-video-intel-2.99.917_p20171018  ~x86 ~amd64
+x11-apps/intel-gpu-tools ~x86 ~amd64
 =x11-misc/shared-mime-info-1.9 ~x86 ~amd64
 =x11-themes/hicolor-icon-theme-0.17 ~x86 ~amd64
 x11-wm/xpra ~x86 ~amd64