diff --git a/classes/kde-plasma.bbclass b/classes/kde-plasma.bbclass
index 16bf73bf..c28d5f36 100644
--- a/classes/kde-plasma.bbclass
+++ b/classes/kde-plasma.bbclass
@@ -1,6 +1,6 @@
 inherit kde-base
 
-PLASMA_VERSION = "5.22.5"
+PLASMA_VERSION = "5.23.0"
 
 SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
 
diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
index ebfcaf18..cd2fd0ef 100644
--- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
+++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
@@ -12,4 +12,4 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "b577202eefaad7b95e701c1ce14108fbfe4ae6fd73ce46c369a2a7a329211bef"
+SRC_URI[sha256sum] = "b1b431bf14150ddf509c839dd6686df4dd0efa09b3b69b9f059d925ac8de90a9"
diff --git a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
index 837ae288..ad3cb970 100644
--- a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
+++ b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
@@ -27,7 +27,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "22ab64377d595e0384285d95fe21464ab63a7644d2303cc0002b495f85412a19"
+SRC_URI[sha256sum] = "912cd9eded892e44c782fb615491f41df886107b7b33583034d75ff997154aa2"
 
 FILES_SOLIBSDEV = ""
 
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index 11a8d8d5..39d55a0d 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -1,9 +1,18 @@
 SUMMARY = "Plasma workspace, applications and applets"
-LICENSE = "GPL-2.0 & LGPL-2.1 & GFDL-1.2"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & CC0-1.0 & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & MIT"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/BSD-2-Clause.txt;md5=4e290b17e3e05732730de37b44abef90 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
+    file://LICENSES/MIT.txt;md5=4dd71a82d66fd9e3ca0cc65b8be370c0 \
 "
 
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -50,8 +59,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI += "file://0001-Fix-typo.patch"
-SRC_URI[sha256sum] = "f22e12dea303478d949f69b88fcf30787ef7f5d098be55595ec562aee4b13606"
+SRC_URI[sha256sum] = "49abcb19639a72eb5ffa916d5eca0a925d32a36e4a02658cc73ab479dea39965"
 
 # REVISIT
 FILES:${PN} += " \
diff --git a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb
index 7ebd6bc7..9b9f5961 100644
--- a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb
+++ b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb
@@ -31,7 +31,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "a21094de5445e662786ab7ce7274106f9bd8a25233de363eea73403ce62fcc05"
+SRC_URI[sha256sum] = "c21e0f0df7a3cf07c93489e92832045bc0d1e17a20d14b46685a635c47e50868"
 
 FILES:${PN} += " \
     ${datadir}/bluedevilwizard \
diff --git a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
index 5c570a59..414480c1 100644
--- a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
+++ b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
@@ -10,7 +10,7 @@ inherit kde-plasma python3native
 DEPENDS += "sassc-native cairo breeze python3-pycairo-native"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "c23bd1810cc491264b376f2e0187c48b4d979e2aaded7061792c35c54fd22e52"
+SRC_URI[sha256sum] = "92eb49ba2e2144f8dfce970e4766e372d7e3448e46e22e742f3acb663df2a0d5"
 
 FILES:${PN} += " \
     ${datadir}/kconf_update \
diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb
index f01356f1..a06963a8 100644
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -31,7 +31,7 @@ DEPENDS += "\
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "e3fc4ca04cc0df694ab90fa4f9e8ca72512adae2c0320ce3f9702dddda029426"
+SRC_URI[sha256sum] = "2003f168b3d60f5897486d9582631f75da7f0dc2625e9c4cddd9aa3d706bfd9e"
 
 FILES:${PN} += " \
     ${datadir}/color-schemes \
diff --git a/recipes-kde/plasma/untier/discover/discover.bb b/recipes-kde/plasma/untier/discover/discover.bb
index 79c86711..df61bfda 100644
--- a/recipes-kde/plasma/untier/discover/discover.bb
+++ b/recipes-kde/plasma/untier/discover/discover.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma gtk-icon-cache mime-xdg
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "c9809ec8f3f26909ce9901d6f7cd03cf52d4854431cfdf5340a4daa8404842b0"
+SRC_URI[sha256sum] = "536a27fd49c8181810582bfec72feeb611e06c2e5a98a863b1af362d5f2e4651"
 
 DEPENDS += " \
     qtdeclarative \
diff --git a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
index 4b26e61e..1bf355bf 100644
--- a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
+++ b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb
@@ -34,7 +34,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "90cb373ea112b844541d9c52000635b02ccdf2fe2da0fc7901b1a5a8b8df45ca"
+SRC_URI[sha256sum] = "ae72d6e44769c1ac48d1dc3b4f0345c16fdcd053f7a1a4820b08b1d367df8568"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
diff --git a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
index 89fc60b2..a8b6fbf6 100644
--- a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
+++ b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb
@@ -29,7 +29,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "daf8ca2d5e3e3986a478238bcc6d22cc750e20ea37ce198e1f7ef1d88c971e6c"
+SRC_URI[sha256sum] = "4684ea82a3877573811d6761395f8bf3252d8c7118082c96a70c79d9f9ee11b3"
 
 CFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
index 4d09c9f1..2abd99c8 100644
--- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
+++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
@@ -41,7 +41,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "6240bb29e3e23374e193659b50b21ddf1448b3f5f88fb15094d029d6b1643103"
+SRC_URI[sha256sum] = "2f15f9e2c90f88f87377c0e7aff0b8645b02afcfb5518ef279865d60810f91b8"
 
 FILES:${PN} += " \
     ${datadir}/icons \
diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb
index 07cf4b39..e8d1c2ad 100644
--- a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb
+++ b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb
@@ -19,7 +19,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "0210777ada99795086d7ec348143e4f0e48089dd15fd30f09eb68d3739275054"
+SRC_URI[sha256sum] = "a31ff237c00814f46de7d6791a0b496f971a6f9b2467fb3534d643dc0e6190f4"
 
 FILES:${PN} += " \
     ${datadir}/kgamma \
diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
index 361e573d..128b047a 100644
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -33,7 +33,7 @@ DEPENDS += "\
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "64e1c561ca124209a6be7647aa400f2b8ce67dd6fa578442d551d2ba0e4e17d0"
+SRC_URI[sha256sum] = "0f13f6842976853db42a7912da55ce25f6ad7e116740109f6255522662cb0f76"
 
 FILES:${PN} += " \
     ${datadir}/kservices5 \
diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
index 97df60a9..b97bd949 100644
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -2,11 +2,19 @@ SUMMARY = "KINFOCENTER"
 # Have no idea how kinfocenter is licensed now (and change came in with minor
 # point release !!)
 # [1] https://cgit.kde.org/kinfocenter.git/commit/?id=4ea9df96ae038f28f3e9f6ecef6a64681bb3e189
-LICENSE = "GPL-2.0 & LGPL-2.1 & GFDL-1.2"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & CC0-1.0 & FSFAP & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-2-Clause.txt;md5=4e290b17e3e05732730de37b44abef90 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/FSFAP.txt;md5=232368338ef6dc99de71c2e05ff12176 \
     file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
-    file://LICENSES/GFDL-1.2-only.txt;md5=9a4c4207e152ff95aa8539e9c1ed53e9 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
     file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
 "
 
 inherit kde-plasma gettext
@@ -39,7 +47,7 @@ DEPENDS += " \
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)}"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "951e42305ce4aaf709fca5e211e9fc4f2ddbbdba2417192f755a190fe325b9df"
+SRC_URI[sha256sum] = "4baf7e6e9a1d305c7c1b4c0c0d0ef4146fbc4008203d490ad6f4f6b4e578e07d"
 SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
 
 FILES:${PN} += " \
@@ -49,4 +57,5 @@ FILES:${PN} += " \
     ${datadir}/kpackage \
     \
     ${OE_QMAKE_PATH_PLUGINS} \
+    ${OE_QMAKE_PATH_QML} \
 "
diff --git a/recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch b/recipes-kde/plasma/untier/kinfocenter/kinfocenter/0001-fix-build-in-x11-less-environments.patch
similarity index 100%
rename from recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch
rename to recipes-kde/plasma/untier/kinfocenter/kinfocenter/0001-fix-build-in-x11-less-environments.patch
diff --git a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
index 30dadfc4..cc2649a1 100644
--- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
+++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
@@ -31,7 +31,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "1ad7f0e64b5088e16f61150d5936ece570410b17fb32d02bb7ec71d420c0c8c6"
+SRC_URI[sha256sum] = "b25053d24eb9e8a9f79dcc65bab742de6c027ee28f1b9344ddf94ffcfb370e6e"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
diff --git a/recipes-kde/plasma/untier/kscreen/kscreen.bb b/recipes-kde/plasma/untier/kscreen/kscreen.bb
index e72ab537..7551368c 100644
--- a/recipes-kde/plasma/untier/kscreen/kscreen.bb
+++ b/recipes-kde/plasma/untier/kscreen/kscreen.bb
@@ -1,8 +1,10 @@
 SUMMARY = "KDE's screen management software"
-LICENSE = "GPL-2.0 & LGPL-2.1"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
 "
 
 inherit kde-plasma gettext
@@ -29,7 +31,7 @@ DEPENDS += "\
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "6bfab1f10532599e16d1112e794626b105b4c80c41659665ffdf710bc29d1e60"
+SRC_URI[sha256sum] = "25ca9a2db37d7838462beb0b0bf3d21b89dea01a56e9b8b6df020ffcfe0cf83b"
 
 FILES:${PN} += " \
     ${datadir}/k*_kscreen \
diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
index e6863cf2..d1d1949d 100644
--- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
+++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
@@ -30,7 +30,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "28edcf841db79554ac113c8619d20f978b2ab81bfd5d5be25f973506f262f180"
+SRC_URI[sha256sum] = "832fd3c89e916c454edace46f1fba72c3bd211e98806e4ae2c2acc4df201324c"
 SRC_URI += "file://kde.pam"
 
 do_install:append() {
diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
index d9f0dea5..1a4f4c01 100644
--- a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
+++ b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
@@ -21,4 +21,4 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "f7dd2fa8d28ac4a673a9af0694f73c96caea63ae96ad836b9aa7a8055067e245"
+SRC_URI[sha256sum] = "a86c20079b62c55da26171eb9aec05e38f6c33f712455558d027a5cace08c163"
diff --git a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
index 1aadaa8c..18f63d90 100644
--- a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
+++ b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
@@ -1,7 +1,8 @@
 SUMMARY = "Unlock KWallet using PAM"
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
 "
 
 REQUIRED_DISTRO_FEATURES = "pam"
@@ -15,11 +16,14 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "d8a2a7408e8eefa2b3cc1aa22d130f90ae4bd67c716f290f295a05d5de14320f"
+SRC_URI[sha256sum] = "d7ee58f3878c07286f1c7185d6365f4b2275e6db30490bf0d773b3c37d417173"
 SRC_URI += "file://0001-use-pkgconfig-to-find-libgcrypt.patch"
 
 EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}"
 
-FILES:${PN} += "${base_libdir}/security"
+FILES:${PN} += " \
+    ${base_libdir}/security \
+    ${systemd_user_unitdir} \
+"
 
 RDEPENDS:${PN} = "socat"
diff --git a/recipes-kde/plasma/untier/kwallet-pam/files/0001-use-pkgconfig-to-find-libgcrypt.patch b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam/0001-use-pkgconfig-to-find-libgcrypt.patch
similarity index 100%
rename from recipes-kde/plasma/untier/kwallet-pam/files/0001-use-pkgconfig-to-find-libgcrypt.patch
rename to recipes-kde/plasma/untier/kwallet-pam/kwallet-pam/0001-use-pkgconfig-to-find-libgcrypt.patch
diff --git a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
index 19996f71..c2dce981 100644
--- a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
+++ b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma
 
 DEPENDS += " \
+    qtwayland-native \
     kidletime \
     kwindowsystem \
     kguiaddons \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "4cbc301227a507fb2ac42e08130c79ff58a9905ebd444ddd64c78bb1e834fb4d"
+SRC_URI[sha256sum] = "07e68dafbc92f2906fb6df051d715bc34df369bcf5a476af282c1e3d9a5e4acd"
 
 FILES:${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
diff --git a/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb b/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb
index cdaeda2b..e28a2989 100644
--- a/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb
+++ b/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb
@@ -27,7 +27,7 @@ SRC_URI:append:class-native = " \
     file://0001-Build-qtwaylandscanner_kde-only-for-native-build.patch \
     file://0002-Avoid-traces-to-sysroot-to-avoid-false-fails-by-cmak.patch \
 "
-SRC_URI[sha256sum] = "dd64bdd629b239621d687d8deceff6e0da88542c6b67140c5ff8b654155bf39d"
+SRC_URI[sha256sum] = "3009d7249af74582afa89978d478eece3424e5ef225bdb6f40032e2a6471d671"
 
 do_configure:append() {
     # adjust path to protocol sources in sysroot
diff --git a/recipes-kde/plasma/untier/kwayland-server/kwayland-server/0001-Build-qtwaylandscanner_kde-only-for-native-build.patch b/recipes-kde/plasma/untier/kwayland-server/kwayland-server/0001-Build-qtwaylandscanner_kde-only-for-native-build.patch
index 310f0911..6b736509 100644
--- a/recipes-kde/plasma/untier/kwayland-server/kwayland-server/0001-Build-qtwaylandscanner_kde-only-for-native-build.patch
+++ b/recipes-kde/plasma/untier/kwayland-server/kwayland-server/0001-Build-qtwaylandscanner_kde-only-for-native-build.patch
@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47ecfd4..7690823 100644
+index 31c5a91..ad6a0f0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -39,7 +39,8 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWAYLANDSERVER
+@@ -45,7 +45,8 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWAYLANDSERVER
                          SOVERSION 5)
  
  # Dependencies
@@ -28,7 +28,7 @@ index 47ecfd4..7690823 100644
  find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG REQUIRED)
  find_package(PlasmaWaylandProtocols CONFIG REQUIRED)
  
-@@ -71,9 +72,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
+@@ -77,9 +78,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
  if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
      ecm_install_po_files_as_qm(po)
  endif()
@@ -40,13 +40,14 @@ index 47ecfd4..7690823 100644
  if (BUILD_TESTING)
      add_subdirectory(autotests)
      add_subdirectory(tests)
-@@ -107,5 +110,6 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
+@@ -113,6 +116,7 @@ install(EXPORT KWaylandServerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FI
  
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwaylandserver_version.h
          DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel )
 +endif()
  
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ # add clang-format target for all our real source files
+ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 93c174e..8d75147 100644
 --- a/src/CMakeLists.txt
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index 5af68e93..37174a42 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -61,7 +61,7 @@ DEPENDS += " \
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libepoxy xcb-util-cursor", "",d)}"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "128daed41c1b9e65ddad3fe2ce3aea821ef54af520d3d39cde059b2c2bfcf5a3"
+SRC_URI[sha256sum] = "ba74f70648faa3c92c88e1b77916c6abd7fcad1af9e717a39dc9df278f1a551f"
 
 # kwin check libepoxy only -> egl pkgconfig is skipped
 CXXFLAGS:append_mx6 += " -DLINUX=1"
diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb
index e926aae8..44f91425 100644
--- a/recipes-kde/plasma/untier/kwrited/kwrited.bb
+++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "63bd95099452951dba9e10a5ba15c4b6693cc44fb3ce99b7cb45638890748e09"
+SRC_URI[sha256sum] = "65a74b5d6fb75f4129b528a8cec6e3aadcbccdee6f7e0bf2d994fb1854999ffb"
 
 FILES:${PN} += " \
     ${datadir}/knotifications5 \
diff --git a/recipes-kde/plasma/untier/layer-shell-qt/layer-shell-qt.bb b/recipes-kde/plasma/untier/layer-shell-qt/layer-shell-qt.bb
index 3880289c..28fc1740 100644
--- a/recipes-kde/plasma/untier/layer-shell-qt/layer-shell-qt.bb
+++ b/recipes-kde/plasma/untier/layer-shell-qt/layer-shell-qt.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "ffcc705ae4fadabc3422b8331a8d6334e2ce197ca6fadd7343c0a48927d32f45"
+SRC_URI[sha256sum] = "f71377ad9e44e12005233b2309e37f00f8a469d4628647c5c4c80f026ce96b5e"
 
 FILES:${PN} += " \
     ${OE_QMAKE_PATH_PLUGINS} \
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index c43cd0f3..ddcc1522 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -9,10 +9,13 @@ LIC_FILES_CHKSUM = " \
 
 inherit kde-plasma
 
-DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
+DEPENDS += " \
+    qtwayland-native \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
+"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "5b4fcaebacc3a4cb62e599a796dca89a30c5ac10937ba3ef9a28998c84ca16e3"
+SRC_URI[sha256sum] = "c64b87b80683acccc5a3beb8fe22bd80a6e8b224b8a55714d5160174ad4ef1e5"
 
 FILES:${PN} += " \
     ${datadir}/dbus-1 \
diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
index 684c0641..9bdf50ad 100644
--- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
+++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
@@ -1,13 +1,19 @@
 SUMMARY = "KSE sysguard library"
-LICENSE = "GPL-2.0 & LGPL-2.1"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
 "
 
 inherit kde-plasma gettext
 
 DEPENDS += " \
+    libcap-native \
     qtwebengine \
     qtwebchannel \
     kauth-native \
@@ -31,13 +37,18 @@ DEPENDS += " \
     knewstuff \
     zlib \
     libnl \
-    libpcap \
     libcap \
+    libpcap \
+    lmsensors \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxres", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "a522ab976baafa8c1b80cbfe6a4d7718aa8c8623f84294d25c5d43429dd472c2"
+SRC_URI[sha256sum] = "c379dc3e806085ec058e7633153d697ab8868aa6eac1f483931f75f2fcdd61eb"
+
+do_compile:append() {
+    sed -i 's:${STAGING_DIR_HOST}${prefix}:${_IMPORT_PREFIX}:g' ${B}/CMakeFiles/Export/lib/cmake/KSysGuard/KSysGuardLibraryTargets.cmake
+}
 
 FILES:${PN} += " \
     ${datadir}/dbus-1 \
diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb
index 5ecb5814..9171d967 100644
--- a/recipes-kde/plasma/untier/milou/milou.bb
+++ b/recipes-kde/plasma/untier/milou/milou.bb
@@ -26,7 +26,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "f7c22b46d9a5081206f78e9964f515055876b7b4e9e6075d5fcc50b85c783fb4"
+SRC_URI[sha256sum] = "115f03b3b9c47206fc09543b7646e93862a6b6bb1c20ff650961f6c16bbe9eb9"
 
 FILES:${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb
index 0a086056..df31622a 100644
--- a/recipes-kde/plasma/untier/oxygen/oxygen.bb
+++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb
@@ -1,8 +1,14 @@
 SUMMARY = "OXYGEN"
-LICENSE = "GPL-2.0 & LGPL-2.1"
+LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & GPL-3.0-or-later & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=8da5784ab1c72e63ac74971f88658166 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
 "
 
 inherit kde-plasma gettext
@@ -25,7 +31,7 @@ DEPENDS += " \
 
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "0c3bb29ce140b00e1c95a0a1cb39c662d935f7216e61810837097a39516ec43b"
+SRC_URI[sha256sum] = "6c04ed2e5eca4d0dd82034875cd159dfd149ca412032258055f6a848ecbfe09e"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"
diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
index c3c84f41..b5cea636 100644
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -1,8 +1,17 @@
 SUMMARY = "KDE Plasma Desktop"
-LICENSE = "GPL-2.0 & GFDL-1.2"
+LICENSE = "BSD-3-Clause & CC0-1.0 & GFDL-1.2-or-later & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
-    file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
 "
 
 inherit kde-plasma gettext mime-xdg
@@ -50,7 +59,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "b4532accca913cb2551fdbdb865fd0c50cff76f690c9cfa8fa2ad627ddadacce"
+SRC_URI[sha256sum] = "346a806c839f3b26fca2db943bf58561dc3fd7ac08e7e73e9a157b532cae9c77"
 SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch"
 
 FILES_SOLIBSDEV = "${libdir}/libkfont*${SOLIBSDEV}"
diff --git a/recipes-kde/plasma/untier/plasma-desktop/files/0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop/0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch
similarity index 51%
rename from recipes-kde/plasma/untier/plasma-desktop/files/0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch
rename to recipes-kde/plasma/untier/plasma-desktop/plasma-desktop/0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch
index 6ce1c07e..b8d1cfb6 100644
--- a/recipes-kde/plasma/untier/plasma-desktop/files/0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop/0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch
@@ -6,22 +6,26 @@ Subject: [PATCH] Ensure xkb_base is not empty instead of checking if a file
 
 Upstream-Status: Pending
 ---
- ConfigureChecks.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ ConfigureChecks.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index c7ea746..bd34032 100644
+index f8272c4..e8522d3 100644
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -1,7 +1,7 @@
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
+@@ -2,10 +2,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P
  
  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=xkb_base xkeyboard-config OUTPUT_VARIABLE XKBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
--if (NOT EXISTS "${XKBDIR}")
-+if ("${XKBDIR}" STREQUAL "")
-     message(FATAL_ERROR "Couldn't find XKB location: .${XKBDIR}.")
+ if (CMAKE_CROSSCOMPILING)
+-    if (NOT EXISTS "${CMAKE_SYSROOT}/${XKBDIR}")
++    if ("${XKBDIR}" STREQUAL "")
+       message(FATAL_ERROR "Couldn't find XKB location in CMAKE_SYSROOT: \"${CMAKE_SYSROOT}/${XKBDIR}\"")
+     endif()
+-elseif(NOT EXISTS "${XKBDIR}")
++elseif ("${XKBDIR}" STREQUAL "")
+     message(FATAL_ERROR "Couldn't find XKB location: \"${XKBDIR}\".")
  endif()
  set(KWIN_BIN "kwin_x11" CACHE STRING "Name of the KWin binary")
 -- 
-2.1.4
+2.31.1
 
diff --git a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
index b57269d2..95b00fd9 100644
--- a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
+++ b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
@@ -1,7 +1,13 @@
 SUMMARY = "Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE = "LGPL-3.0"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING.LGPL-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
 "
 
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -26,7 +32,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "28c743f1a911042dac1dd86ae615748b7b5422e8d4b47bff34d31cf4bdb6f270"
+SRC_URI[sha256sum] = "0930859552d8772f6a86ed723448d74609cfd559c55f7746ac33802cd33a7965"
 
 FILES:${PN} += " \
     ${datadir}/kconf_update \
diff --git a/recipes-kde/plasma/untier/plasma-nano/plasma-nano.bb b/recipes-kde/plasma/untier/plasma-nano/plasma-nano.bb
index c8d391f0..aa6d22a6 100644
--- a/recipes-kde/plasma/untier/plasma-nano/plasma-nano.bb
+++ b/recipes-kde/plasma/untier/plasma-nano/plasma-nano.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "50ba3ec6f8619936fdac8bf2eff03e595828e8b7c2f7e5adcb8001e07a451945"
+SRC_URI[sha256sum] = "fcda0e8492c66b07e9ff4b2f30ec7f963a50c53e9d9fa3e7acd8b5c2e135ca94"
 
 FILES:${PN} += " \
     ${datadir}/plasma \
diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
index 6a4c2f14..896bc994 100644
--- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
+++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
@@ -1,8 +1,13 @@
 SUMMARY = "KSE sysguard library"
-LICENSE = "GPL-2.0 & LGPL-2.1"
+LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
+    file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \
+    file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \
 "
 
 inherit kde-plasma gettext
@@ -45,7 +50,7 @@ DEPENDS += " \
 # MobileBroadbandProviderInfo
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "7fab9fa175a7b0caf21ff19dddda9d1ea4d05cd3962fe1a2c726404203b9fc49"
+SRC_URI[sha256sum] = "ab3fdcf10d6d1db431c64101d3eee7481d213cd98f048a1e9445f2aec083ee38"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
diff --git a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
index edaa8243..c4909cbd 100644
--- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
+++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
@@ -29,7 +29,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "40ade6a4f7b19ae378d0db621f238f5c197d7a1a78379b5c92e9a1a88929b5ab"
+SRC_URI[sha256sum] = "0044353d5ee41d948ec19263fb359660e1525b08ed279bc642b9659597331cb4"
 
 FILES_SOLIBSDEV = ""
 
diff --git a/recipes-kde/plasma/untier/plasma-phone-components/plasma-phone-components.bb b/recipes-kde/plasma/untier/plasma-phone-components/plasma-phone-components.bb
index c373582e..c07c1e87 100644
--- a/recipes-kde/plasma/untier/plasma-phone-components/plasma-phone-components.bb
+++ b/recipes-kde/plasma/untier/plasma-phone-components/plasma-phone-components.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += " \
     kpackage-native \
     kauth-native \
+    modemmanager-qt \
     gstreamer1.0 \
     qtdeclarative \
     telepathy-qt \
@@ -26,7 +27,7 @@ DEPENDS += " \
 inherit kde-plasma gettext
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "40669f5218ac04d7e1aa71ffecf2376a6de5e747da1d24adee37cbe6e7e35ad4"
+SRC_URI[sha256sum] = "9a8b818f4c23491defd43e32881607a810c2c74891ad05853b3db51daf3444f0"
 
 FILES:${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/plasma/untier/plasma-systemmonitor/plasma-systemmonitor.bb b/recipes-kde/plasma/untier/plasma-systemmonitor/plasma-systemmonitor.bb
index feab0706..40fadc27 100644
--- a/recipes-kde/plasma/untier/plasma-systemmonitor/plasma-systemmonitor.bb
+++ b/recipes-kde/plasma/untier/plasma-systemmonitor/plasma-systemmonitor.bb
@@ -31,7 +31,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "dd9eaaeba11da2d9640873882ed4aa573c2b3fc2f5640783965992ceda1647a3"
+SRC_URI[sha256sum] = "5c4c5f200ee75544db076be2da27a422387faf6c6e5163b63966626970a090d2"
 
 FILES:${PN} += " \
     ${datadir}/config.kcfg \
diff --git a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
index 6ef0c6df..f365401a 100644
--- a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
+++ b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma gtk-icon-cache
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "4091679106a73c2d1ea4c76048258ce9bbbba326a1cdff359514dba7d29de9aa"
+SRC_URI[sha256sum] = "21be4da381d9453f908dd495c00f4bddd4c276e336ce9029341161096287df6f"
 
 DEPENDS += " \
     kauth-native \
diff --git a/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb b/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb
index bb1bb96c..8b2cacf1 100644
--- a/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb
+++ b/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb
@@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "be214397f580adff039f28b37758b5a19da01f35ef5ee9ddb3fe93c0f116a8c0"
+SRC_URI[sha256sum] = "424993551ed03c409c08e5067505a7df5f5adb81f6febf303fd763e6226a7394"
 
 FILES:${PN} += "${datadir}/wallpapers"
diff --git a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb
index fcf791c5..435fc982 100644
--- a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb
+++ b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb
@@ -1,7 +1,8 @@
 SUMMARY = "Daemon providing a polkit authentication UI for KDE"
-LICENSE = "GPL-2.0"
+LICENSE = "CC0-1.0 & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \
 "
 
 inherit kde-plasma gettext features_check
@@ -23,7 +24,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "60e3ea544b2b609351961fe7f299b79c9f8ff89b911b63490fa0d3afd5222ba8"
+SRC_URI[sha256sum] = "22d08e3989acf9ff92312b754c897d5323c6cf638e2fc12c22439924bce19cae"
 
 FILES:${PN} += " \
     ${datadir}/knotifications5 \
diff --git a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
index 1cbe9753..ba80b1da 100644
--- a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
+++ b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
@@ -30,7 +30,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "597301e6520c17131c98a98960a1e3b7827e63ab9efed0fea5340203133f1c9f"
+SRC_URI[sha256sum] = "06bb0a69faeb9991dec4a752b1f3b1798ff9bb0aa6a201d0c6615e176153504b"
 
 FILES:${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
index a3010477..a5d98fdb 100644
--- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
+++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "4669a40fe4380f65dfff509b00fe1dfd026507ae50fc5fa8daeea7b68c207798"
+SRC_URI[sha256sum] = "c0c09f4a67bce82ceb65587c95a075218f430fb6c2db01205e95c6891ef3198c"
 
 RDEPENDS:${PN} = "sddm"
 
diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
index 91a786e9..92843352 100644
--- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
+++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
@@ -35,7 +35,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "cc7978faa1c3fcf75584a09459e69e665c17514dcf59e07287e1d80aadb975bb"
+SRC_URI[sha256sum] = "0b925472ec68a6e184ec4e044d1df7f406713847c0fd7b28e94ba88adadf388d"
 
 FILES:${PN} += " \
     ${datadir}/k*5 \