diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 3592dac..c07a13e 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,4 +1,3 @@
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-7777.ebuild 2986 BLAKE2B 0d582374f9b4c4749e6d2090984d1958f2d6fec36aae03be5b76458e41ce483eafc5ab6f85fec1efc6ed498b46780fe2c7b73f265f9a9b21f642e5e83d694679 SHA512 9f56b9aa6374ec6ff46fcb931d3e3df1760c67b666c648e926c89f8a0c977b46b15df34347f78921610d5028cd12d30839a5bdc672154fbc9f0d3ed0a96c6a33
-EBUILD windowmaker-8888.ebuild 3023 BLAKE2B bbfb349735514e793e1fffa11c1a910be672e7c3c931d7921716417eaab92b35ea212e921c2b378d1c167b8b6e9f92ead716069ab7cbdfaa7d86f2d979e282f0 SHA512 4dea136cbe9ec78c598e5b0d76a866884257d5a2ed2d4918fc52038f88476ef7f7ea8bd42428b3c92def71a9b23746ea73f0c1fbe9e0e24a250ae7c8ea980c6a
+EBUILD windowmaker-8888.ebuild 3065 BLAKE2B df0936858c58a540712ad0f7dba17e6538c26da2b1be1f51093a02ecc36ce87a40acd21bdb24656d93a3d017cd63723181ad17019b6db0cd5a2ba1e5e60a878b SHA512 aa01bae520dd9c3c7f425712f4862e0571cd57d3193d74bbf187c52d03992dddda8629a708056d183d605862920de977d7aafcffe6c710812d913cad512523bf
diff --git a/x11-wm/windowmaker/windowmaker-7777.ebuild b/x11-wm/windowmaker/windowmaker-7777.ebuild
deleted file mode 100644
index f3ec437..0000000
--- a/x11-wm/windowmaker/windowmaker-7777.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils git-r3
-
-DESCRIPTION="The fast and light GNUstep window manager - gryf's personal ebuild"
-HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-EGIT_REPO_URI="https://github.com/gryf/wmaker"
-EGIT_BRANCH="mynext"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( >=media-gfx/imagemagick-7:0= )
-	jpeg? ( virtual/jpeg:0= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	webp? ( media-libs/libwebp )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-src_unpack() {
-	# wm-extras
-	unpack ${A}
-
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	local git_revision=$(git log --pretty=format:'%h' -n 1)
-	sed -i -e "s/\(AC_INIT(\[WindowMaker\],\[[^]]*\)\]/\1, rev.${git_revision}\]/" configure.ac || die
-
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-debug \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	pushd ../WindowMaker-extra-0.1 || die
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	pushd ../WindowMaker-extra-0.1 || die
-	emake
-}
-
-src_install() {
-	default
-
-	# WindowMaker Extra
-	pushd ../WindowMaker-extra-0.1 || die
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-8888.ebuild b/x11-wm/windowmaker/windowmaker-8888.ebuild
index 678ddf1..e4f3ba1 100644
--- a/x11-wm/windowmaker/windowmaker-8888.ebuild
+++ b/x11-wm/windowmaker/windowmaker-8888.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools eutils git-r3
+EAPI=8
+inherit autotools git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager - gryf's personal ebuild"
 HOMEPAGE="http://www.windowmaker.org/"
@@ -25,13 +25,13 @@ DEPEND="media-libs/fontconfig
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	imagemagick? ( >=media-gfx/imagemagick-7:0= )
 	jpeg? ( virtual/jpeg:0= )
+	nls? ( >=sys-devel/gettext-0.10.39 )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
 	webp? ( media-libs/libwebp )
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	# wm-extras
@@ -50,8 +50,8 @@ src_prepare() {
 			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
 			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
 			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
+		fi
+	done
 
 	default
 	eautoreconf
@@ -112,4 +112,6 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/wmaker.desktop
 	make_desktop_entry /usr/bin/wmaker
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }