diff --git a/classes/kde-plasma.bbclass b/classes/kde-plasma.bbclass
index a5f0500d..ad01617a 100644
--- a/classes/kde-plasma.bbclass
+++ b/classes/kde-plasma.bbclass
@@ -1,6 +1,6 @@
 inherit kde-base
 
-PLASMA_VERSION = "5.19.5"
+PLASMA_VERSION = "5.20.4"
 
 SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
 
diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb
index a9859680..2126f50f 100644
--- a/recipes-kde/packagegroups/plasma-world.bb
+++ b/recipes-kde/packagegroups/plasma-world.bb
@@ -58,7 +58,6 @@ UNTIER = " \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "powerdevil", "",d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sddm-kcm", "",d)} \
     systemsettings \
-    user-manager \
 "
 
 RDEPENDS_${PN} = " \
diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
index dd03f6f2..26210dd8 100644
--- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
+++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
@@ -1,6 +1,9 @@
 SUMMARY = "Plugin based library to create window decorations"
-LICENSE = "LGPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+LICENSE = "LGPL-2.0 & LGPL-3.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"
 
 inherit kde-plasma gettext
 
@@ -9,4 +12,4 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "ce3ef7bb09405645699939cc3481d1fad67b1c5b758b64adfc4d81e5ffb1c85e"
+SRC_URI[sha256sum] = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8"
diff --git a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
index 26b15ec3..fbec42a9 100644
--- a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
+++ b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "eec1a0996812d89b98e93a3a2dec15527fd553c2c9c608ad7f1858f01749c3b0"
+SRC_URI[sha256sum] = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34"
 
 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 10894f9d..748e2014 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -8,9 +8,10 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma features_check gettext
+inherit kde-plasma features_check gettext gtk-icon-cache mime-xdg
 
 DEPENDS += " \
+    qtwayland-native \
     kpackage-native \
     kdoctools-native \
     sonnet-native \
@@ -49,7 +50,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "490329e08e63016edd696a9132bf80b76ef51dacf53308b865d2e27b67ce8127"
+SRC_URI[sha256sum] = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9"
 SRC_URI += "file://0001-align-phonon-path.patch"
 
 # REVISIT
@@ -57,20 +58,13 @@ FILES_${PN} += " \
     ${datadir}/config.kcfg \
     ${datadir}/dbus-1 \
     ${datadir}/desktop-directories \
-    ${datadir}/kconf_update \
-    ${datadir}/kdevappwizard \
-    ${datadir}/kio_desktop \
-    ${datadir}/k*5 \
-    ${datadir}/knsrcfiles \
-    ${datadir}/kpackage \
-    ${datadir}/ksplash \
-    ${datadir}/kstyle \
+    ${datadir}/k* \
     ${datadir}/plasma \
+    ${datadir}/polkit-1 \
     ${datadir}/sddm \
     ${datadir}/solid \
     ${datadir}/wayland-sessions \
     ${datadir}/xsessions \
-    ${datadir}/kglobalaccel \
     \
     ${libdir}/libkdeinit5*.so \
     ${libdir}/kconf_update_bin \
@@ -85,6 +79,7 @@ FILES_SOLIBSDEV = " \
     ${libdir}/libplasma-geolocation-interface${SOLIBSDEV} \
     ${libdir}/libtaskmanager${SOLIBSDEV} \
     ${libdir}/libweather_ion${SOLIBSDEV} \
+    ${libdir}/libkfontinst*${SOLIBSDEV} \
 "
 
 
diff --git a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb
index b2ac6536..b121bcc1 100644
--- a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb
+++ b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb
@@ -25,12 +25,13 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "e857e3c73a3d6c08bb44506f35a8359b480e960d32ae189b9b5bddcbcf5ffe2d"
+SRC_URI[sha256sum] = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129"
 
 FILES_${PN} += " \
     ${datadir}/bluedevilwizard \
     ${datadir}/mime \
     ${datadir}/k*5 \
+    ${datadir}/kpackage \
     ${datadir}/plasma \
     ${datadir}/remoteview \
     ${OE_QMAKE_PATH_PLUGINS} \
diff --git a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
index 41f65064..1ac140e3 100644
--- a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
+++ b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb
@@ -1,7 +1,8 @@
 SUMMARY = "Widget theme for GTK 2 and 3"
-LICENSE = "LGPL-2.1"
+LICENSE = "BSD-3-Clause & LGPL-2.1"
 LIC_FILES_CHKSUM = " \
-    file://COPYING.LIB;md5=1ed3208c1cce3d1926ccfc5bf65db050 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
 "
 
 inherit kde-plasma python3native
@@ -9,7 +10,7 @@ inherit kde-plasma python3native
 DEPENDS += "sassc-native cairo breeze python3-pycairo-native"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "5213b2f6815e542cda6bf9ae153636285e178962c6a59ff9ab4fe5c07dc256c8"
+SRC_URI[sha256sum] = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d"
 
 FILES_${PN} += " \
     ${datadir}/kconf_update \
diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb
index 0a065818..71b09dc2 100644
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -1,7 +1,11 @@
 SUMMARY = "Artwork, styles and assets for the Breeze visual style for the Plasma Desktop"
-LICENSE = "GPL-2.0"
+LICENSE = "BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & MIT"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "
 
 inherit kde-plasma gettext
@@ -27,7 +31,7 @@ DEPENDS += "\
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "61116665a534a0acd833f9bb499dbe983bb07088c0006988fbd929f60f0ff336"
+SRC_URI[sha256sum] = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f"
 
 FILES_${PN} += " \
     ${datadir}/color-schemes \
diff --git a/recipes-kde/plasma/untier/discover/discover.bb b/recipes-kde/plasma/untier/discover/discover.bb
index bd0b9df9..48dc4384 100644
--- a/recipes-kde/plasma/untier/discover/discover.bb
+++ b/recipes-kde/plasma/untier/discover/discover.bb
@@ -1,14 +1,20 @@
 SUMMARY = "KDE and Plasma resources management GUI"
-LICENSE = "GPL-3.0 & GFDL-1.2"
+LICENSE = "BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0 & MIT"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=6679dc9ea294d0d265902ab8c9936a9c \
-    file://COPYING.GFDL;md5=ad1419ecc56e060eccf8184a87c4285f \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    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-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 \
 "
 
 inherit kde-plasma gtk-icon-cache mime-xdg
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "6f989060450fbbfa596424fa6d3c4d0c5ea6ab532d09e58a935a109c628a3f82"
+SRC_URI[sha256sum] = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012"
 
 DEPENDS += " \
     qtdeclarative \
@@ -36,4 +42,4 @@ FILES_${PN} += " \
     ${OE_QMAKE_PATH_QML} \
 "
 
-RDEPENDS_${PN} += "python3 kirigami"
+RDEPENDS_${PN} += "python3-core kirigami"
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 98b2b485..4ec9409d 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
@@ -27,7 +27,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "07314832aee0b424451120e0aad59fdaab96ba713279dc1937cf36ef9b5389c7"
+SRC_URI[sha256sum] = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3"
 
 # 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 26c2e873..265cc0dc 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
@@ -1,8 +1,11 @@
 SUMMARY = "GTK2 and GTK3 Configurator for KDE"
-LICENSE = "GPL-2.0 & LGPL-2.1"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0"
 LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
 "
 
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -10,21 +13,23 @@ REQUIRED_DISTRO_FEATURES = "x11"
 inherit kde-plasma features_check gettext
 
 DEPENDS += " \
+    sassc-native \
     gtk+ \
     gtk+3 \
     gsettings-desktop-schemas \
-    ki18n \
     kauth-native \
     kconfig-native \
-    kconfigwidgets \
     kcoreaddons-native \
+    ki18n \
+    kconfigwidgets \
     knewstuff \
     karchive \
     kcmutils \
+    kdecoration \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "e9b79917994a18001691ce675d5f2e95367c872694d82540fb245ab6e57035a3"
+SRC_URI[sha256sum] = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1"
 
 CFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
 CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
@@ -32,6 +37,7 @@ CXXFLAGS += "-isystem ${STAGING_INCDIR}/harfbuzz"
 FILES_${PN} += " \
     ${datadir}/kcm-gtk-module \
     ${datadir}/kconf_update \
+    ${datadir}/themes \
     ${libdir}/kconf_update_bin \
     ${libdir}/gtk-3.0/modules \
     ${OE_QMAKE_PATH_PLUGINS} \
diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
index 7c76659b..dc9ec714 100644
--- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
+++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
@@ -34,7 +34,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "659e10b553c7db1abd488f77c43a919046f5e7f29126972926afe1350f93ff23"
+SRC_URI[sha256sum] = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7"
 
 FILES_${PN} += " \
     ${datadir}/icons \
diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb
index fb3ddc3e..47d36fc0 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] = "d6e70e2638c65283895ead3791957853553d02ee864b2f928c3b0df4611ca023"
+SRC_URI[sha256sum] = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41"
 
 FILES_${PN} += " \
     ${datadir}/kgamma \
diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
index 5046f173..960863a6 100644
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -31,7 +31,7 @@ DEPENDS += "\
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "568cb61eb385a3776d96b21aa77188377b02e56e3bf46f9d9ffddb83a9b31bda"
+SRC_URI[sha256sum] = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648"
 
 FILES_${PN} += " \
     ${datadir}/kservices5 \
diff --git a/recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch b/recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch
index 24c43c21..2c64fcf7 100644
--- a/recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch
+++ b/recipes-kde/plasma/untier/kinfocenter/files/0001-fix-build-in-x11-less-environments.patch
@@ -46,12 +46,12 @@ index ab45779..2e05799 100644
  find_library(DL_LIBRARY dl)
  if (DL_LIBRARY)
 diff --git a/Modules/opengl/opengl.cpp b/Modules/opengl/opengl.cpp
-index 340af6d..e03973d 100644
+index 2d9cfce..a73f865 100644
 --- a/Modules/opengl/opengl.cpp
 +++ b/Modules/opengl/opengl.cpp
-@@ -39,9 +39,12 @@
+@@ -40,9 +40,12 @@
  #include <KLocalizedString>
- #include <kmessagebox.h>
+ #include <KMessageBox>
  
 +#include <config-X11.h>
 +#if HAVE_X11
@@ -62,7 +62,7 @@ index 340af6d..e03973d 100644
  
  #include <openglconfig.h>
  
-@@ -783,6 +786,7 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
+@@ -798,6 +801,7 @@ static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDire
  #endif
  
  #if KCM_HAVE_EGL
@@ -70,7 +70,7 @@ index 340af6d..e03973d 100644
  static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetItem *l1, QTreeWidgetItem *after)
  {
     Window win;
-@@ -898,6 +902,7 @@ static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetIte
+@@ -913,6 +917,7 @@ static QTreeWidgetItem *get_gl_info_egl(Display *dpy, int scrnum, QTreeWidgetIte
     return result;
  
  }
@@ -78,7 +78,7 @@ index 340af6d..e03973d 100644
  
  static QTreeWidgetItem *get_gl_info_egl_qt(QTreeWidgetItem *l1, QTreeWidgetItem *after, QSurfaceFormat::OpenGLContextProfile profile, const QString &title)
  {
-@@ -943,7 +948,9 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
+@@ -958,7 +963,9 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
  {
      QTreeWidgetItem *l1, *l2 = nullptr;
  
@@ -88,7 +88,7 @@ index 340af6d..e03973d 100644
      static bool isWayland = QGuiApplication::platformName().contains(QLatin1String("wayland"));
  
      QTreeWidgetItem *header = new QTreeWidgetItem();
-@@ -955,6 +962,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
+@@ -970,6 +977,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
  
      l1 = new QTreeWidgetItem(treeWidget);
  
@@ -96,7 +96,7 @@ index 340af6d..e03973d 100644
      if (isX11) {
          char *displayName = nullptr;
          Display *dpy;
-@@ -1000,6 +1008,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
+@@ -1015,6 +1023,7 @@ bool GetInfo_OpenGL(QTreeWidget *treeWidget)
  #endif
          XCloseDisplay(dpy);
      }
diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
index 3f002b2b..94ec609e 100644
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -39,7 +39,7 @@ DEPENDS += " \
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)}"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "ffae6f6fc311cedfac2b380dcbc9f15588952cbcd66b144f4ae717801cb2bc31"
+SRC_URI[sha256sum] = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3"
 SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch"
 
 FILES_${PN} += " \
diff --git a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
index 5dd689c8..f555a350 100644
--- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
+++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
@@ -30,7 +30,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "f4701c74c304d46f5146943aa297300fb38a9c3b1efad39d4fbf3238d49989f6"
+SRC_URI[sha256sum] = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b"
 
 # 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 892daea9..244ae000 100644
--- a/recipes-kde/plasma/untier/kscreen/kscreen.bb
+++ b/recipes-kde/plasma/untier/kscreen/kscreen.bb
@@ -29,7 +29,7 @@ DEPENDS += "\
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "0d72c687a405358e6aa6b388a648134e8e9236b7ed60e36a31068960d07b56e8"
+SRC_URI[sha256sum] = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c"
 
 FILES_${PN} += " \
     ${datadir}/k*_kscreen \
diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
index e13113cd..67cfbfbf 100644
--- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
+++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
@@ -29,7 +29,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "b13b2081971db1347d6a77dec416725995ca20a5b7bf05f21c72a68e15d6a5b9"
+SRC_URI[sha256sum] = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126"
 SRC_URI += "file://kde.pam"
 
 do_install_append() {
@@ -41,6 +41,7 @@ FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/kconf_update \
     ${datadir}/k*5 \
+    ${datadir}/kpackage \
     ${datadir}/plasma \
     ${datadir}/ksmserver \
     ${sysconfdir} \
diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb
index 2ca6daf7..329772c1 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] = "51c7dbcc434fb993ae756ce6ef8bf7511033617cc3367478382e1490b6505bcc"
+SRC_URI[sha256sum] = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218"
diff --git a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb
index ace39481..cf4f1369 100644
--- a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb
+++ b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb
@@ -26,7 +26,7 @@ DEPENDS += " \
 DEPENDS += "lmsensors"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "e1a66dc9750482ada19da5d3e9ec06893f859930f0e8e5a910a5751e9f267c47"
+SRC_URI[sha256sum] = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4"
 
 # do not move so-libs to -dev package
 FILES_SOLIBSDEV = ""
diff --git a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
index 212e874e..1dd464f1 100644
--- a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
+++ b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb
@@ -15,7 +15,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "788aed97654b82b3512870dbf2b0d0f521503631d094bba07a7eff1125a7916f"
+SRC_URI[sha256sum] = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9"
 SRC_URI += "file://0001-use-pkgconfig-to-find-libgcrypt.patch"
 
 EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}"
diff --git a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
index 746fcc2f..7b9aa6c8 100644
--- a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
+++ b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "6d1bed734cd256604736417846f891abad9bd7c2a45527fc6fc10560322c8a14"
+SRC_URI[sha256sum] = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d"
 
 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 0d40b859..a12ae3f8 100644
--- a/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb
+++ b/recipes-kde/plasma/untier/kwayland-server/kwayland-server.bb
@@ -12,11 +12,12 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "50fd9c9f68fd514dfd1ad05e65c8767afa154a3eed792f335214eee188c8541a"
+SRC_URI[sha256sum] = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44"
 
 do_configure_append() {
     # adjust path to protocol sources in sysroot
     # once there are more consumers of plasma-wayland-protocols we might need
     # to find another solution
     sed -i 's: ${datadir}/plasma-wayland-protocols: ${STAGING_DATADIR}/plasma-wayland-protocols:g' ${B}/build.ninja
+    sed -i 's: ${datadir}/wayland/wayland.xml: ${STAGING_DATADIR}/wayland/wayland.xml:g' ${B}/build.ninja
 }
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index 3e618c6b..f0177bae 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -1,12 +1,24 @@
 SUMMARY = "KDE's window manager"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & GPL-2.0 & GPL-2.0+ & GPL-3.0 & GPL-3.0+ & LGPL-2.0 & LGPL-2.0+ & LGPL-2.1 & LGPL-3.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \
+    file://LICENSES/LGPL-2.0-only.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7 \
+    file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \
+    file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \
+"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 inherit kde-plasma features_check gettext
 
 DEPENDS += " \
+    qtwayland-native \
     libinput \
     qtsensors \
     fontconfig \
@@ -49,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] = "36afa37b773d31c0bcb8f4e32fa1f06cc33e15ad00e729ba36f120bbe034903b"
+SRC_URI[sha256sum] = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a"
 SRC_URI += "file://0001-Make-building-of-QPA-wayland-plugin-an-option.patch"
 
 # pure X11 environments fail to build wayland plugin
@@ -66,6 +78,7 @@ FILES_${PN} += " \
     ${datadir}/knsrcfiles \
     ${datadir}/kpackage \
     ${datadir}/icons \
+    ${systemd_user_unitdir} \
     ${OE_QMAKE_PATH_PLUGINS} \
     ${OE_QMAKE_PATH_QML} \
     ${libdir}/kconf_update_bin \
diff --git a/recipes-kde/plasma/untier/kwrited/files/0001-fix-build-for-qtbase-without-session-management.patch b/recipes-kde/plasma/untier/kwrited/files/0001-fix-build-for-qtbase-without-session-management.patch
deleted file mode 100644
index b661a962..00000000
--- a/recipes-kde/plasma/untier/kwrited/files/0001-fix-build-for-qtbase-without-session-management.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a5d00be3accdbc1cecd4174c74c9876293b83e3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 4 Jul 2018 22:01:37 +0200
-Subject: [PATCH] fix build for qtbase without session management
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- kwrited.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kwrited.cpp b/kwrited.cpp
-index 1df1f2c..b77cd25 100644
---- a/kwrited.cpp
-+++ b/kwrited.cpp
-@@ -73,12 +73,14 @@ int main(int argc, char **argv)
-     QApplication::setDesktopSettingsAware(false);
-     QApplication a(argc, argv);
-     KAboutData::setApplicationData(aboutData());
-+#ifndef QT_NO_SESSIONMANAGER
-     QGuiApplication::setFallbackSessionManagementEnabled(false);
-     auto disableSessionManagement = [](QSessionManager &sm) {
-             sm.setRestartHint(QSessionManager::RestartNever);
-     };
-     QObject::connect(&a, &QGuiApplication::commitDataRequest, disableSessionManagement);
-     QObject::connect(&a, &QGuiApplication::saveStateRequest, disableSessionManagement);
-+#endif
- 
-     KWrited w;
-     return a.exec();
--- 
-2.14.3
-
diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb
index 27d3f440..826b7ed4 100644
--- a/recipes-kde/plasma/untier/kwrited/kwrited.bb
+++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb
@@ -16,8 +16,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "c934d9c85581db575da0559713f1c0bba0541749ea36a51f9cbce7454c2af4db"
-SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
+SRC_URI[sha256sum] = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2"
 
 FILES_${PN} += " \
     ${datadir}/knotifications5 \
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index fe7e16a0..e5bfefb7 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -10,7 +10,7 @@ inherit kde-plasma
 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}"
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "11351cbed924264c6ccd8b95bd7fcaeed3477abb31e962894b0630ef41bdc165"
+SRC_URI[sha256sum] = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d"
 SRC_URI += "file://0001-fix-configuration-build-on-x-less-systems.patch"
 
 FILES_${PN} += " \
diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
index 87f4c622..ef1e0112 100644
--- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
+++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
@@ -28,7 +28,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "d8adb311dae1a699a3fd3fbdc9e6cdde037503ca303b70f12d33b985ee80a0cd"
+SRC_URI[sha256sum] = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb
index d33bc7db..26790d26 100644
--- a/recipes-kde/plasma/untier/milou/milou.bb
+++ b/recipes-kde/plasma/untier/milou/milou.bb
@@ -23,7 +23,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "edc6e5c646a98f6f3eada802995c1308c84a5ae7aef467e9d4ce1deaf8a9040e"
+SRC_URI[sha256sum] = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb
index 81ca144a..84e4730a 100644
--- a/recipes-kde/plasma/untier/oxygen/oxygen.bb
+++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb
@@ -25,7 +25,7 @@ DEPENDS += " \
 
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "4217d4da0f851d6e3fc25cdaa3f3123611e5e89d676ba33fa1c0fd02cddb0c35"
+SRC_URI[sha256sum] = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[settings] = "-DBUILD_OXYGEN_SETTINGS=ON,-DBUILD_OXYGEN_SETTINGS=OFF,kcmutils"
diff --git a/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb b/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb
index a2e94618..d4fe514c 100644
--- a/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb
+++ b/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING-GPL3;md5=d32239bcb673463ab874e80d47fae504"
 inherit kde-plasma gettext
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "29cb30b86f9f25857ba7e67bcb892e9a1dabfd4eec1767b0c4ca0a1400d61dcf"
+SRC_URI[sha256sum] = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4"
 
 DEPENDS += " \
     kauth-native \
diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
index d6da2f78..71f3e610 100644
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -50,7 +50,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "c63e1c81edc438656f9159e235be31e3b1b11a3f8ecbe5b97b21fcc91eb71a70"
+SRC_URI[sha256sum] = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355"
 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-integration/plasma-integration.bb b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
index 40ecff92..6cbcaffd 100644
--- a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
+++ b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
@@ -26,7 +26,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "f7fdd854e78e366a310116ef190bd7bed42df15a059d8ad75b763cbcebfb6389"
+SRC_URI[sha256sum] = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299"
 
 FILES_${PN} += " \
     ${datadir}/kconf_update \
diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
index e6c01967..961207a7 100644
--- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
+++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb
@@ -45,7 +45,7 @@ DEPENDS += " \
 # MobileBroadbandProviderInfo
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "433fe0329bacaede666d4d0962c5dedf6b4449f7c7ad08870ae9554ad64f2bb9"
+SRC_URI[sha256sum] = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf"
 
 # 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 11b04422..35f69b55 100644
--- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
+++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb
@@ -25,7 +25,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "b00eb9bc7c7bd35f3ae78f58522cea8d1dd86b9b20585dff83fb93ef64af91d8"
+SRC_URI[sha256sum] = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3"
 
 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 a623d3e5..5872ca96 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
@@ -21,7 +21,7 @@ DEPENDS += " \
 inherit kde-plasma gettext
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "408a242f502ad5a9cf5eaaeb5b306353b5aae28a69fee9bcc047d5268ee54a02"
+SRC_URI[sha256sum] = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e"
 
 FILES_${PN} += " \
     ${datadir}/kservices5 \
diff --git a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
index 62672c21..d86f2870 100644
--- a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
+++ b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma gtk-icon-cache
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "7f81321f32f3784683fa7d9511dca9bfba70a7a9181a33e832d864c639b05204"
+SRC_URI[sha256sum] = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c"
 
 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 728377c5..7b6090c5 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] = "4aeec36035356cca71c0966e9d7dbc7d9fca6be4c27abd990f0fa954a91374f9"
+SRC_URI[sha256sum] = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808"
 
 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 4550b20c..2f3aca05 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
@@ -23,7 +23,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "076129f450a82780f354d7ec18300094db3f7233cb52f4e57298b973750adb30"
+SRC_URI[sha256sum] = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61"
 SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"
 
 FILES_${PN} += "${datadir}/knotifications5"
diff --git a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb
index 517a5735..bc1d883e 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] = "d15f013c50928097f6b719aca46ec2a93a997dcbb7584bcb09f18015cca8ac1a"
+SRC_URI[sha256sum] = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d"
 
 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 816d3170..5cab884f 100644
--- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
+++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
@@ -22,7 +22,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "3ba2c6821fc847fca2cb8123748bf05cdd9c45557a0ecab5dc43a37a5ebde738"
+SRC_URI[sha256sum] = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e"
 
 RDEPENDS_${PN} = "sddm"
 
diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
index e4d32bc2..e828fa50 100644
--- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
+++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb
@@ -33,7 +33,7 @@ DEPENDS += " \
 "
 
 PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "ba8fdc2b8c861e7271bad7f6c5cdb92b0c2eee08ef81b86e28bba064259e2ff9"
+SRC_URI[sha256sum] = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/plasma/untier/user-manager/user-manager.bb b/recipes-kde/plasma/untier/user-manager/user-manager.bb
deleted file mode 100644
index b4d3fcf3..00000000
--- a/recipes-kde/plasma/untier/user-manager/user-manager.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "A simple system settings module to manage the users of your system"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = " \
-    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-"
-
-inherit kde-plasma gettext
-
-DEPENDS += " \
-    kauth-native \
-    kconfig-native \
-    kcoreaddons-native \
-    libpwquality \
-    kdelibs4support \
-    kcmutils \
-"
-
-PV = "${PLASMA_VERSION}"
-SRC_URI[sha256sum] = "39260b2575f6287c8086984417bba18682ca2ba3840d93f95667d0d2faa461cc"
-
-FILES_${PN} += " \
-    ${datadir}/kservices5 \
-    ${OE_QMAKE_PATH_PLUGINS} \
-"