diff --git a/recipes-application/base/kdialog_20.12.0.bb b/recipes-application/base/kdialog_21.04.2.bb
similarity index 100%
rename from recipes-application/base/kdialog_20.12.0.bb
rename to recipes-application/base/kdialog_21.04.2.bb
diff --git a/recipes-application/base/konsole_20.12.0.bb b/recipes-application/base/konsole_21.04.2.bb
similarity index 100%
rename from recipes-application/base/konsole_20.12.0.bb
rename to recipes-application/base/konsole_21.04.2.bb
diff --git a/recipes-application/edu/blinken.inc b/recipes-application/edu/blinken.inc
index d51882e..903bfff 100644
--- a/recipes-application/edu/blinken.inc
+++ b/recipes-application/edu/blinken.inc
@@ -6,7 +6,7 @@ SUMMARY = "Blinken"
 DESCRIPTION = "Memory Enhancement Game"
 HOMEPAGE = "https://edu.kde.org/blinken/"
 LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881"
 PR = "r0"
 
 DEPENDS += " \
diff --git a/recipes-application/edu/blinken_20.12.0.bb b/recipes-application/edu/blinken_21.04.2.bb
similarity index 100%
rename from recipes-application/edu/blinken_20.12.0.bb
rename to recipes-application/edu/blinken_21.04.2.bb
diff --git a/recipes-application/edu/kanagram_20.12.0.bb b/recipes-application/edu/kanagram_21.04.2.bb
similarity index 100%
rename from recipes-application/edu/kanagram_20.12.0.bb
rename to recipes-application/edu/kanagram_21.04.2.bb
diff --git a/recipes-application/edu/kdeedu-data_20.12.0.bb b/recipes-application/edu/kdeedu-data_21.04.2.bb
similarity index 100%
rename from recipes-application/edu/kdeedu-data_20.12.0.bb
rename to recipes-application/edu/kdeedu-data_21.04.2.bb
diff --git a/recipes-application/edu/khangman_20.12.0.bb b/recipes-application/edu/khangman_21.04.2.bb
similarity index 100%
rename from recipes-application/edu/khangman_20.12.0.bb
rename to recipes-application/edu/khangman_21.04.2.bb
diff --git a/recipes-application/edu/libkeduvocdocument_20.12.0.bb b/recipes-application/edu/libkeduvocdocument_21.04.2.bb
similarity index 100%
rename from recipes-application/edu/libkeduvocdocument_20.12.0.bb
rename to recipes-application/edu/libkeduvocdocument_21.04.2.bb
diff --git a/recipes-application/edu/marble.inc b/recipes-application/edu/marble.inc
index 7f09744..2bbd304 100644
--- a/recipes-application/edu/marble.inc
+++ b/recipes-application/edu/marble.inc
@@ -25,7 +25,6 @@ DEPENDS += " \
 
 SRC_URI = " \
     git://invent.kde.org/education/${BPN};nobranch=1;protocol=https \
-    file://0001-Provide-BUILD_TOUCH-option-to-force-install-of-touch.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes-application/edu/marble/0001-Provide-BUILD_TOUCH-option-to-force-install-of-touch.patch b/recipes-application/edu/marble/0001-Provide-BUILD_TOUCH-option-to-force-install-of-touch.patch
deleted file mode 100644
index bb6dc14..0000000
--- a/recipes-application/edu/marble/0001-Provide-BUILD_TOUCH-option-to-force-install-of-touch.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0dd33b170a1472772fa4f088c8eb2b26ea2919fc Mon Sep 17 00:00:00 2001
-From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
-Date: Sat, 2 Jan 2021 17:20:53 +0100
-Subject: [PATCH] Provide BUILD_TOUCH option to force install of touch variant
-
-Otherwise the executable is getting missed during packaging.
----
- CMakeLists.txt                      |  4 ++++
- src/apps/marble-maps/CMakeLists.txt | 10 +++++++---
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 550882eb3..0a2227bd0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,6 +77,10 @@ include( MarbleMacros )
- # if this option is set, srtm.jpg will not be installed but the generated tiles instead
- option(MOBILE "Create a Marble version optimized for handheld devices")
- 
-+####################################################
-+# Provide opt-in switch for mobile variant, which is not only useful for Android.
-+option(BUILD_TOUCH "Build touch-friendly Marble version (on Android this option is bypassed)" OFF)
-+
- ####################################################
- # Build a D-Bus interface for the Marble widget
- # This is disabled by default for all win32, apple and Android
-diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt
-index 3ecb48b4d..6ba8b8915 100644
---- a/src/apps/marble-maps/CMakeLists.txt
-+++ b/src/apps/marble-maps/CMakeLists.txt
-@@ -39,6 +39,10 @@ target_link_libraries (
-     marble-maps
-     marbledeclarative
- )
--
--FILE(GLOB QML_FILES *.qml)
--add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
-+if(ANDROID)
-+    FILE(GLOB QML_FILES *.qml)
-+    add_custom_target(marble-maps_resources ALL SOURCES ${QML_FILES} package/AndroidManifest.xml)
-+elseif(BUILD_TOUCH)
-+    install(TARGETS marble-maps RUNTIME DESTINATION bin)
-+    install(PROGRAMS org.kde.marble.maps.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-+endif()
--- 
-2.27.0
-
diff --git a/recipes-application/edu/marble_20.12.0.bb b/recipes-application/edu/marble_21.04.2.bb
similarity index 100%
rename from recipes-application/edu/marble_20.12.0.bb
rename to recipes-application/edu/marble_21.04.2.bb
diff --git a/recipes-application/graphics/gwenview_20.12.0.bb b/recipes-application/graphics/gwenview_21.04.2.bb
similarity index 100%
rename from recipes-application/graphics/gwenview_20.12.0.bb
rename to recipes-application/graphics/gwenview_21.04.2.bb
diff --git a/recipes-application/graphics/okular_20.12.0.bb b/recipes-application/graphics/okular_21.04.2.bb
similarity index 100%
rename from recipes-application/graphics/okular_20.12.0.bb
rename to recipes-application/graphics/okular_21.04.2.bb
diff --git a/recipes-application/multimedia/elisa_20.12.0.bb b/recipes-application/multimedia/elisa_21.04.2.bb
similarity index 100%
rename from recipes-application/multimedia/elisa_20.12.0.bb
rename to recipes-application/multimedia/elisa_21.04.2.bb
diff --git a/recipes-application/network/kdeconnect-kde.inc b/recipes-application/network/kdeconnect-kde.inc
index bab598f..185e831 100644
--- a/recipes-application/network/kdeconnect-kde.inc
+++ b/recipes-application/network/kdeconnect-kde.inc
@@ -6,7 +6,7 @@
 DESCRIPTION = "KDE Connect"
 HOMEPAGE = "https://community.kde.org/KDEConnect"
 LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c"
 PR = "r0"
 
 DEPENDS += " \
diff --git a/recipes-application/network/kdeconnect-kde_20.12.0.bb b/recipes-application/network/kdeconnect-kde_21.04.2.bb
similarity index 100%
rename from recipes-application/network/kdeconnect-kde_20.12.0.bb
rename to recipes-application/network/kdeconnect-kde_21.04.2.bb
diff --git a/recipes-application/sdk/kirigami-gallery_20.12.0.bb b/recipes-application/sdk/kirigami-gallery_21.04.2.bb
similarity index 100%
rename from recipes-application/sdk/kirigami-gallery_20.12.0.bb
rename to recipes-application/sdk/kirigami-gallery_21.04.2.bb