diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
index d2713450..8f4c01f8 100644
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
+++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="sys-apps/dbus
 	=dev-tqt/tqtinterface-${PV}"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	cmake-utils_src_configure
diff --git a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
index 5e11125d..a371711b 100644
--- a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
+++ b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="sys-apps/dbus
 	=dev-tqt/tqtinterface-${PV}"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	cmake-utils_src_configure
diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild
index 82174e08..2dd27b16 100644
--- a/dev-tqt/tqt/tqt-9999.ebuild
+++ b/dev-tqt/tqt/tqt-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit eutils git-r3 toolchain-funcs
 
diff --git a/media-libs/jasper/jasper-2.0.16.ebuild b/media-libs/jasper/jasper-2.0.16.ebuild
index e38d99a4..977379c6 100644
--- a/media-libs/jasper/jasper-2.0.16.ebuild
+++ b/media-libs/jasper/jasper-2.0.16.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit cmake-multilib
 
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index e38d99a4..977379c6 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit cmake-multilib
 
diff --git a/media-libs/lcms/lcms-1.19-r1.ebuild b/media-libs/lcms/lcms-1.19-r1.ebuild
index df23b949..2446b575 100644
--- a/media-libs/lcms/lcms-1.19-r1.ebuild
+++ b/media-libs/lcms/lcms-1.19-r1.ebuild
@@ -1,4 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r2.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r2.ebuild
index adad2d74..88f09f2f 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r2.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r2.ebuild
@@ -1,4 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,9 +14,7 @@ HOMEPAGE="http://www.levien.com/libart"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
 # The provided tests are interactive only
diff --git a/trinity-apps/amarok/amarok-9999.ebuild b/trinity-apps/amarok/amarok-9999.ebuild
index 11afdb06..bf1d7c50 100644
--- a/trinity-apps/amarok/amarok-9999.ebuild
+++ b/trinity-apps/amarok/amarok-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_TYPE="applications"
 
@@ -19,7 +20,7 @@ DESCRIPTION="Advanced music player for TDE."
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
 
diff --git a/trinity-apps/filelight/filelight-9999.ebuild b/trinity-apps/filelight/filelight-9999.ebuild
index 850aeec1..627f4b27 100644
--- a/trinity-apps/filelight/filelight-9999.ebuild
+++ b/trinity-apps/filelight/filelight-9999.ebuild
@@ -16,6 +16,6 @@ DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/kaffeine/kaffeine-9999.ebuild b/trinity-apps/kaffeine/kaffeine-9999.ebuild
index bf8c1b48..828ba1d9 100644
--- a/trinity-apps/kaffeine/kaffeine-9999.ebuild
+++ b/trinity-apps/kaffeine/kaffeine-9999.ebuild
@@ -18,8 +18,6 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 
 need-trinity
 
-offer-hiddenvisibility yes
-
 SLOT="${TRINITY_VER}"
 
 IUSE+=" dvb dpms gstreamer xinerama vorbis encode xcb"
diff --git a/trinity-apps/kcpuload/kcpuload-9999.ebuild b/trinity-apps/kcpuload/kcpuload-9999.ebuild
index c3cbec94..08dab05f 100644
--- a/trinity-apps/kcpuload/kcpuload-9999.ebuild
+++ b/trinity-apps/kcpuload/kcpuload-9999.ebuild
@@ -13,6 +13,6 @@ DESCRIPTION="A small CPU meter for Kicker"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/keep/keep-9999.ebuild b/trinity-apps/keep/keep-9999.ebuild
index e94fb0d5..39d8e8f6 100644
--- a/trinity-apps/keep/keep-9999.ebuild
+++ b/trinity-apps/keep/keep-9999.ebuild
@@ -19,7 +19,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 RDEPEND="=trinity-base/kcontrol-${PV}
 	app-backup/rdiff-backup"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
 
diff --git a/trinity-apps/kima/kima-9999.ebuild b/trinity-apps/kima/kima-9999.ebuild
index fff6bf15..aebd7f2d 100644
--- a/trinity-apps/kima/kima-9999.ebuild
+++ b/trinity-apps/kima/kima-9999.ebuild
@@ -15,12 +15,12 @@ DESCRIPTION="A Kicker monitoring applet"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
 
 # NVControl support needs the nvidia-settings package,
-# which isn't in the portage tree anymore. So if there
+# which isn't in the Portage tree anymore. So if there
 # is interest, it could be imported to the overlay maybe.
 
 src_configure() {
diff --git a/trinity-apps/knetload/knetload-9999.ebuild b/trinity-apps/knetload/knetload-9999.ebuild
index f1a6e989..93244cdb 100644
--- a/trinity-apps/knetload/knetload-9999.ebuild
+++ b/trinity-apps/knetload/knetload-9999.ebuild
@@ -17,6 +17,6 @@ DESCRIPTION="A network meter for Kicker"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/knutclient/knutclient-9999.ebuild b/trinity-apps/knutclient/knutclient-9999.ebuild
index 4df5627a..5d814ea7 100644
--- a/trinity-apps/knutclient/knutclient-9999.ebuild
+++ b/trinity-apps/knutclient/knutclient-9999.ebuild
@@ -15,6 +15,6 @@ DESCRIPTION="A TDE GUI client for UPS system NUT"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/konversation/konversation-9999.ebuild b/trinity-apps/konversation/konversation-9999.ebuild
index 840814a9..9c94d144 100644
--- a/trinity-apps/konversation/konversation-9999.ebuild
+++ b/trinity-apps/konversation/konversation-9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A user friendly IRC Client for Trinity"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
 IUSE="xscreensaver"
diff --git a/trinity-apps/kplayer/kplayer-9999.ebuild b/trinity-apps/kplayer/kplayer-9999.ebuild
index e5462140..0bf3e712 100644
--- a/trinity-apps/kplayer/kplayer-9999.ebuild
+++ b/trinity-apps/kplayer/kplayer-9999.ebuild
@@ -22,6 +22,6 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 DEPEND="media-video/mplayer"
 RDEPEND="${DEPEND}"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/krename/krename-9999.ebuild b/trinity-apps/krename/krename-9999.ebuild
index 096e86f4..2625d2d8 100644
--- a/trinity-apps/krename/krename-9999.ebuild
+++ b/trinity-apps/krename/krename-9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A powerful batch file renamer for TDE"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
 
diff --git a/trinity-apps/ksensors/ksensors-9999.ebuild b/trinity-apps/ksensors/ksensors-9999.ebuild
index 28cd3a39..7ff04e22 100644
--- a/trinity-apps/ksensors/ksensors-9999.ebuild
+++ b/trinity-apps/ksensors/ksensors-9999.ebuild
@@ -18,6 +18,6 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 DEPEND="sys-apps/lm-sensors"
 RDEPEND="${DEPEND}"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/kshutdown/kshutdown-9999.ebuild b/trinity-apps/kshutdown/kshutdown-9999.ebuild
index a8f0ceeb..73e1f479 100644
--- a/trinity-apps/kshutdown/kshutdown-9999.ebuild
+++ b/trinity-apps/kshutdown/kshutdown-9999.ebuild
@@ -18,10 +18,6 @@ DESCRIPTION="A graphical shutdown utility for TDE"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
-
-SLOT="${TRINITY_VER}"
-
 IUSE="extras"
 
 RDEPEND="
@@ -29,6 +25,10 @@ RDEPEND="
 	=trinity-base/kcontrol-${PV}
 	=trinity-base/kdialog-${PV}"
 
+need-trinity
+
+SLOT="${TRINITY_VER}"
+
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_EXTRAS="$(usex extras)"
diff --git a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
index 12051f97..9af6b6e7 100644
--- a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
+++ b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
@@ -21,6 +21,6 @@ DEPEND="x11-libs/libXScrnSaver
 	=dev-libs/dbus-1-tqt-${PV}"
 RDEPEND="${DEPEND}"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/yakuake/yakuake-9999.ebuild b/trinity-apps/yakuake/yakuake-9999.ebuild
index ebe39f1a..49c90e40 100644
--- a/trinity-apps/yakuake/yakuake-9999.ebuild
+++ b/trinity-apps/yakuake/yakuake-9999.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A Quake-style terminal emulator for TDE"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.1.0
+need-trinity
 
 SLOT="${TRINITY_VER}"
 
diff --git a/www-misc/hldig/hldig-1.0.2.ebuild b/www-misc/hldig/hldig-1.0.2.ebuild
index c4bdb70c..065c4442 100644
--- a/www-misc/hldig/hldig-1.0.2.ebuild
+++ b/www-misc/hldig/hldig-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit autotools