diff --git a/app-accessibility/screenkey/screenkey-0.2.ebuild b/app-accessibility/screenkey/screenkey-0.2.ebuild
index 64c5df6..7bfde55 100644
--- a/app-accessibility/screenkey/screenkey-0.2.ebuild
+++ b/app-accessibility/screenkey/screenkey-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/screenkey/0.2/0.2.0/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="dev-python/pygtk:2
diff --git a/app-accessibility/screenkey/screenkey-1.3.ebuild b/app-accessibility/screenkey/screenkey-1.3.ebuild
index 686f292..820fe3a 100644
--- a/app-accessibility/screenkey/screenkey-1.3.ebuild
+++ b/app-accessibility/screenkey/screenkey-1.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}"/"${PN}"-v"${PV}"
 fi
 
diff --git a/app-arch/unlzx/unlzx-1.1-r10.ebuild b/app-arch/unlzx/unlzx-1.1-r10.ebuild
index b449754..d33d246 100644
--- a/app-arch/unlzx/unlzx-1.1-r10.ebuild
+++ b/app-arch/unlzx/unlzx-1.1-r10.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://aminet.net/package/misc/unix/unlzx.c"
 SLOT="0"
 LICENSE="freedist"
 IUSE=""
-KEYWORDS="alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_unpack() {
 	mkdir "${S}"
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild
index 27993ea..3eddafe 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r99.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild
index b6d6182..600e540 100644
--- a/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="!<app-eselect/eselect-emacs-1.18
 	>=app-admin/eselect-1.2.3"
diff --git a/app-office/osmo/osmo-0.4.4.ebuild b/app-office/osmo/osmo-0.4.4.ebuild
index 920e6b5..f49f017 100644
--- a/app-office/osmo/osmo-0.4.4.ebuild
+++ b/app-office/osmo/osmo-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-pim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/dev-lang/KickAssembler/KickAssembler-9999.ebuild b/dev-lang/KickAssembler/KickAssembler-9999.ebuild
index 7e4dbf5..3a350d5 100644
--- a/dev-lang/KickAssembler/KickAssembler-9999.ebuild
+++ b/dev-lang/KickAssembler/KickAssembler-9999.ebuild
@@ -8,7 +8,7 @@ inherit java-pkg-2
 DESCRIPTION="Cross assembler for 6510 code"
 HOMEPAGE="http://www.theweb.dk/KickAssembler/Main.php"
 SRC_URI="http://www.theweb.dk/KickAssembler/${PN}.zip"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 LICENSE=""
 SLOT="0"
diff --git a/dev-util/apktool/apktool-2.5.0.ebuild b/dev-util/apktool/apktool-2.5.0.ebuild
index e717a6f..98b8d9b 100644
--- a/dev-util/apktool/apktool-2.5.0.ebuild
+++ b/dev-util/apktool/apktool-2.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/iBotPeaches/Apktool/releases/download/v${PV}/apktool
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/jsl/jsl-0.3.0.ebuild b/dev-util/jsl/jsl-0.3.0.ebuild
index 010a7be..8cb4195 100644
--- a/dev-util/jsl/jsl-0.3.0.ebuild
+++ b/dev-util/jsl/jsl-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://javascriptlint.com/download/${P}-src.tar.gz"
 LICENSE="GPL"
 
 IUSE=""
-KEYWORDS="x86 amd64"
+KEYWORDS="~x86 ~amd64"
 SLOT="0"
 
 DEPEND=""
diff --git a/dev-util/universal-ctags/universal-ctags-9999.ebuild b/dev-util/universal-ctags/universal-ctags-9999.ebuild
index 0e78c2e..b78ae4b 100644
--- a/dev-util/universal-ctags/universal-ctags-9999.ebuild
+++ b/dev-util/universal-ctags/universal-ctags-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-eselect/eselect-ctags"
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r10.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r10.ebuild
index 581fc69..9029f1d 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r10.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r10.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="-slashed-zero"
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-gfx/recoil/recoil-4.3.0.ebuild b/media-gfx/recoil/recoil-4.3.0.ebuild
index d3004ed..1327545 100644
--- a/media-gfx/recoil/recoil-4.3.0.ebuild
+++ b/media-gfx/recoil/recoil-4.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils
 
-DESCRIPTION="Viewer of pictures in native formats of vintage computers (Amiga, Atari, C64 and so on)"
+DESCRIPTION="Viewer of pictures in native formats of vintage computers (Amiga, Atari, C64)"
 HOMEPAGE="http://recoil.sf.net"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/media-gfx/svg2pdf/svg2pdf-0.1.3.ebuild b/media-gfx/svg2pdf/svg2pdf-0.1.3.ebuild
index ef38582..cd3a1ed 100644
--- a/media-gfx/svg2pdf/svg2pdf-0.1.3.ebuild
+++ b/media-gfx/svg2pdf/svg2pdf-0.1.3.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
 
 LICENSE="LGPL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 
 DEPEND="media-fonts/corefonts \
 x11-libs/cairo
diff --git a/media-gfx/svg2png/svg2png-0.1.3.ebuild b/media-gfx/svg2png/svg2png-0.1.3.ebuild
index 82141c4..281c1f1 100644
--- a/media-gfx/svg2png/svg2png-0.1.3.ebuild
+++ b/media-gfx/svg2png/svg2png-0.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
 
 LICENSE="LGPL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 
 DEPEND="media-fonts/corefonts \
 x11-libs/cairo
diff --git a/media-sound/easytag/easytag-2.1.8.ebuild b/media-sound/easytag/easytag-2.1.8.ebuild
index e4a2b4c..707ddf0 100644
--- a/media-sound/easytag/easytag-2.1.8.ebuild
+++ b/media-sound/easytag/easytag-2.1.8.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://projects.gnome.org/easytag/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
 IUSE="flac mp3 mp4 nls speex vorbis wavpack"
 
 RDEPEND=">=x11-libs/gtk+-2.24:2
diff --git a/net-misc/wicd/wicd-1.7.4-r3.ebuild b/net-misc/wicd/wicd-1.7.4-r3.ebuild
index 02aec4d..e23c2b7 100644
--- a/net-misc/wicd/wicd-1.7.4-r3.ebuild
+++ b/net-misc/wicd/wicd-1.7.4-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
 
 DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
diff --git a/net-misc/wicd/wicd-9999.ebuild b/net-misc/wicd/wicd-9999.ebuild
index 55598a0..3ab3e7a 100644
--- a/net-misc/wicd/wicd-9999.ebuild
+++ b/net-misc/wicd/wicd-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="ncurses?,xml"
+PYTHON_REQ_USE="ncurses,xml"
 
 inherit eutils distutils-r1 linux-info readme.gentoo-r1 systemd git-r3
 
@@ -12,12 +12,13 @@ DESCRIPTION="A lightweight wired and wireless network manager for Linux"
 HOMEPAGE="https://launchpad.net/wicd"
 #EGIT_REPO_URI='https://git.launchpad.net/wicd'
 #EGIT_COMMIT='63812468bec3ee94c2dd6c8268f9e7b341273be5'
-EGIT_REPO_URI='https://github.com/gryf/wicd'
+#EGIT_REPO_URI='https://github.com/gryf/wicd'
+EGIT_REPO_URI='file:///home/gryf/Devel/Python/wicd'
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="doc libnotify ncurses nls +pm-utils"
+IUSE="doc nls +pm-utils"
 
 DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
 RDEPEND="${PYTHON_DEPS}
@@ -33,11 +34,8 @@ RDEPEND="${PYTHON_DEPS}
 		sys-apps/net-tools
 		sys-apps/ethtool
 	)
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	ncurses? (
-		dev-python/urwid[${PYTHON_USEDEP}]
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-	)
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	pm-utils? ( sys-power/pm-utils )
 	"
 
@@ -69,8 +67,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	use libnotify || myconf="${myconf} --no-use-notifications"
-	use ncurses || myconf="${myconf} --no-install-ncurses"
 	use pm-utils || myconf="${myconf} --no-install-pmutils"
 	python_setup
 	"${EPYTHON}" ./setup.py configure --no-install-docs \
@@ -85,7 +81,7 @@ src_install() {
 	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
 	keepdir /var/log/wicd
 	use nls || rm -rv "${D}"/usr/share/locale
-	systemd_dounit "${S}/other/wicd.service"
+	systemd_dounit "${S}/data/systemd/wicd.service"
 
 	readme.gentoo_create_doc
 }
diff --git a/sys-power/wmcpufreq/wmcpufreq-3.0-r10.ebuild b/sys-power/wmcpufreq/wmcpufreq-3.0-r10.ebuild
index a933cf1..38456a5 100644
--- a/sys-power/wmcpufreq/wmcpufreq-3.0-r10.ebuild
+++ b/sys-power/wmcpufreq/wmcpufreq-3.0-r10.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="wmcpufreq displays frequency, used driver and active governor"
 HOMEPAGE="http://dockapps.org/file.php/id/309"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 SRC_URI="http://dockapps.windowmaker.org/download.php/id/862/wmcpufreq-3.0.tar.gz"
 DEPEND="virtual/libc
diff --git a/x11-misc/ldtp/ldtp-1.3.0.ebuild b/x11-misc/ldtp/ldtp-1.3.0.ebuild
index 7daa6d7..14488c4 100644
--- a/x11-misc/ldtp/ldtp-1.3.0.ebuild
+++ b/x11-misc/ldtp/ldtp-1.3.0.ebuild
@@ -13,10 +13,10 @@ SRC_URI="http://download.freedesktop.org/${PN}/1.x/1.3.x/${P}.tar.gz"
 
 LICENSE="LGPL"
 SLOT="0"
-KEYWORDS="ia64 x86"
+KEYWORDS="~ia64 ~x86"
 IUSE="localization goptionparse newroles"
-DEPEND="gnome-extra/at-spi 
-	    >=dev-libs/glib-2.2.0 
+DEPEND="gnome-extra/at-spi
+	    >=dev-libs/glib-2.2.0
 		gnome-extra/libgail-gnome
 		gnome-base/gail
 		dev-lang/python
diff --git a/x11-plugins/wmpower/wmpower-0.4.2-r10.ebuild b/x11-plugins/wmpower/wmpower-0.4.2-r10.ebuild
index b001f8d..8bd0626 100644
--- a/x11-plugins/wmpower/wmpower-0.4.2-r10.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.2-r10.ebuild
@@ -7,13 +7,14 @@ IUSE=""
 
 inherit eutils
 
-DESCRIPTION="WMaker DockApp to get (and set) power management status for laptops. Supports APM and ACPI kernels. Supports CPUfreq. Also has special support for Toshiba, Dell and Compal hardware."
+DESCRIPTION="a dockapp to get/set power management status for laptops (APM, ACPI
+and CPUfreq)"
 HOMEPAGE="http://wmpower.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="|| ( (
 		x11-libs/libX11
diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r10.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r10.ebuild
index c845d87..7c5d46a 100644
--- a/x11-plugins/wmpower/wmpower-0.4.3-r10.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3-r10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11