diff --git a/classes/kde.bbclass b/classes/kde-base.bbclass
similarity index 97%
rename from classes/kde.bbclass
rename to classes/kde-base.bbclass
index 71c75035..521fc8c3 100644
--- a/classes/kde.bbclass
+++ b/classes/kde-base.bbclass
@@ -1,9 +1,10 @@
+DEPENDS += "qtbase extra-cmake-modules-native"
+
 KDE_BRANCH ?= "master"
 
+# default git
 SRC_URI = "git://anongit.kde.org/${BPN};protocol=git;branch=${KDE_BRANCH}"
 
-DEPENDS += "qtbase extra-cmake-modules-native"
-
 # extra-cmake-modules cause dependent to check for python
 inherit cmake_qt5 pythonnative
 
diff --git a/classes/kde-kf5.bbclass b/classes/kde-kf5.bbclass
new file mode 100644
index 00000000..329cffe0
--- /dev/null
+++ b/classes/kde-kf5.bbclass
@@ -0,0 +1,3 @@
+inherit kde-base
+
+KF5_VERSION ??= "5.7.0"
diff --git a/classes/kde-plasma.bbclass b/classes/kde-plasma.bbclass
new file mode 100644
index 00000000..46d35537
--- /dev/null
+++ b/classes/kde-plasma.bbclass
@@ -0,0 +1,5 @@
+inherit kde-base
+
+PLASMA_VERSION ??= "5.2.0"
+
+SRC_URI = "http://download.kde.org/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
diff --git a/recipes-kde/kf5/kf5-version.inc b/recipes-kde/kf5/kf5-version.inc
deleted file mode 100644
index 2139b01b..00000000
--- a/recipes-kde/kf5/kf5-version.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# central KF5 version
-PV = "5.7.0"
diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
index de4b6192..b7e40da7 100644
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
+++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde perlnative
+inherit kde-kf5 perlnative
 
+PV = "${KF5_VERSION}"
 SRCREV = "12cf97b33e96dc45de0486d3dd5501c99a768a54"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch
similarity index 100%
rename from recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch
rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch
similarity index 100%
rename from recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch
rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-fix-build-for-QT_NO_SESSIONMANAGER.patch
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch
similarity index 100%
rename from recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch
rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support-native.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb
similarity index 100%
rename from recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support-native.bb
rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
similarity index 100%
rename from recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.bb
rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.inc b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
similarity index 91%
rename from recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.inc
rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
index f2773371..8efdeb3e 100644
--- a/recipes-kde/kf5/poritng-aids-tier3/kdelibs4support/kdelibs4support.inc
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5
 
-inherit kde
+PV = "${KF5_VERSION}"
+SRCREV = "b796420399d81b96ce9d1a9ae8712018b2f67171"
+S = "${WORKDIR}/git"
 
 SRC_URI += " \
 	file://0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch \
 	file://0002-fix-build-for-QT_NO_SESSIONMANAGER.patch \
 "
-SRCREV = "b796420399d81b96ce9d1a9ae8712018b2f67171"
-S = "${WORKDIR}/git"
diff --git a/recipes-kde/kf5/poritng-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
similarity index 93%
rename from recipes-kde/kf5/poritng-aids-tier3/kjsembed/kjsembed.bb
rename to recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
index d528c526..aff08a9f 100644
--- a/recipes-kde/kf5/poritng-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -4,15 +4,14 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
-
-SRCREV = "72645d0ca8942b2550377567fe861183de8ab038"
-S = "${WORKDIR}/git"
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "qtsvg qttools kjs ki18n kdoctools"
 
+PV = "${KF5_VERSION}"
+SRCREV = "72645d0ca8942b2550377567fe861183de8ab038"
+S = "${WORKDIR}/git"
+
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5JsEmbed, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/poritng-aids-tier3/krunner/krunner.bb b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
similarity index 92%
rename from recipes-kde/kf5/poritng-aids-tier3/krunner/krunner.bb
rename to recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
index 8d35ce57..2aaf8a04 100644
--- a/recipes-kde/kf5/poritng-aids-tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
@@ -3,15 +3,15 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = " \
 	file://src/abstractrunner.h;endline=18;md5=a6a49d7635ef149bcddf8c46f0eae999 \
 "
-require ../../kf5-version.inc
 
-inherit kde cmake-lib
-
-SRCREV = "f79f3177cc5ea057e128be791c3cbe198f18038f"
-S = "${WORKDIR}/git"
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "qtdeclarative kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver"
 
+PV = "${KF5_VERSION}"
+SRCREV = "f79f3177cc5ea057e128be791c3cbe198f18038f"
+S = "${WORKDIR}/git"
+
 CMAKE_HIDE_ERROR[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/attica/attica.bb b/recipes-kde/kf5/tier1/attica/attica.bb
index 08bba98a..99a41df8 100644
--- a/recipes-kde/kf5/tier1/attica/attica.bb
+++ b/recipes-kde/kf5/tier1/attica/attica.bb
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING;md5=be254b9345b1c2ff33e1a6a96768f2fb \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "4b5fa02f4b634961960aa9672aafef3369129a41"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/karchive/karchive.inc b/recipes-kde/kf5/tier1/karchive/karchive.inc
index 108a707f..19af6fd6 100644
--- a/recipes-kde/kf5/tier1/karchive/karchive.inc
+++ b/recipes-kde/kf5/tier1/karchive/karchive.inc
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde
+inherit kde-kf5
 
 DEPENDS += "bzip2 xz zlib"
 
+PV = "${KF5_VERSION}"
 SRCREV = "05dd0f7fac116d905e37e01807b7d20489ceb1ca"
 S = "${WORKDIR}/git"
diff --git a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
index f3fa9437..4664bd52 100644
--- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
+++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
@@ -5,13 +5,14 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5 cmake-lib
 
-inherit kde cmake-lib
+PV = "${KF5_VERSION}"
+SRCREV = "bfb64b089a5003281576fadaa5530a65f82e35f2"
+S = "${WORKDIR}/git"
 
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5Codecs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5Codecs, -S${includedir}, -S${STAGING_INCDIR}"
 
-SRCREV = "bfb64b089a5003281576fadaa5530a65f82e35f2"
-S = "${WORKDIR}/git"
+
diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.inc b/recipes-kde/kf5/tier1/kconfig/kconfig.inc
index d1443184..5b2564e9 100644
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc
@@ -4,15 +4,15 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5
 
-inherit kde
+PV = "${KF5_VERSION}"
+SRCREV = "fef653b071c97cc22117a215cc858be963a479ed"
+S = "${WORKDIR}/git"
 
 # REVISIT remove ugly hack for wayland-only environments
 SRC_URI += " \
 	file://0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch \
 "
-SRCREV = "fef653b071c97cc22117a215cc858be963a479ed"
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
index c1e6ff66..3e80b971 100644
--- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
+++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc
@@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde
+inherit kde-kf5
 
+PV = "${KF5_VERSION}"
 SRCREV = "e8cf6542fdbe137bbff40a22bfc50f810daa38fd"
 S = "${WORKDIR}/git"
diff --git a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
index d224ddf0..78af0679 100644
--- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
+++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "e939e5136711df31ace7ff627f3a0e58c60f3588"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
index 40ea3553..71833238 100644
--- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
+++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "avahi"
 
+PV = "${KF5_VERSION}"
 SRCREV = "980e5035baf769894da000d8db8867e47224dbec"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
index 52fdee8f..a863251b 100644
--- a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
+++ b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "d7f3fdcb23c64b81f1ca86c64884988d760c3c36"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/ki18n/ki18n.inc b/recipes-kde/kf5/tier1/ki18n/ki18n.inc
index 747ddcc2..7dfa5379 100644
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.inc
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.inc
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde
+inherit kde-kf5
 
+PV = "${KF5_VERSION}"
 SRCREV = "1a5df65f06d5f51da1d6e1f06229ebd95b3161d9"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kidletime/kidletime.bb b/recipes-kde/kf5/tier1/kidletime/kidletime.bb
index 6b27d48e..a67712ad 100644
--- a/recipes-kde/kf5/tier1/kidletime/kidletime.bb
+++ b/recipes-kde/kf5/tier1/kidletime/kidletime.bb
@@ -5,18 +5,16 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5 cmake-lib
 
-inherit kde cmake-lib
+DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras", "", d)}"
 
-DEPENDS += " \
-	${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras", "", d)} \
-"
-
-SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch"
+PV = "${KF5_VERSION}"
 SRCREV = "4ba80494b02888a07c5666c4fd6c38252ff5e53a"
 S = "${WORKDIR}/git"
 
+SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch"
+
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5IdleTime, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5IdleTime, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
index 36cd3506..341cfacc 100644
--- a/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
+++ b/recipes-kde/kf5/tier1/kimageformats/kimageformats.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde
+inherit kde-kf5
 
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"
 
+PV = "${KF5_VERSION}"
 SRCREV = "6b72930cb2c8255cd14a8f0924af693b23be37c1"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
index ffecafbb..2987e1a6 100644
--- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
+++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "b20cb5e162702cf6e6d99304bbf1ba6192f29f40"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
index bdbb8c28..8fbb1024 100644
--- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
+++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "241e63e2010b43c0ed5a21a0d411fd80425bd0f6"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kplotting/kplotting.bb b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
index 5d0050c4..ed547a03 100644
--- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb
+++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "124723a60eb6eabbb081255ef13cd71285ff5faa"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
index ec47ecdb..6d5c6dd8 100644
--- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
+++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
+inherit kde-kf5 cmake-lib
+
 DEPENDS += "qttools"
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
-
+PV = "${KF5_VERSION}"
 SRCREV = "f5bbceadda6b80426a889e1554c2f4ee369840e3"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
index a9895d9f..4ba7275a 100644
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -4,15 +4,14 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
-
-SRCREV = "5bfbdc5e46c3dfdcf7fab02f45d835ecb559316c"
-S = "${WORKDIR}/git"
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)}"
 
+PV = "${KF5_VERSION}"
+SRCREV = "5bfbdc5e46c3dfdcf7fab02f45d835ecb559316c"
+S = "${WORKDIR}/git"
+
 CMAKE_HIDE_ERROR[1] = "KF5WindowSystem, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5WindowSystem, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
index a85687b5..41a3fdfe 100644
--- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib pkgconfig
+inherit kde-kf5 cmake-lib pkgconfig
 
 DEPENDS += "networkmanager"
 
+PV = "${KF5_VERSION}"
 SRCREV = "e05ce6e7d5a39b44058ac54f8a399d0afdbffb99"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb
index e3228d46..5bd9726f 100644
--- a/recipes-kde/kf5/tier1/solid/solid.bb
+++ b/recipes-kde/kf5/tier1/solid/solid.bb
@@ -4,15 +4,14 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
-
-SRCREV = "5ec75ac1daf0fc3b016e138590b0429b2ab4934e"
-S = "${WORKDIR}/git"
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "qtdeclarative"
 
+PV = "${KF5_VERSION}"
+SRCREV = "5ec75ac1daf0fc3b016e138590b0429b2ab4934e"
+S = "${WORKDIR}/git"
+
 CMAKE_HIDE_ERROR[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
 CMAKE_HIDE_ERROR[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.inc b/recipes-kde/kf5/tier1/sonnet/sonnet.inc
index dfce80ab..7648fca0 100644
--- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc
@@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde
+inherit kde-kf5
 
+PV = "${KF5_VERSION}"
 SRCREV = "a9fcc63282ddbc6c93a590494cfb57e6164e8364"
 S = "${WORKDIR}/git"
diff --git a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
index 2b235aa2..7c87ff47 100644
--- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
+++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
@@ -4,10 +4,9 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
+PV = "${KF5_VERSION}"
 SRCREV = "ce5590c108edde83557eff70232a3cd195eb2d0b"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier2/kauth/kauth.inc b/recipes-kde/kf5/tier2/kauth/kauth.inc
index 1a01ed6d..ad44b472 100644
--- a/recipes-kde/kf5/tier2/kauth/kauth.inc
+++ b/recipes-kde/kf5/tier2/kauth/kauth.inc
@@ -4,15 +4,15 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5
 
-inherit kde
+PV = "${KF5_VERSION}"
+SRCREV = "9f162d6ef8cc5b5d468b9ba2092684b9b256e089"
+S = "${WORKDIR}/git"
 
 SRC_URI += " \
 	file://0001-Make-autotests-optional.patch \
 	file://0002-align-installation-location-for-helpers.patch \
 "
-SRCREV = "9f162d6ef8cc5b5d468b9ba2092684b9b256e089"
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += "-DAUTOTESTS=OFF"
diff --git a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
index e6105b61..8a696c9f 100644
--- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
+++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kconfig kwidgetsaddons"
 
+PV = "${KF5_VERSION}"
 SRCREV = "339f8072f96373f1946ce99936b8864020d052a7"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
index b5045c75..16a926b7 100644
--- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb
+++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kcoreaddons kwindowsystem"
 
+PV = "${KF5_VERSION}"
 SRCREV = "7ec5be038c40bee9471b07752b5a0036339d7687"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
index f4438b75..e3622331 100644
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc
@@ -5,19 +5,12 @@ LIC_FILES_CHKSUM = " \
 	file://LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5
 
-inherit kde
-
-# allarch recipes can go here
+# allarch recipes
 DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets"
 
-# allarch packages do only install into machine sysroot
-# for xml4
-OECMAKE_EXTRA_ROOT_PATH = "${STAGING_DIR}/${MACHINE}"
-# for xsl (we have to hardcode /usr - ${prefix} is aligned by native.bbclase
-EXTRA_OECMAKE += "-DOE_ROOT_PATH_PREFIX=${STAGING_DIR}/${MACHINE}/usr"
-
+PV = "${KF5_VERSION}"
 SRCREV = "93b844cdcfde640acfb231429c1c685de2c3cc4f"
 S = "${WORKDIR}/git"
 
@@ -26,5 +19,11 @@ SRC_URI += " \
 	file://0002-build-meinproc5-it-works-fine-in-our-environment.patch \
 "
 
+# allarch packages do only install into machine sysroot
+# for xml4
+OECMAKE_EXTRA_ROOT_PATH = "${STAGING_DIR}/${MACHINE}"
+# for xsl (we have to hardcode /usr - ${prefix} is aligned by native.bbclase
+EXTRA_OECMAKE += "-DOE_ROOT_PATH_PREFIX=${STAGING_DIR}/${MACHINE}/usr"
+
 EXTRA_OECMAKE += "-DCMAKE_AR:FILEPATH=${AR}"
 
diff --git a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
index 0d5a2059..bdeaaadf 100644
--- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
+++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kcoreaddons kwidgetsaddons ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"
 
+PV = "${KF5_VERSION}"
 SRCREV = "6103026116c953dff9d9890676fb7f38900e376a"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier2/kpackage/kpackage.bb b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
index 0acafe27..dfeaf245 100644
--- a/recipes-kde/kf5/tier2/kpackage/kpackage.bb
+++ b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "karchive ki18n kcoreaddons kconfig kdoctools"
 
+PV = "${KF5_VERSION}"
 SRCREV = "70110fc5179a16d46ee52963a836418d4dca23fb"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier2/kpty/kpty.bb b/recipes-kde/kf5/tier2/kpty/kpty.bb
index 8e163dde..8747653a 100644
--- a/recipes-kde/kf5/tier2/kpty/kpty.bb
+++ b/recipes-kde/kf5/tier2/kpty/kpty.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kcoreaddons ki18n"
 
+PV = "${KF5_VERSION}"
 SRCREV = "bfe2aef89f88b727a2e5b2d8e9d608a2796bd6f6"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
index 5ba2a3a7..e6a64464 100644
--- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
+++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "ki18n"
 
+PV = "${KF5_VERSION}"
 SRCREV = "276398a036d336542de90b3f4457ebb3066f8364"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
index a72f665b..b420333b 100644
--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -4,14 +4,14 @@ LIC_FILES_CHKSUM = " \
 	file://src/service/common.h;endline=18;md5=c6cc045ed732acc1204af0c74a0418b0 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kxmlgui kio kdbusaddons kdeclarative kcmutils"
 
+PV = "${KF5_VERSION}"
 SRCREV = "26fbf4fab77f3458893715541f3abae5743ad59c"
 S = "${WORKDIR}/git"
+
 SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
 
 # cross libs / headers
diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
index 21abecc0..b0f4d8b9 100644
--- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
+++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui"
 
+PV = "${KF5_VERSION}"
 SRCREV = "5111bfa15d9e7181bdb0155e287942fb448802cf"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
index 0d110751..b87b6b09 100644
--- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
+++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxmlgui"
 
+PV = "${KF5_VERSION}"
 SRCREV = "967cd1d56e91f2a2c9885c9aa9872028b8bf3eea"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
index 852fef4f..b247377d 100644
--- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
+++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kauth kcodecs kdoctools kguiaddons kwidgetsaddons"
 
+PV = "${KF5_VERSION}"
 SRCREV = "1335e3e55ab7f68e59aae9bf5529eeabc9738d27"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
index b86c0309..81779b11 100644
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "qtdeclarative kconfig ki18n kiconthemes kio kwidgetsaddons kwindowsystem kglobalaccel kguiaddons libepoxy"
 
+PV = "${KF5_VERSION}"
 SRCREV = "e86059398d493a320b6f228858ea19c8a168b4ba"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb
index 8fed2b57..0570178a 100644
--- a/recipes-kde/kf5/tier3/kded/kded.bb
+++ b/recipes-kde/kf5/tier3/kded/kded.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons kdoctools kinit kservice"
 
+PV = "${KF5_VERSION}"
 SRCREV = "a72c1fcbf6600c1c84e71c312a586386dcd7ce62"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc
index dc23bd2b..bf02ed90 100644
--- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc
+++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc
@@ -4,18 +4,12 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5
 
-inherit kde
+DEPENDS += "qttools kcoreaddons kconfig kdoctools"
 
+PV = "${KF5_VERSION}"
 SRCREV = "99314346bfba565a19c5f95579edc3b03593a975"
 S = "${WORKDIR}/git"
 
-# required
-DEPENDS += " \
-	qttools \
-	kcoreaddons \
-	kconfig \
-	kdoctools \
-"
 
diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
index 7b1ca6ca..726754cf 100644
--- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb
+++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
@@ -4,9 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
 	kcoreaddons \
@@ -15,6 +13,7 @@ DEPENDS += " \
 	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "d9e904b9d25cb68a413349e5af5a280be7731c52"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
index 1eaa6063..888c10e6 100644
--- a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
+++ b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
@@ -4,21 +4,20 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
-	qtwebkit \
-	kconfig \
-	kcoreaddons \
-	kio \
-	kjobwidgets \
-	kparts \
-	kservice \
-	kwallet \
+    qtwebkit \
+    kconfig \
+    kcoreaddons \
+    kio \
+    kjobwidgets \
+    kparts \
+    kservice \
+    kwallet \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "a4727611d297f7776c4ea67d521ff6e932843e3b"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
index ac07bdb6..81a78b6b 100644
--- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
+++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "karchive kconfig kservice kcoreaddons"
 
+PV = "${KF5_VERSION}"
 SRCREV = "df487b4808daa448692b8d3277f745a952e71945"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
index 7117046e..7e557a44 100644
--- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
+++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
@@ -4,9 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
     kconfig \
@@ -17,10 +15,12 @@ DEPENDS += " \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "
 
-SRC_URI += "file://0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch"
+PV = "${KF5_VERSION}"
 SRCREV = "f9eb427b293c40eec96784e059054bafd431c9bc"
 S = "${WORKDIR}/git"
 
+SRC_URI += "file://0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch"
+
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5GlobalAccel, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5GlobalAccel, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
index 6f23d2f9..03b40d84 100644
--- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
+++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews"
 
+PV = "${KF5_VERSION}"
 SRCREV = "2286886decfec2b1a956b813b4c078c38bc2f43b"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb
index fe886531..712b7f2c 100644
--- a/recipes-kde/kf5/tier3/kinit/kinit.bb
+++ b/recipes-kde/kf5/tier3/kinit/kinit.bb
@@ -4,24 +4,24 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde
+inherit kde-kf5
 
 DEPENDS += " \
-	libcap \
-	kservice \
-	kio \
-	ki18n \
-	kwindowsystem \
-	kcrash \
-	kconfig \
-	kdoctools \
-	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    libcap \
+    kservice \
+    kio \
+    ki18n \
+    kwindowsystem \
+    kcrash \
+    kconfig \
+    kdoctools \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "d96cf2f4ebb63ef63e7b9c43987a2f85429db8f8"
 S = "${WORKDIR}/git"
+
 SRC_URI += "file://0001-return-WAYLAND_DISPLAY-if-all-known-options-fail.patch"
 
 FILES_${PN} += "${datadir}/dbus-1 ${libdir}/libkdeinit5_klauncher.so"
diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb
index dbee01a2..9adb2648 100644
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -4,26 +4,25 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
-	karchive \
-	kcodecs \
-	kconfig \
-	kcoreaddons \
-	kdbusaddons \
-	kdoctools \
-	ki18n \
-	knotifications \
-	kservice \
-	solid \
-	kxmlgui \
-	kwallet \
-	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    karchive \
+    kcodecs \
+    kconfig \
+    kcoreaddons \
+    kdbusaddons \
+    kdoctools \
+    ki18n \
+    knotifications \
+    kservice \
+    solid \
+    kxmlgui \
+    kwallet \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "ec023712125ffc0a8cbb617c93285bdaa21f6381"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
index 21a33949..b1b14d40 100644
--- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
+++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
@@ -4,25 +4,24 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
-	karchive \
-	kcompletion \
-	kconfig \
-	kcoreaddons \
-	ki18n \
-	kiconthemes \
-	kio \
-	kitemviews \
-	ktextwidgets \
-	kwidgetsaddons \
-	kxmlgui \
-	attica \
+    karchive \
+    kcompletion \
+    kconfig \
+    kcoreaddons \
+    ki18n \
+    kiconthemes \
+    kio \
+    kitemviews \
+    ktextwidgets \
+    kwidgetsaddons \
+    kxmlgui \
+    attica \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "1ccdf90d041bd945bfd33e275f4f00b3ea51c4aa"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/knotifications/knotifications.bb b/recipes-kde/kf5/tier3/knotifications/knotifications.bb
index c2f5d70d..63e7cef7 100644
--- a/recipes-kde/kf5/tier3/knotifications/knotifications.bb
+++ b/recipes-kde/kf5/tier3/knotifications/knotifications.bb
@@ -5,13 +5,12 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kwindowsystem kservice kconfig kiconthemes kcodecs kcoreaddons phonon"
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}"
 
+PV = "${KF5_VERSION}"
 SRCREV = "b5c1488beeedac53a23f8464d8ef3cea941ecfe8"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
index fa9b6c5b..441369f1 100644
--- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
+++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
@@ -4,23 +4,22 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
-	phonon \
-	kcompletion \
-	kconfig \
-	ki18n \
-	kio \
-	kservice \
-	kconfigwidgets \
-	knotifications \
-	kwidgetsaddons \
-	kxmlgui \
+    phonon \
+    kcompletion \
+    kconfig \
+    ki18n \
+    kio \
+    kservice \
+    kconfigwidgets \
+    knotifications \
+    kwidgetsaddons \
+    kxmlgui \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "85e224e073a825e3d789408417b16f80a8ddd231"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb
index 88a255d5..696348bc 100644
--- a/recipes-kde/kf5/tier3/kparts/kparts.bb
+++ b/recipes-kde/kf5/tier3/kparts/kparts.bb
@@ -4,24 +4,23 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
-	kconfig \
-	kcoreaddons \
-	ki18n \
-	kiconthemes \
-	kio \
-	kjobwidgets \
-	knotifications \
-	kservice \
-	ktextwidgets \
-	kwidgetsaddons \
-	kxmlgui \
+    kconfig \
+    kcoreaddons \
+    ki18n \
+    kiconthemes \
+    kio \
+    kjobwidgets \
+    knotifications \
+    kservice \
+    ktextwidgets \
+    kwidgetsaddons \
+    kxmlgui \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "e979067f95c4f9c1a841631d52b8cced588f83f0"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb
index d6836d42..8b9b8b60 100644
--- a/recipes-kde/kf5/tier3/kservice/kservice.bb
+++ b/recipes-kde/kf5/tier3/kservice/kservice.bb
@@ -6,15 +6,14 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
-
-SRCREV = "75cb3119ee0a5e0bfe2b4c38a23e346d93dc465e"
-S = "${WORKDIR}/git"
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kconfig kcoreaddons kcrash kdbusaddons ki18n kdoctools"
 
+PV = "${KF5_VERSION}"
+SRCREV = "75cb3119ee0a5e0bfe2b4c38a23e346d93dc465e"
+S = "${WORKDIR}/git"
+
 CMAKE_HIDE_ERROR[1] = "KF5Service, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5Service, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc
index ae973814..91d4dd1d 100644
--- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc
+++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.inc
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde perlnative
+inherit kde-kf5 perlnative
 
 DEPENDS += "karchive kconfig kguiaddons ki18n kio kparts sonnet"
 
+PV = "${KF5_VERSION}"
 SRCREV = "0d0924fb7900505bc9f9fab7767e35bb2b417f30"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
index 536fc63a..39f9db4e 100644
--- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
+++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
@@ -4,12 +4,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet"
 
+PV = "${KF5_VERSION}"
 SRCREV = "c9dfa8d8a289df07f40e83fb54976b6e06364020"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb
index 3aaf4abc..4ef773c9 100644
--- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb
+++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb
@@ -4,9 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
 	libgcrypt \
@@ -24,10 +22,12 @@ DEPENDS += " \
 
 # TBD: add KF5Gpgmepp with PACKAGECONFIG??
 
-SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch"
+PV = "${KF5_VERSION}"
 SRCREV = "5a605f8a6ec979aac537230e82bace01f499abb4"
 S = "${WORKDIR}/git"
 
+SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch"
+
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5Wallet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5Wallet, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
index cf4863cd..e86a4b7e 100644
--- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
+++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
@@ -5,12 +5,22 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
+inherit kde-kf5 cmake-lib
 
-inherit kde cmake-lib
-
-DEPENDS += "kitemviews kconfig kglobalaccel kconfigwidgets ki18n kiconthemes ktextwidgets kwidgetsaddons kwindowsystem attica"
+DEPENDS += " \
+    kitemviews \
+    kconfig \
+    kglobalaccel \
+    kconfigwidgets \
+    ki18n \
+    kiconthemes \
+    ktextwidgets \
+    kwidgetsaddons \
+    kwindowsystem \
+    attica \
+"
 
+PV = "${KF5_VERSION}"
 SRCREV = "41a2bcc80650843aee553a9b47e1ed86fb898268"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
index bdda353c..b0861b80 100644
--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-require ../../kf5-version.inc
-
-inherit kde cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += " \
     qtdeclarative \
@@ -33,6 +31,7 @@ DEPENDS += " \
     virtual/egl \
 "
 
+PV = "${KF5_VERSION}"
 SRCREV = "a39f20cc044c866389618a21fde26e27f8f06dfe"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kde/other/phonon/phonon_4.8.bb b/recipes-kde/other/phonon/phonon_4.8.bb
index 48b983e8..bbff0b21 100644
--- a/recipes-kde/other/phonon/phonon_4.8.bb
+++ b/recipes-kde/other/phonon/phonon_4.8.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde cmake-lib
+inherit kde-base cmake-lib
 
 SRCREV = "e08fdba6b64ad6a09a9dcd6696de4d82f2dd8224"
 S = "${WORKDIR}/git"
diff --git a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
index d6fd8d61..32a6ce3c 100644
--- a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
+++ b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "PolicyKit Qt wrapper"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7dbc59dc445b2261c4fb2f9466e3446a"
 
-inherit kde cmake-lib
+inherit kde-base cmake-lib
 
 DEPENDS += "polkit glib-2.0"
 
diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
index 6134f05c..f163f3eb 100644
--- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
+++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
@@ -2,11 +2,11 @@ SUMMARY = "Plugin based library to create window decorations"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-inherit kde cmake-lib
+inherit kde-plasma cmake-lib
 
-SRCREV = "674aa454a3a345ef47eca24f513388c3694c5003"
-S = "${WORKDIR}/git"
-PV = "5.2.90"
+PV = "${PLASMA_VERSION}"
+SRC_URI[md5sum] = "a07bbaff1d102e1dfd58bcf328992fe4"
+SRC_URI[sha256sum] = "a2549e56f1b5becf07785c7e11731501cb5ea7c30d5011865209838b550db18c"
 
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
diff --git a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata_5.6.0.bb b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
similarity index 79%
rename from recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata_5.6.0.bb
rename to recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
index 1d1427c2..45e83cf1 100644
--- a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata_5.6.0.bb
+++ b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
@@ -7,16 +7,18 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
-inherit kde cmake-lib pkgconfig
+
+inherit kde-plasma cmake-lib pkgconfig
+
+PV = "5.6.0"
+SRC_URI[md5sum] = "38104ee93350ef69428e645da1564a0d"
+SRC_URI[sha256sum] = "96a4b5dc68f30ca1f5db773c431d1c1963fe1c6c95f54847e9cb60d10ca3e96d"
 
 DEPENDS += "ki18n karchive"
 
 # TODO: optionals PACKAGECONFIG (not yet in oe: poppler-qt5 / exiv2 / ffmpeg / epub)
 DEPENDS += "taglib"
 
-SRCREV = "a674091d00b8159a788afef3d65436529aae3ba7"
-S = "${WORKDIR}/git"
-
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5FileMetaData, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_HIDE_ERROR[2] = "KF5FileMetaData, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/plasma/tier3/baloo/baloo_5.2.90.bb b/recipes-kde/plasma/tier3/baloo/baloo.bb
similarity index 82%
rename from recipes-kde/plasma/tier3/baloo/baloo_5.2.90.bb
rename to recipes-kde/plasma/tier3/baloo/baloo.bb
index 602cfaed..93724a5b 100644
--- a/recipes-kde/plasma/tier3/baloo/baloo_5.2.90.bb
+++ b/recipes-kde/plasma/tier3/baloo/baloo.bb
@@ -5,12 +5,14 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde cmake-lib
+inherit kde-plasma cmake-lib
 
 DEPENDS += "ki18n kconfig kidletime kitemmodels kinit kauth kcrash solid kio kdelibs4support kfilemetadata ktexteditor xapian-core"
 
-SRCREV = "e56b27a5e2078a989216eebcd9651fec3da967b6"
-S = "${WORKDIR}/git"
+PV = "5.6.0"
+SRC_URI[md5sum] = "2b3ab6d78e2e492d281d27ce4bc00e1a"
+SRC_URI[sha256sum] = "2418194eabe140c432434fdad0224bcc9d735c22960df116ff8668e4e6b5c0df"
+
 SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"
 
 # cross libs / headers
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace_5.2.90.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
similarity index 93%
rename from recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace_5.2.90.bb
rename to recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index ac2db3de..f5e4b2b0 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace_5.2.90.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde cmake-lib
+inherit kde-plasma cmake-lib
 
 DEPENDS += " \
     baloo \
@@ -34,9 +34,10 @@ DEPENDS += " \
     zlib \
 "
 
+PV = "${PLASMA_VERSION}"
+SRC_URI[md5sum] = "4ffdb4c7e310dff222abd452fd67e74d"
+SRC_URI[sha256sum] = "43eece34f9ca2a15dc01aa4163db7d97aea09daab6b337cf4062ec2a4e8891eb"
 
-SRCREV = "38cf27146758738c0885810a42a0ce2b678de9ae"
-S = "${WORKDIR}/git"
 SRC_URI += " \
     file://0001-Initial-Wayland-support.patch \
     file://0002-Do-check-for-kwin-only-in-case-X11-was-found.patch \
diff --git a/recipes-kde/plasma/untier/kwayland/kwayland_git.bb b/recipes-kde/plasma/untier/kwayland/kwayland.bb
similarity index 92%
rename from recipes-kde/plasma/untier/kwayland/kwayland_git.bb
rename to recipes-kde/plasma/untier/kwayland/kwayland.bb
index 82a2e875..70eabbc0 100644
--- a/recipes-kde/plasma/untier/kwayland/kwayland_git.bb
+++ b/recipes-kde/plasma/untier/kwayland/kwayland.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde cmake-lib
+inherit kde-base cmake-lib
 
 SRC_URI += " \
     file://0001-CMakeLists.txt-add-pkg-config-as-fallback-for-Waylan.patch \
@@ -12,6 +12,8 @@ SRC_URI += " \
     file://0003-PlasmaEffects-interface.patch \
     file://0004-Server-side-interface.patch \
 "
+
+# TODO come back to mainline
 SRCREV = "bc9ab6731700eabf17e1b193d13c904f68f7ebe0"
 S = "${WORKDIR}/git"
 PV = "5.1.90+git${SRCPV}"
diff --git a/recipes-kde/plasma/untier/kwin/kwin_5.2.0.1.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
similarity index 92%
rename from recipes-kde/plasma/untier/kwin/kwin_5.2.0.1.bb
rename to recipes-kde/plasma/untier/kwin/kwin.bb
index 1b89e072..2a8f1465 100644
--- a/recipes-kde/plasma/untier/kwin/kwin_5.2.0.1.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde cmake-lib
+inherit kde-plasma cmake-lib
 
 DEPENDS += " \
 	kconfig \
@@ -46,8 +46,10 @@ DEPENDS += " \
 	virtual/egl \
 "
 
-SRCREV = "3b6ab89617fd8b94bc926055a13df772036b33d2"
-S = "${WORKDIR}/git"
+PV = "5.2.0.1"
+SRC_URI[md5sum] = "47b6ce31b45450fa702098c9f3f5ac95"
+SRC_URI[sha256sum] = "aed82bd23376b44534a01b277cab3aed012c778540320814469b446719ccdf49"
+
 SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
 
 # REVISIT: this should be fixed in meta-fsl-arm
diff --git a/recipes-kde/other/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch b/recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch
similarity index 100%
rename from recipes-kde/other/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch
rename to recipes-kde/plasma/untier/libkscreen/files/0001-fix-configuration-build-on-x-less-systems.patch
diff --git a/recipes-kde/other/libkscreen/libkscreen_5.2.90.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
similarity index 78%
rename from recipes-kde/other/libkscreen/libkscreen_5.2.90.bb
rename to recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index 43eb851f..90099aba 100644
--- a/recipes-kde/other/libkscreen/libkscreen_5.2.90.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -5,20 +5,22 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 "
 
-inherit kde cmake-lib
-
-SRCREV = "be1c7112d477acbcf16904c20d38ca1f15fdaf05"
-S = "${WORKDIR}/git"
-
-SRC_URI += " \
-    file://0001-fix-configuration-build-on-x-less-systems.patch \
-"
+inherit kde-plasma cmake-lib
 
 DEPENDS += " \
 	${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "
 
+PV = "${PLASMA_VERSION}"
+SRC_URI[md5sum] = "34e6da6220392b8836c7a8b0c60f32fb"
+SRC_URI[sha256sum] = "a3cc64e6b94fdee14fb19a1185007953b6701fbf1e8d5564c30e55b04ec4e5ec"
+
+SRC_URI += " \
+    file://0001-fix-configuration-build-on-x-less-systems.patch \
+"
+
+
 FILES_${PN}-dbg += " \
     ${libdir}/plugins/kf5/kscreen/.debug \
     ${libexecdir}/kf5/.debug \
diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard_git.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
similarity index 79%
rename from recipes-kde/plasma/untier/libksysguard/libksysguard_git.bb
rename to recipes-kde/plasma/untier/libksysguard/libksysguard.bb
index a9134e4c..d578f85e 100644
--- a/recipes-kde/plasma/untier/libksysguard/libksysguard_git.bb
+++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde cmake-lib
+inherit kde-plasma cmake-lib
 
 DEPENDS += " \
 	qtwebkit \
@@ -24,9 +24,9 @@ DEPENDS += " \
 	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "
 
-SRCREV = "e52a86fde551660853e94f33fcdefc7900eb1c45"
-S = "${WORKDIR}/git"
-PV = "5.1.90+git${SRCPV}"
+PV = "${PLASMA_VERSION}"
+SRC_URI[md5sum] = "ffc4435d1c38ebc5a89a538cc61bbf64"
+SRC_URI[sha256sum] = "977f9baea4bfdc993382476bde9669a74b9491258127ef8bef57aaf641f2de49"
 
 # cross libs / headers
 CMAKE_HIDE_ERROR[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"