diff --git a/recipes-plasma/bluedevil.inc b/recipes-plasma/bluedevil.inc
index cb207b1..07a4721 100644
--- a/recipes-plasma/bluedevil.inc
+++ b/recipes-plasma/bluedevil.inc
@@ -36,4 +36,5 @@ FILES:${PN} += " \
     ${datadir}/plasma \
     ${datadir}/remoteview \
     ${libdir}/qml \
+    ${libdir}/plugins/plasma/kcms/systemsettings/ \
 "
diff --git a/recipes-plasma/bluedevil_5.23.1.bb b/recipes-plasma/bluedevil_5.23.1.bb
deleted file mode 100644
index 36166e4..0000000
--- a/recipes-plasma/bluedevil_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/bluedevil-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "2a3f42ee03d342673ac5ab4f91fd858f5d0003b798257d6cb7304c79c40eb4bb"
-
diff --git a/recipes-plasma/bluedevil_5.24.2.bb b/recipes-plasma/bluedevil_5.24.2.bb
new file mode 100644
index 0000000..04981d7
--- /dev/null
+++ b/recipes-plasma/bluedevil_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/bluedevil-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "24d7501e65149093e17c8545199d1bcae27fe828ded65d6a20446c8fffe1fa2a"
+
diff --git a/recipes-plasma/breeze_5.23.1.bb b/recipes-plasma/breeze_5.23.1.bb
deleted file mode 100644
index 2bce68f..0000000
--- a/recipes-plasma/breeze_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/breeze-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "ac11dc5f9347d870cbe33f2452bbc738e92e9d3dfc2dc8c2f5c0896476181481"
-
diff --git a/recipes-plasma/breeze_5.24.2.bb b/recipes-plasma/breeze_5.24.2.bb
new file mode 100644
index 0000000..7b6eb0f
--- /dev/null
+++ b/recipes-plasma/breeze_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/breeze-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "5fee72b7bc88fe8d97b575f46de62037ac2f898c7a5ff024e62f1082d60984b9"
+
diff --git a/recipes-plasma/discover.inc b/recipes-plasma/discover.inc
index 4c5520d..a713ad4 100644
--- a/recipes-plasma/discover.inc
+++ b/recipes-plasma/discover.inc
@@ -34,5 +34,6 @@ inherit mime-xdg
 FILES:${PN} += " \
     ${libdir}/qml/org/kde/discovernotifier \
     ${libdir}/plasma-discover \
+    ${libdir}/plugins/plasma/kcms/systemsettings/* \
     ${datadir}/kpackage/kcms/kcm_updates \
 "
diff --git a/recipes-plasma/discover_5.23.1.bb b/recipes-plasma/discover_5.23.1.bb
deleted file mode 100644
index 8656a69..0000000
--- a/recipes-plasma/discover_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/discover-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "44255c9b1a8df70a4c710396ccbdaf1725f93694a040d4197e4bf45285e6ee71"
-
diff --git a/recipes-plasma/discover_5.24.2.bb b/recipes-plasma/discover_5.24.2.bb
new file mode 100644
index 0000000..4f35b3f
--- /dev/null
+++ b/recipes-plasma/discover_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/discover-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "24e99d349dc7992764aaa0ff311025fe116a79bfecce234c972bc21cf3d36052"
+
diff --git a/recipes-plasma/kactivitymanagerd_5.23.1.bb b/recipes-plasma/kactivitymanagerd_5.23.1.bb
deleted file mode 100644
index 9054a8c..0000000
--- a/recipes-plasma/kactivitymanagerd_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kactivitymanagerd-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "eabc518b1476f17257c6f42c986611604903aa9efc42d35fd9d3fd15839fea09"
-
diff --git a/recipes-plasma/kactivitymanagerd_5.24.2.bb b/recipes-plasma/kactivitymanagerd_5.24.2.bb
new file mode 100644
index 0000000..517ba19
--- /dev/null
+++ b/recipes-plasma/kactivitymanagerd_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kactivitymanagerd-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "a14714645797114b45c4bd0d87fe2559f4c4b5d4625e100045b25c66fd25a958"
+
diff --git a/recipes-plasma/kde-cli-tools.inc b/recipes-plasma/kde-cli-tools.inc
index cf3ab33..c95a135 100644
--- a/recipes-plasma/kde-cli-tools.inc
+++ b/recipes-plasma/kde-cli-tools.inc
@@ -39,4 +39,8 @@ inherit cmake_plasma
 inherit kdoctools
 inherit mime-xdg
 
+FILES:${PN} += " \
+    ${libdir}/plugins/plasma/kcms/systemsettings_qwidgets/kcm_filetypes.so \
+"
+
 FILES_SOLIBSDEV = ""
diff --git a/recipes-plasma/kde-cli-tools_5.23.1.bb b/recipes-plasma/kde-cli-tools_5.23.1.bb
deleted file mode 100644
index 0a7f17d..0000000
--- a/recipes-plasma/kde-cli-tools_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kde-cli-tools-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "da1a08c54b3e085916c5157e1339ccb397e41dbfd68ce3334591e0ddbed0a7e2"
-
diff --git a/recipes-plasma/kde-cli-tools_5.24.2.bb b/recipes-plasma/kde-cli-tools_5.24.2.bb
new file mode 100644
index 0000000..821b75c
--- /dev/null
+++ b/recipes-plasma/kde-cli-tools_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kde-cli-tools-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "9549c0474695df4855b66ee2196caa14a0bc3e0179920ae564d149bc5ecf6984"
+
diff --git a/recipes-plasma/kdecoration_5.23.1.bb b/recipes-plasma/kdecoration_5.23.1.bb
deleted file mode 100644
index bfabd09..0000000
--- a/recipes-plasma/kdecoration_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kdecoration-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "1587aeab3743cb426318d4639e53b81c6227d114fc96b082b897cde6a2b0c327"
-
diff --git a/recipes-plasma/kdecoration_5.24.2.bb b/recipes-plasma/kdecoration_5.24.2.bb
new file mode 100644
index 0000000..3207bcf
--- /dev/null
+++ b/recipes-plasma/kdecoration_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kdecoration-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "ac5f02324a5d64e81408c30f3c9d077da460b77278eed7f195344d3f5acc8d87"
+
diff --git a/recipes-plasma/kscreen_5.23.1.bb b/recipes-plasma/kscreen_5.23.1.bb
deleted file mode 100644
index dc61f8c..0000000
--- a/recipes-plasma/kscreen_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kscreen-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "af143f2d3b25478437ff894b0afe094a69df8dab055bba3c6311d0735f431fc9"
-
diff --git a/recipes-plasma/kscreen_5.24.2.bb b/recipes-plasma/kscreen_5.24.2.bb
new file mode 100644
index 0000000..9aa5b3c
--- /dev/null
+++ b/recipes-plasma/kscreen_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kscreen-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "f8549747eaaca0a7172e57d404207a684ef659ee107c2b2815526d5d5180f489"
+
diff --git a/recipes-plasma/kscreenlocker_5.23.1.bb b/recipes-plasma/kscreenlocker_5.23.1.bb
deleted file mode 100644
index 4ad7118..0000000
--- a/recipes-plasma/kscreenlocker_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kscreenlocker-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "a0c41353285b41372eecce77d643e3332a34a391c52fb44064498f4321abb563"
-
diff --git a/recipes-plasma/kscreenlocker_5.24.2.bb b/recipes-plasma/kscreenlocker_5.24.2.bb
new file mode 100644
index 0000000..5240a51
--- /dev/null
+++ b/recipes-plasma/kscreenlocker_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kscreenlocker-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "fcd9d5be26409819903b445d2ebe888ea2e7cba289304b80462e9d701e06d3e5"
+
diff --git a/recipes-plasma/kwayland-integration_5.23.1.bb b/recipes-plasma/kwayland-integration_5.23.1.bb
deleted file mode 100644
index 99917ad..0000000
--- a/recipes-plasma/kwayland-integration_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kwayland-integration-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "f73510f65bff5dac0b9eb1715af58f7a95f312a9dbe816d853e78a9539c10d6a"
-
diff --git a/recipes-plasma/kwayland-integration_5.24.2.bb b/recipes-plasma/kwayland-integration_5.24.2.bb
new file mode 100644
index 0000000..63eff12
--- /dev/null
+++ b/recipes-plasma/kwayland-integration_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kwayland-integration-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "fb8cab0a35b6fee268243481707613f6cea9715cda96d124a0a508e3b2a1ba93"
+
diff --git a/recipes-plasma/kwayland-server_5.23.1.bb b/recipes-plasma/kwayland-server_5.23.1.bb
deleted file mode 100644
index 47b91c9..0000000
--- a/recipes-plasma/kwayland-server_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kwayland-server-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "ebad1a6dc1bf246cab9ca8ba0a13edd578646cb333ce09303d79d78727a59d57"
-
diff --git a/recipes-plasma/kwayland-server_5.24.2.bb b/recipes-plasma/kwayland-server_5.24.2.bb
new file mode 100644
index 0000000..6b7baf8
--- /dev/null
+++ b/recipes-plasma/kwayland-server_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kwayland-server-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "147b0312fe456ca5018da641fb5758d94d55eca136d075729d322829634ee247"
+
diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc
index 60380c4..f2aae7a 100644
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2017-2020 Volker Krause <vkrause@kde.org>
 # SPDX-FileCopyrightText: 2018 Alistair Francis <alistair.francis@wdc.com>
-# SPDX-FileCopyrightText: 2020 Andreas Cord-Landwehr <cordlandwehr@kde.org>
+# SPDX-FileCopyrightText: 2020-2022 Andreas Cord-Landwehr <cordlandwehr@kde.org>
 #
 # SPDX-License-Identifier: MIT
 
@@ -10,7 +10,14 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977"
 PR = "r0"
 
+SRC_URI:append:class-native  = " \
+    file://0001-Create-artifical-packageroot-just-for-host-tools.patch \
+    file://0002-Comment-out-all-effects.patch \
+    file://0003-Install-kwin-strip-effect-metadata.patch \
+"
+
 DEPENDS = " \
+    kwin-native \
     qtdeclarative \
     qtsensors \
     qtscript \
@@ -40,15 +47,30 @@ DEPENDS = " \
     libxcb \
     xcb-util-cursor \
     fontconfig \
+    lcms \
     libepoxy \
     libinput \
+    pipewire \
+"
+
+DEPENDS:class-native = " \
+    extra-cmake-modules-native \
+    qtbase-native \
+    kpackage-native \
+    kconfig-native \
 "
 
 SRC_URI:append = " \
     file://kwinrc \
 "
 
-inherit cmake_plasma kdoctools
+inherit cmake_plasma kconfig
+
+BBCLASSEXTEND = "native"
+
+OECMAKE_SOURCEPATH:class-native = "${S}/src/effects"
+
+EXTRA_OECMAKE:append:class-target = " -DKWIN_HOST_TOOLING=${STAGING_DIR_NATIVE}/${libdir}/cmake"
 
 do_install:append() {
     # dirty workaround for aurora crash on Wayland
@@ -60,36 +82,37 @@ do_install:append() {
 
 FILES_SOLIBSDEV = ""
 FILES:${PN} += " \
+    ${datadir}/config.kcfg/*.kcfg \
+    ${datadir}/knotifications5/*.notifyrc \
+    ${datadir}/kpackage \
+    ${datadir}/krunner/dbusplugins/*.desktop \
+    ${datadir}/kservices5/*.desktop \
+    ${datadir}/kservices5/kwin/*.desktop \
+    ${datadir}/kservicetypes5/*.desktop \
+    ${datadir}/kwincompositing/qml/*.qml \
     ${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/kpackage/packagestructure/*.so \
+    ${libdir}/plugins/kwin/effects/configs/*.so \
+    ${libdir}/plugins/org.kde.kdecoration2/*.so \
+    ${libdir}/plugins/org.kde.kglobalaccel5.platforms/*.so \
     ${libdir}/plugins/org.kde.kwin.platforms/*.so \
+    ${libdir}/plugins/org.kde.kwin.scenes/*.so \
+    ${libdir}/plugins/org.kde.kwin.waylandbackends/*.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/* \
+    ${libdir}/qml/org/kde/plasma/quicksetting/nightcolor/* \
     ${libdir}/systemd/user/*.service \
-    ${datadir}/kservices5/*.desktop \
-    ${datadir}/kservices5/kwin/*.desktop \
-    ${datadir}/knotifications5/*.notifyrc \
-    ${datadir}/kservicetypes5/*.desktop \
-    ${datadir}/kwincompositing/qml/*.qml \
-    ${datadir}/config.kcfg/*.kcfg \
-    ${datadir}/kpackage \
-    ${datadir}/krunner/dbusplugins/*.desktop \
 "
 
 FILES:${PN}-dev += " \
     ${libdir}/libkwin*.so \
 "
 
-RDEPENDS:${PN} += " \
+RDEPENDS:${PN}:append:class-target = " \
     maliit-keyboard-qt5 \
     qtwayland-plugins \
     xserver-xorg-xwayland \
diff --git a/recipes-plasma/kwin_5.23.1.bb b/recipes-plasma/kwin_5.23.1.bb
deleted file mode 100644
index e89d7fe..0000000
--- a/recipes-plasma/kwin_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/kwin-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "5838d7ab84babc5bd3cb3df9f7e38fc01c98ba1bf584b6d43e4528dd03598b31"
-
diff --git a/recipes-plasma/kwin_5.24.2.bb b/recipes-plasma/kwin_5.24.2.bb
new file mode 100644
index 0000000..81f616f
--- /dev/null
+++ b/recipes-plasma/kwin_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/kwin-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "2aabb59ef884cb2fb3f53b9577d651a1c39977a482bca93d6634ed3593054411"
+
diff --git a/recipes-plasma/layer-shell-qt_5.23.1.bb b/recipes-plasma/layer-shell-qt_5.23.1.bb
deleted file mode 100644
index a93bded..0000000
--- a/recipes-plasma/layer-shell-qt_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/layer-shell-qt-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "c79c2306ee9f6a672612b37f28074609748f5570b7785d4096e5573f12fb9e0a"
-
diff --git a/recipes-plasma/layer-shell-qt_5.24.2.bb b/recipes-plasma/layer-shell-qt_5.24.2.bb
new file mode 100644
index 0000000..4cf048a
--- /dev/null
+++ b/recipes-plasma/layer-shell-qt_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/layer-shell-qt-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "eefee96cf04cb1dbaede72b50354ddc7129915f1b88c340ff206724c29620f2c"
+
diff --git a/recipes-plasma/libkscreen_5.23.1.bb b/recipes-plasma/libkscreen_5.23.1.bb
deleted file mode 100644
index 30e5319..0000000
--- a/recipes-plasma/libkscreen_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/libkscreen-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "3930d578f55e5d5be95da1f3fe298b15623afcea0a9c73005cb983589204d043"
-
diff --git a/recipes-plasma/libkscreen_5.24.2.bb b/recipes-plasma/libkscreen_5.24.2.bb
new file mode 100644
index 0000000..e5ab90a
--- /dev/null
+++ b/recipes-plasma/libkscreen_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/libkscreen-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "a64c2263a0de898a4a0e73f85949b4d3868aef87aa221d597e8c16f412103b04"
+
diff --git a/recipes-plasma/libksysguard_5.23.1.bb b/recipes-plasma/libksysguard_5.23.1.bb
deleted file mode 100644
index d80b9bc..0000000
--- a/recipes-plasma/libksysguard_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/libksysguard-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "083ddf436a9678e6e3d9c900d2c974586a313e58f60a32b7cb6600338ec78189"
-
diff --git a/recipes-plasma/libksysguard_5.24.2.bb b/recipes-plasma/libksysguard_5.24.2.bb
new file mode 100644
index 0000000..0fb285d
--- /dev/null
+++ b/recipes-plasma/libksysguard_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/libksysguard-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "13983f626906db864eda20bfa2e994ccbe4ddc534af7a052675b3475b7e9472f"
+
diff --git a/recipes-plasma/milou_5.23.1.bb b/recipes-plasma/milou_5.23.1.bb
deleted file mode 100644
index a3d89b5..0000000
--- a/recipes-plasma/milou_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/milou-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "8f91c04785af3ed86ddf1fce18fe67f5b70cabf0827750cdec119e496723ff10"
-
diff --git a/recipes-plasma/milou_5.24.2.bb b/recipes-plasma/milou_5.24.2.bb
new file mode 100644
index 0000000..e07d15d
--- /dev/null
+++ b/recipes-plasma/milou_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/milou-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "9a8c4b0561ce85f37ccd4500b715c73b9ed77aec79aa46eb2b0e04d9b94381e4"
+
diff --git a/recipes-plasma/plasma-integration_5.23.1.bb b/recipes-plasma/plasma-integration_5.23.1.bb
deleted file mode 100644
index 3bd905a..0000000
--- a/recipes-plasma/plasma-integration_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-integration-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "ca2b3487de16646bc5d2120adfd9d58cee69570a0eb64630ea075a93cdddcb71"
-
diff --git a/recipes-plasma/plasma-integration_5.24.2.bb b/recipes-plasma/plasma-integration_5.24.2.bb
new file mode 100644
index 0000000..5d5b274
--- /dev/null
+++ b/recipes-plasma/plasma-integration_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-integration-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "b6408b32e13b9713cd34f499c7aae216218a04b6c9655f37689d95f8b323f947"
+
diff --git a/recipes-plasma/plasma-phone-components.inc b/recipes-plasma/plasma-mobile.inc
similarity index 93%
rename from recipes-plasma/plasma-phone-components.inc
rename to recipes-plasma/plasma-mobile.inc
index 6e68c3d..6d27e04 100644
--- a/recipes-plasma/plasma-phone-components.inc
+++ b/recipes-plasma/plasma-mobile.inc
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2017-2020 Volker Krause <vkrause@kde.org>
 # SPDX-FileCopyrightText: 2019 Alistair Francis <alistair.francis@wdc.com>
-# SPDX-FileCopyrightText: 2020-2021 Andreas Cord-Landwehr <cordlandwehr@kde.org>
+# SPDX-FileCopyrightText: 2020-2022 Andreas Cord-Landwehr <cordlandwehr@kde.org>
 #
 # SPDX-License-Identifier: MIT
 
@@ -26,6 +26,7 @@ DEPENDS = " \
     kwin \
     gstreamer1.0 \
     modemmanager-qt \
+    networkmanager-qt \
 "
 
 inherit cmake_plasma
@@ -35,6 +36,7 @@ FILES:${PN} += " \
     ${libdir}/qml/org/kde/plasma/private/mobileshell/* \
     ${libdir}/qml/org/kde/plasma/private/kpeoplehelper/* \
     ${libdir}/qml/org/kde/plasma/private/mobilehomescreencomponents/* \
+    ${libdir}/qml/org/kde/plasma/quicksetting/nightcolor/* \
     ${libdir}/qml/org/kde/plasma/mm/* \
     ${datadir}/kpackage/genericqml/org.kde.phone.dialer/* \
     ${datadir}/plasma/shells/org.kde.plasma.phone/* \
diff --git a/recipes-plasma/plasma-mobile_5.24.2.bb b/recipes-plasma/plasma-mobile_5.24.2.bb
new file mode 100644
index 0000000..1937576
--- /dev/null
+++ b/recipes-plasma/plasma-mobile_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-mobile-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "8a5811275cec6021219fd341f6ec673e0038a0c8ac5e14f8a35869b3263c1322"
+
diff --git a/recipes-plasma/plasma-nano_5.23.1.bb b/recipes-plasma/plasma-nano_5.23.1.bb
deleted file mode 100644
index ac58306..0000000
--- a/recipes-plasma/plasma-nano_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-nano-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "0a980893e7b928780ad9ff80b45e1c8706ce779e155fb43f664b0f3ea5086df9"
-
diff --git a/recipes-plasma/plasma-nano_5.24.2.bb b/recipes-plasma/plasma-nano_5.24.2.bb
new file mode 100644
index 0000000..7cadef9
--- /dev/null
+++ b/recipes-plasma/plasma-nano_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-nano-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "bb003d9b63b114142b1e913634822eca23a8cb776221f42799b6e5063a15ad88"
+
diff --git a/recipes-plasma/plasma-nm_5.23.1.bb b/recipes-plasma/plasma-nm_5.23.1.bb
deleted file mode 100644
index 8f944b3..0000000
--- a/recipes-plasma/plasma-nm_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-nm-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "d1d578c0386c2506f2cf361cd81f7060e6edcc7546d1716fb7299e34332f5063"
-
diff --git a/recipes-plasma/plasma-nm_5.24.2.bb b/recipes-plasma/plasma-nm_5.24.2.bb
new file mode 100644
index 0000000..8477de3
--- /dev/null
+++ b/recipes-plasma/plasma-nm_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-nm-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "114ead32c90d521ae0504baee971da71a2c0f1a37d25bbf1868012ed030048cb"
+
diff --git a/recipes-plasma/plasma-pa_5.23.1.bb b/recipes-plasma/plasma-pa_5.23.1.bb
deleted file mode 100644
index 78486ba..0000000
--- a/recipes-plasma/plasma-pa_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-pa-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "a79f1971a5acdeccb9e7363560b1828f35cac4faeb3c8036d8cdd1243565a57e"
-
diff --git a/recipes-plasma/plasma-pa_5.24.2.bb b/recipes-plasma/plasma-pa_5.24.2.bb
new file mode 100644
index 0000000..653fc7e
--- /dev/null
+++ b/recipes-plasma/plasma-pa_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-pa-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "015dff4f7561a0fdca28a0d49e98df3bb112300c9e29588f685e58ae037603e6"
+
diff --git a/recipes-plasma/plasma-phone-components_5.23.1.bb b/recipes-plasma/plasma-phone-components_5.23.1.bb
deleted file mode 100644
index ad1d555..0000000
--- a/recipes-plasma/plasma-phone-components_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-phone-components-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "82d6798fb17cb67013fbc10aa79cc9b6c49687bb1a139c80ad4eff2ccbda9c9c"
-
diff --git a/recipes-plasma/plasma-systemmonitor.inc b/recipes-plasma/plasma-systemmonitor.inc
index 504bcc0..cd4a151 100644
--- a/recipes-plasma/plasma-systemmonitor.inc
+++ b/recipes-plasma/plasma-systemmonitor.inc
@@ -29,6 +29,7 @@ inherit kdoctools
 
 FILES:${PN} += " \
     ${datadir}/ksysguard/sensorfaces/ \
+    ${datadir}/plasma/kinfocenter/externalmodules/ \
     ${libdir}/qml/org/kde/ksysguard/table/ \
     ${libdir}/qml/org/kde/ksysguard/page/ \
 "
diff --git a/recipes-plasma/plasma-systemmonitor_5.23.1.bb b/recipes-plasma/plasma-systemmonitor_5.23.1.bb
deleted file mode 100644
index dd7f655..0000000
--- a/recipes-plasma/plasma-systemmonitor_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-systemmonitor-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "c8212484044840119f939ff2fcacea6a3d02c25a171a75c68145cf88be9c19cf"
-
diff --git a/recipes-plasma/plasma-systemmonitor_5.24.2.bb b/recipes-plasma/plasma-systemmonitor_5.24.2.bb
new file mode 100644
index 0000000..ccc7e31
--- /dev/null
+++ b/recipes-plasma/plasma-systemmonitor_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-systemmonitor-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "16902047b659cbe7e3452e527699aa8891546323a54efc60d0fdcfac8fe0ccd4"
+
diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc
index 1733e19..d87860b 100644
--- a/recipes-plasma/plasma-workspace.inc
+++ b/recipes-plasma/plasma-workspace.inc
@@ -43,6 +43,7 @@ DEPENDS = " \
     kwin \
     libkscreen \
     libksysguard \
+    libqalculate \
     libxft \
     networkmanager-qt \
     phonon \
@@ -75,6 +76,7 @@ FILES:${PN} += " \
     ${datadir}/ksplash/Themes \
     ${datadir}/kstyle/themes/*.themerc \
     ${datadir}/plasma/look-and-feel \
+    ${datadir}/plasma/avatars \
     ${datadir}/plasma/plasmoids \
     ${datadir}/plasma/services/*.operations \
     ${datadir}/plasma/shareprovider \
@@ -85,6 +87,9 @@ FILES:${PN} += " \
     ${datadir}/xsessions/*.desktop \
     ${libdir}/libkrdb.so \
     ${libdir}/plugins/plasmacalendarplugins \
+    ${libdir}/plugins/kf5/krunner/kcms/kcm_krunner_kill.so \
+    ${libdir}/plugins/plasma/kcms/systemsettings/*.so \
+    ${libdir}/plugins/plasma/kcms/systemsettings_qwidgets/kcm_fontinst.so \
     ${libdir}/qml/org/kde \
 "
 
@@ -99,6 +104,8 @@ FILES:${PN}-dev += " \
     ${libdir}/libweather_ion.so \
 "
 
+INSANE_SKIP:${PN} = "dev-so"
+
 RDEPENDS:${PN} += " \
     kinit \
     kquickcharts \
diff --git a/recipes-plasma/plasma-workspace_5.23.1.bb b/recipes-plasma/plasma-workspace_5.23.1.bb
deleted file mode 100644
index 4dd6e62..0000000
--- a/recipes-plasma/plasma-workspace_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "fbf979f857b3cdcc8fe6dc45c3a1d9dfe297e1120aa551a02faa339abb81efad"
-
diff --git a/recipes-plasma/plasma-workspace_5.24.2.bb b/recipes-plasma/plasma-workspace_5.24.2.bb
new file mode 100644
index 0000000..ec5bf2a
--- /dev/null
+++ b/recipes-plasma/plasma-workspace_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/plasma-workspace-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "e7fd2ad7c067710401f7322789ce796c3ad5e02a3813bdfb84ebd5dbd8787d11"
+
diff --git a/recipes-plasma/polkit-kde-agent-1_5.23.1.bb b/recipes-plasma/polkit-kde-agent-1_5.23.1.bb
deleted file mode 100644
index d1036a0..0000000
--- a/recipes-plasma/polkit-kde-agent-1_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/polkit-kde-agent-1-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "416617237e045567daf830e23c0d3f32f3b4d9891e9a61888f735f494ccbf529"
-
diff --git a/recipes-plasma/polkit-kde-agent-1_5.24.2.bb b/recipes-plasma/polkit-kde-agent-1_5.24.2.bb
new file mode 100644
index 0000000..acf54ae
--- /dev/null
+++ b/recipes-plasma/polkit-kde-agent-1_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/polkit-kde-agent-1-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "43685eccd228edf74c7fee80f6cafb217159b540b487cda067c18e3ec6b7ba7d"
+
diff --git a/recipes-plasma/powerdevil_5.23.1.bb b/recipes-plasma/powerdevil_5.23.1.bb
deleted file mode 100644
index 9445959..0000000
--- a/recipes-plasma/powerdevil_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/powerdevil-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "721a5938d6cb0439943fa912b9f360b9b563a91ceff138869636f2ef45edc096"
-
diff --git a/recipes-plasma/powerdevil_5.24.2.bb b/recipes-plasma/powerdevil_5.24.2.bb
new file mode 100644
index 0000000..dc4ce44
--- /dev/null
+++ b/recipes-plasma/powerdevil_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/powerdevil-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "8c742e057f19e3852ed6403e7a3f86fa70a478ae0c6c30a492491a5b02b7cd8d"
+
diff --git a/recipes-plasma/systemsettings_5.23.1.bb b/recipes-plasma/systemsettings_5.23.1.bb
deleted file mode 100644
index fc87a05..0000000
--- a/recipes-plasma/systemsettings_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/systemsettings-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "7cd451319125c7b56c6f13c65462136179c39f607cc4d4e66b90079a72df6e54"
-
diff --git a/recipes-plasma/systemsettings_5.24.2.bb b/recipes-plasma/systemsettings_5.24.2.bb
new file mode 100644
index 0000000..8f92259
--- /dev/null
+++ b/recipes-plasma/systemsettings_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/systemsettings-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "b31e3bbd0ed6c69718341e7290f8a8888e972ca3c1eae10f2a5da912b17d2e5c"
+
diff --git a/recipes-plasma/xdg-desktop-portal-kde_5.23.1.bb b/recipes-plasma/xdg-desktop-portal-kde_5.23.1.bb
deleted file mode 100644
index d7ca462..0000000
--- a/recipes-plasma/xdg-desktop-portal-kde_5.23.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRC_URI = "https://download.kde.org/stable/plasma/5.23.1/xdg-desktop-portal-kde-5.23.1.tar.xz"
-SRC_URI[sha256sum] = "f7664cc4c0ea7fcd93a15d35fc5f5b5f5c8910c07204fad35783f9d3acc1f2ae"
-
diff --git a/recipes-plasma/xdg-desktop-portal-kde_5.24.2.bb b/recipes-plasma/xdg-desktop-portal-kde_5.24.2.bb
new file mode 100644
index 0000000..119842a
--- /dev/null
+++ b/recipes-plasma/xdg-desktop-portal-kde_5.24.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "https://download.kde.org/stable/plasma/5.24.2/xdg-desktop-portal-kde-5.24.2.tar.xz"
+SRC_URI[sha256sum] = "0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3"
+