diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass
new file mode 100644
index 0000000..7f67309
--- /dev/null
+++ b/classes/cmake_plasma.bbclass
@@ -0,0 +1,34 @@
+inherit cmake_qt5
+inherit gettext
+inherit python3native
+
+EXTRA_OECMAKE += " \
+    -DBUILD_TESTING=OFF \
+"
+
+DEPENDS += " \
+    extra-cmake-modules \
+    qtbase \
+"
+
+FILES_${PN} += " \
+    ${libdir}/kconf_update_bin/* \
+    ${libdir}/plugins/*.so \
+    ${libdir}/plugins/*/*.so \
+    ${libdir}/plugins/*/*/*.so \
+    ${datadir}/config.kcfg/*.kcfg \
+    ${datadir}/dbus-1/services/*.service \
+    ${datadir}/kconf_update/*.upd \
+    ${datadir}/knotifications5/*.notifyrc \
+    ${datadir}/kservices5/*.desktop \
+    ${datadir}/kservices5/*.protocol \
+    ${datadir}/kservicetypes5/*.desktop \
+    ${datadir}/polkit-1/actions/*.policy \
+"
+
+FILES_${PN}-dev += " \
+    ${datadir}/dbus-1/interfaces/*.xml \
+    ${datadir}/kdevappwizard/templates/*.tar.bz2 \
+    ${libdir}/cmake/*/*.cmake \
+    ${prefix}/mkspecs/modules/qt_*.pri \
+"
diff --git a/recipes-plasma/breeze.inc b/recipes-plasma/breeze.inc
index 658c542..9e7f75b 100644
--- a/recipes-plasma/breeze.inc
+++ b/recipes-plasma/breeze.inc
@@ -1,47 +1,34 @@
 DESCRIPTION = "Breeze Style"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
-    extra-cmake-modules \
     kcmutils \
     kconfigwidgets \
     kcoreaddons \
     kdecoration \
     kguiaddons \
     ki18n \
     kpackage \
     kwayland \
     kwindowsystem \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/breeze;nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-inherit gettext
-inherit python3native
+inherit cmake_plasma
 
 FILES_${PN} += " \
-    ${libdir}/kconf_update_bin/* \
-    ${libdir}/plugins/*.so \
-    ${libdir}/plugins/*/*.so \
     ${libdir}/qml/QtQuick/Controls/Styles \
     ${datadir}/kstyle/themes \
-    ${datadir}/kservices5/*.desktop \
     ${datadir}/plasma/look-and-feel \
     ${datadir}/color-schemes \
     ${datadir}/icons \
-    ${datadir}/kconf_update/*.upd \
     ${datadir}/QtCurve/*.qtcurve \
     ${datadir}/wallpapers \
 "
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/Breeze/*.cmake \
-"
diff --git a/recipes-plasma/kactivitymanagerd.inc b/recipes-plasma/kactivitymanagerd.inc
index 64dc31f..393986e 100644
--- a/recipes-plasma/kactivitymanagerd.inc
+++ b/recipes-plasma/kactivitymanagerd.inc
@@ -1,51 +1,44 @@
 DESCRIPTION = "KActivity Manager Daemon"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
     boost \
-    qtbase \
-    extra-cmake-modules \
     \
     kconfig \
     kcoreaddons \
     kdbusaddons \
     kglobalaccel \
     ki18n \
     kio \
     kwindowsystem \
     kxmlgui \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/kactivitymanagerd;nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-inherit gettext
-inherit python3native
+inherit cmake_plasma
 
 CXXFLAGS += "-DBOOST_DISABLE_ASSERTS"
 
 # the cmake checks for those use try_run(), which fails when cross-compiling
 EXTRA_OECMAKE += " \
     -DHAVE_CXX11_AUTO=ON \
     -DHAVE_CXX11_NULLPTR=ON \
     -DHAVE_CXX11_LAMBDA=ON \
     -DHAVE_CXX11_OVERRIDE=ON \
     -DHAVE_CXX11_UNIQUE_PTR=ON \
     -DHAVE_CXX11_VARIADIC_TEMPLATES=ON \
     -DHAVE_CXX11_INITIALIZER_LISTS=ON \
 "
 
 FILES_${PN} += " \
     ${libdir}/*.so \
-    ${libdir}/plugins/kactivitymanagerd/1/*.so \
-    ${datadir}/kservices5/*.desktop \
-    ${datadir}/kservicetypes5/*.desktop \
 "
 
 FILES_${PN}-dev = ""
diff --git a/recipes-plasma/kdecoration.inc b/recipes-plasma/kdecoration.inc
index 50f2fa7..1a8c221 100644
--- a/recipes-plasma/kdecoration.inc
+++ b/recipes-plasma/kdecoration.inc
@@ -1,21 +1,12 @@
 DESCRIPTION = "Plugin based library to create window decorations"
 HOMEPAGE = ""
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
-DEPENDS = " \
-    qtbase \
-    extra-cmake-modules \
-"
-
 SRC_URI = " \
-    git://anongit.kde.org/${PN};nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KDecoration2/*.cmake \
-"
+inherit cmake_plasma
diff --git a/recipes-plasma/kscreenlocker.inc b/recipes-plasma/kscreenlocker.inc
index 81a09d9..f4907ed 100644
--- a/recipes-plasma/kscreenlocker.inc
+++ b/recipes-plasma/kscreenlocker.inc
@@ -1,55 +1,43 @@
 DESCRIPTION = "KScreenLocker"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
     qtdeclarative \
-    extra-cmake-modules \
     kwayland \
     kcrash \
     kdeclarative \
     kglobalaccel \
     ki18n \
     kidletime \
     kcmutils \
     knotifications \
     solid \
     ktextwidgets \
     kwindowsystem \
     kxmlgui \
     libxcb \
     libpam \
     wayland-native \
 "
 
 SRC_URI = " \
-    git://git.kde.org/${PN};nobranch=1 \
+    git://git.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 
-inherit cmake_qt5 gettext python3native
+inherit cmake_plasma
 
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
 FILES_${PN} += " \
-  ${datadir}/kconf_update/* \
-  ${datadir}/knotifications5/*.notifyrc \
-  ${datadir}/kservices5/*.desktop \
   ${datadir}/ksmserver/screenlocker/org.kde.passworddialog/*.desktop \
-  ${libdir}/plugins/*.so \
-"
-
-FILES_${PN}-dev += " \
-    ${datadir}/dbus-1/interfaces/*.xml \
-    ${libdir}/cmake/KScreenLocker/*.cmake \
-    ${libdir}/cmake/ScreenSaverDBusInterface/*.cmake \
 "
 
 RDEPENDS_${PN} += "perl"
diff --git a/recipes-plasma/kwayland-integration.inc b/recipes-plasma/kwayland-integration.inc
index daf4653..af8d48d 100644
--- a/recipes-plasma/kwayland-integration.inc
+++ b/recipes-plasma/kwayland-integration.inc
@@ -1,25 +1,18 @@
 DESCRIPTION = "KWayland Integration"
 HOMEPAGE = ""
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
-    extra-cmake-modules \
     kidletime \
     kwindowsystem \
     kwayland \
 "
 
 SRC_URI = " \
     git://git.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-
-FILES_${PN} += " \
-    ${libdir}/plugins/kf5/org.kde.kwindowsystem.platforms/*.so \
-    ${libdir}/plugins/kf5/org.kde.kidletime.platforms/*.so \
-"
+inherit cmake_plasma
diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc
index e615c9e..5e99b42 100644
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -1,93 +1,91 @@
 DESCRIPTION = "KWin"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
     qtdeclarative \
-    extra-cmake-modules \
     kconfigwidgets \
     kcrash \
     kglobalaccel \
     ki18n \
     kinit \
     knotifications \
     kpackage \
     plasma-framework \
     kwindowsystem \
     kiconthemes \
     kidletime \
     kwayland \
     kcompletion \
     kdeclarative \
     kcmutils \
     kio \
     ktextwidgets \
     knewstuff \
     kservice \
     kxmlgui \
     kdecoration \
     kscreenlocker \
     libxcb \
     xcb-util-cursor \
     fontconfig \
     libepoxy \
     libinput \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
     file://0001-compile-fix.patch \
 "
 SRC_URI_append_raspberrypi += " \
     file://0002-rpi-compile-fix.patch \
 "
 
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5 gettext python3native
+inherit cmake_plasma
 
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_kwin*.so \
     ${libdir}/kconf_update_bin/kwin5_update_default_rules \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kpackage/packagestructure/*.so \
     ${libdir}/plugins/org.kde.kwin.scenes/*.so \
     ${libdir}/plugins/org.kde.kglobalaccel5.platforms/*.so \
     ${libdir}/plugins/kwin/effects/configs/*.so \
     ${libdir}/plugins/org.kde.kwin.waylandbackends/*.so \
     ${libdir}/plugins/org.kde.kdecoration2/*.so \
     ${libdir}/plugins/kf5/org.kde.kidletime.platforms/*.so \
     ${libdir}/plugins/org.kde.kwin.platforms/*.so \
     ${libdir}/plugins/platforms/*.so \
     ${libdir}/qml/org/kde/kwin/decoration/* \
     ${libdir}/qml/org/kde/kwin/decorations/plastik/* \
     ${libdir}/qml/org/kde/kwin/private/kdecoration/* \
     ${datadir}/kservices5/*.desktop \
     ${datadir}/kservices5/kwin/*.desktop \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/icons/hicolor/*/*/* \
     ${datadir}/kwincompositing/qml/*.qml \
     ${datadir}/config.kcfg/*.kcfg \
 "
 
 FILES_${PN}-dev = " \
     ${libdir}/libkwin*.so \
     ${libdir}/cmake/KWinDBusInterface/*.cmake \
     ${datadir}/dbus-1/interfaces/*.xml \
     ${includedir}/*.h \
 "
 
 RDEPENDS_${PN} += " \
     qtvirtualkeyboard-qmlplugins \
     qtwayland-plugins \
     xserver-xorg-xwayland \
 "
diff --git a/recipes-plasma/libkscreen.inc b/recipes-plasma/libkscreen.inc
index 95dd10a..fae3635 100644
--- a/recipes-plasma/libkscreen.inc
+++ b/recipes-plasma/libkscreen.inc
@@ -1,31 +1,17 @@
 DESCRIPTION = "KScreen library"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
     qtx11extras \
-    extra-cmake-modules \
     kwayland \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/libkscreen;nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-inherit gettext
-inherit python3native
-
-FILES_${PN} += " \
-    ${libdir}/plugins/kf5/kscreen/*.so \
-    ${datadir}/dbus-1/services/*.service \
-"
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5Screen/*.cmake \
-    ${prefix}/mkspecs/modules/qt_*.pri \
-"
+inherit cmake_plasma
diff --git a/recipes-plasma/libksysguard.inc b/recipes-plasma/libksysguard.inc
index ecd8417..ce7bc40 100644
--- a/recipes-plasma/libksysguard.inc
+++ b/recipes-plasma/libksysguard.inc
@@ -1,40 +1,30 @@
 DESCRIPTION = "KSysGuard library"
 HOMEPAGE = ""
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
-    extra-cmake-modules \
     kcoreaddons \
     kconfig \
     ki18n \
     kwindowsystem \
     kcompletion \
     kauth \
     kwidgetsaddons \
     kiconthemes \
     kconfigwidgets \
     kservice \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/libksysguard;nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-inherit gettext
-inherit python3native
+inherit cmake_plasma
 
 FILES_${PN} += " \
     ${datadir}/ksysguard/scripts/* \
     ${datadir}/ksysguard/scripts/*/* \
-    ${datadir}/dbus-1/system-services/*.service \
-    ${datadir}/polkit-1/actions/*.policy \
-"
-
-FILES_${PN}-dev += " \
-    ${libdir}/cmake/KF5SysGuard/*.cmake \
 "
diff --git a/recipes-plasma/plasma-integration.inc b/recipes-plasma/plasma-integration.inc
index fbac4f3..f029510 100644
--- a/recipes-plasma/plasma-integration.inc
+++ b/recipes-plasma/plasma-integration.inc
@@ -1,39 +1,30 @@
 DESCRIPTION = "Plasma Integration"
 HOMEPAGE = ""
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
     qtx11extras \
     qtquickcontrols2 \
-    extra-cmake-modules \
     kconfig \
     kconfigwidgets \
     ki18n \
     kiconthemes \
     kio \
     knotifications \
     kwayland \
     kwidgetsaddons \
     kwindowsystem \
     breeze \
     libxcursor \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/plasma-integration;nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5
-inherit gettext
-inherit python3native
-
-FILES_${PN} += " \
-    ${libdir}/plugins/platformthemes/KDEPlasmaPlatformTheme.so \
-    ${datadir}/kconf_update/* \
-"
+inherit cmake_plasma
 
 RDEPENDS_${PN} += "perl"
diff --git a/recipes-plasma/plasma-phone-components.inc b/recipes-plasma/plasma-phone-components.inc
index cb2a43b..cad7c24 100644
--- a/recipes-plasma/plasma-phone-components.inc
+++ b/recipes-plasma/plasma-phone-components.inc
@@ -1,39 +1,34 @@
 DESCRIPTION = "Plasma Phone Components"
 HOMEPAGE = "https://community.kde.org/Plasma/Mobile/Code"
 LICENSE = "GPLv2+"
 # TODO: repo does not have a license file!
 LIC_FILES_CHKSUM = "file://README.md;md5=4b29ea33c047d21253e6e3718dc59f7c"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
     telepathy-qt \
     kwayland \
     plasma-framework \
     kpeople \
 "
 
 SRC_URI = " \
-    git://anongit.kde.org/${PN};nobranch=1 \
+    git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5 gettext python3native
+inherit cmake_plasma
 
 FILES_${PN} += " \
-    ${libdir}/plugins/plasma/applets/*.so \
     ${libdir}/qml/QtQuick/VirtualKeyboard/Styles/Plasma/* \
     ${libdir}/qml/org/kde/plasma/private/mobileshell/* \
     ${libdir}/qml/org/kde/plasma/private/kpeoplehelper/* \
     ${datadir}/kpackage/genericqml/org.kde.phone.dialer/* \
-    ${datadir}/knotifications5/*.notifyrc \
-    ${datadir}/kservices5/*.desktop \
     ${datadir}/plasma/shells/org.kde.plasma.phone/* \
     ${datadir}/plasma/plasmoids/* \
     ${datadir}/plasma/look-and-feel/org.kde.plasma.phone/* \
-    ${datadir}/dbus-1/services/*.service \
     ${datadir}/telepathy/clients/Plasma.Dialer.client \
     ${datadir}/kwin/scripts/org.kde.phone.multitasking/* \
     ${datadir}/wallpapers/org.kde.plasma.phone.lockers/* \
     ${datadir}/wayland-sessions/*.desktop \
 "
diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc
index d70e436..d67d312 100644
--- a/recipes-plasma/plasma-workspace.inc
+++ b/recipes-plasma/plasma-workspace.inc
@@ -1,110 +1,93 @@
 DESCRIPTION = "Plasma Workspace"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"
 
 DEPENDS = " \
-    qtbase \
     qtdeclarative \
     baloo \
-    extra-cmake-modules \
     karchive-native \
     kcoreaddons \
     kcrash \
     solid \
     kactivities \
     kcmutils \
     kdbusaddons \
     kdeclarative \
     kdelibs4support \
     kdesu \
     kdoctools \
     kidletime \
     kitemmodels \
     kjsembed \
     knewstuff \
     knotifications \
     knotifyconfig \
     kpackage \
     krunner \
     kscreenlocker \
     ktexteditor \
     kwallet \
     kwayland \
     kwin \
     libksysguard \
     networkmanager-qt \
     phonon \
     plasma-framework \
     prison \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
-inherit cmake_qt5 gettext python3native
+inherit cmake_plasma
 
 EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF"
 
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
     # meinproc5 needs to find its libraries
     export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH
 }
 
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_*.so \
-    ${libdir}/kconf_update_bin/krunnerplugins \
-    ${libdir}/plugins/*.so \
-    ${libdir}/plugins/kpackage/packagestructure/*.so \
-    ${libdir}/plugins/plasma/applets/*.so \
-    ${libdir}/plugins/plasma/dataengine/*.so \
-    ${libdir}/plugins/plasma/packagestructure/*.so \
-    ${libdir}/plugins/phonon_platform/kde.so \
-    ${libdir}/plugins/kf5/kio/*.so \
-    ${libdir}/plugins/kf5/kded/*.so \
     ${libdir}/qml/org/kde/taskmanager/* \
     ${libdir}/qml/org/kde/plasma \
-    ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kstyle/themes/*.themerc \
-    ${datadir}/kservices5/*.desktop \
-    ${datadir}/kservices5/*.protocol \
     ${datadir}/ksmserver/themes \
     ${datadir}/ksplash/Themes \
     ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/kio_desktop \
     ${datadir}/plasma/plasmoids \
     ${datadir}/plasma/look-and-feel \
     ${datadir}/plasma/shareprovider \
     ${datadir}/plasma/wallpapers \
     ${datadir}/plasma/services/*.operations \
     ${datadir}/solid/actions/*.desktop \
-    ${datadir}/dbus-1/services/*.service \
     ${datadir}/sddm/themes \
     ${datadir}/desktop-directories/*.directory \
     ${datadir}/wayland-sessions/*.desktop \
-    ${datadir}/kconf_update/*.upd \
     ${datadir}/xsessions/*.desktop \
-    ${datadir}/config.kcfg/*.kcfg \
 "
 
 FILES_${PN}-dev = " \
     ${includedir} \
     ${libdir}/libtaskmanager.so \
     ${libdir}/libkworkspace5.so \
     ${libdir}/libplasma-geolocation-interface.so \
     ${libdir}/libweather_ion.so \
     ${libdir}/cmake/*/*.cmake \
     ${datadir}/kdevappwizard/templates/* \
     ${datadir}/dbus-1/interfaces/*.xml \
 "
 
 RDEPENDS_${PN} += " \
     kinit \
     xprop \
     xset \
 "