diff --git a/recipes-application/base/kdialog_19.04.3.bb b/recipes-application/base/kdialog_20.04.1.bb
similarity index 100%
rename from recipes-application/base/kdialog_19.04.3.bb
rename to recipes-application/base/kdialog_20.04.1.bb
diff --git a/recipes-application/base/konsole.inc b/recipes-application/base/konsole.inc
index 556fcd8..772d4f4 100644
--- a/recipes-application/base/konsole.inc
+++ b/recipes-application/base/konsole.inc
@@ -1,26 +1,29 @@
 DESCRIPTION = "Konsole"
 HOMEPAGE = "https://konsole.kde.org/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"
 
 DEPENDS += " \
     kinit \
     kio \
     knewstuff \
     knotifications \
     knotifyconfig \
     kparts \
     kpty \
     kxmlgui \
 "
 
 SRC_URI = "git://anongit.kde.org/${BPN};nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
 inherit kauth
 
 FILES_SOLIBSDEV = ""
+FILES_${PN} += " \
+    ${datadir}/knsrcfiles \
+"
diff --git a/recipes-application/base/konsole_19.04.3.bb b/recipes-application/base/konsole_20.04.1.bb
similarity index 100%
rename from recipes-application/base/konsole_19.04.3.bb
rename to recipes-application/base/konsole_20.04.1.bb
diff --git a/recipes-application/graphics/okular_19.04.3.bb b/recipes-application/graphics/okular_20.04.1.bb
similarity index 100%
rename from recipes-application/graphics/okular_19.04.3.bb
rename to recipes-application/graphics/okular_20.04.1.bb
diff --git a/recipes-application/graphics/okular_git.bb b/recipes-application/graphics/okular_git.bb
index c290e9c..36c4536 100644
--- a/recipes-application/graphics/okular_git.bb
+++ b/recipes-application/graphics/okular_git.bb
@@ -1,2 +1,2 @@
 require ${BPN}.inc
-SRCREV = "b659b06ec76e9ff84e5bf3c84f04caf0799e21ed"
+SRCREV = "493853667d589afe395752fbadd592072cdabd8e"
diff --git a/recipes-extragear/network/kdeconnect-kde.inc b/recipes-application/network/kdeconnect-kde.inc
similarity index 94%
rename from recipes-extragear/network/kdeconnect-kde.inc
rename to recipes-application/network/kdeconnect-kde.inc
index 5c6af38..0678690 100644
--- a/recipes-extragear/network/kdeconnect-kde.inc
+++ b/recipes-application/network/kdeconnect-kde.inc
@@ -1,39 +1,40 @@
 DESCRIPTION = "KDE Connect"
 HOMEPAGE = "https://community.kde.org/KDEConnect"
 LICENSE = "GPL-2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS += " \
     qtdeclarative \
+    qtmultimedia \
     qca \
     kconfigwidgets \
     kdbusaddons \
     kiconthemes \
     knotifications \
     kio \
     kcmutils \
     kirigami \
     kpeople \
     kwayland \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};protocol=git \
-    file://0001-fix-kf5-55-compat.diff \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
 inherit kauth
 
 EXTRA_OECMAKE += " -DEXPERIMENTALAPP_ENABLED=ON -DSMSAPP_ENABLED=OFF -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST}"
 
 FILES_${PN} += " \
     ${datadir}/plasma \
     ${datadir}/nautilus-python \
     ${datadir}/Thunar \
     ${datadir}/contractor \
+    ${datadir}/zsh \
 "
diff --git a/recipes-extragear/network/kdeconnect-kde_1.3.3.bb b/recipes-application/network/kdeconnect-kde_20.04.1.bb
similarity index 100%
copy from recipes-extragear/network/kdeconnect-kde_1.3.3.bb
copy to recipes-application/network/kdeconnect-kde_20.04.1.bb
diff --git a/recipes-application/sdk/kirigami-gallery_19.04.3.bb b/recipes-application/sdk/kirigami-gallery_20.04.1.bb
similarity index 100%
rename from recipes-application/sdk/kirigami-gallery_19.04.3.bb
rename to recipes-application/sdk/kirigami-gallery_20.04.1.bb
diff --git a/recipes-extragear/libraries/pulseaudio-qt.inc b/recipes-extragear/libraries/pulseaudio-qt.inc
new file mode 100644
index 0000000..2521528
--- /dev/null
+++ b/recipes-extragear/libraries/pulseaudio-qt.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "KF5 PulseAudio Qt Bindings - libpulse bindings for Qt"
+HOMEPAGE = "https://invent.kde.org/libraries/pulseaudio-qt"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+PR = "r0"
+
+DEPENDS = " \
+    pulseaudio \
+"
+
+SRC_URI = " \
+    git://anongit.kde.org/${BPN};nobranch=1 \
+"
+S = "${WORKDIR}/git"
+
+inherit cmake_kf5
diff --git a/recipes-extragear/network/kdeconnect-kde_1.3.3.bb b/recipes-extragear/libraries/pulseaudio-qt_1.2.0.bb
similarity index 100%
rename from recipes-extragear/network/kdeconnect-kde_1.3.3.bb
rename to recipes-extragear/libraries/pulseaudio-qt_1.2.0.bb
diff --git a/recipes-extragear/network/kdeconnect-kde/0001-fix-kf5-55-compat.diff b/recipes-extragear/network/kdeconnect-kde/0001-fix-kf5-55-compat.diff
deleted file mode 100644
index 10163e5..0000000
--- a/recipes-extragear/network/kdeconnect-kde/0001-fix-kf5-55-compat.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/app/qml/FindDevicesPage.qml b/app/qml/FindDevicesPage.qml
-index 24fcca5c..2a47e2b3 100644
---- a/app/qml/FindDevicesPage.qml
-+++ b/app/qml/FindDevicesPage.qml
-@@ -66,7 +66,6 @@ Kirigami.ScrollablePage
-         delegate: Kirigami.BasicListItem {
-             width: ListView.view.width
-             icon: iconName
--            iconColor: "transparent"
-             label: display + "\n" + toolTip
-             onClicked: {
-                 pageStack.push(
diff --git a/recipes-extragear/network/kdeconnect-kde_git.bb b/recipes-extragear/network/kdeconnect-kde_git.bb
deleted file mode 100644
index d9abfd9..0000000
--- a/recipes-extragear/network/kdeconnect-kde_git.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require ${BPN}.inc
-SRCREV = "e2d1284a935314bc5d14fbb47e7a3999cf9ddaa1"
diff --git a/recipes-plasma/bluedevil_5.17.5.bb b/recipes-plasma/bluedevil_5.18.5.bb
similarity index 100%
rename from recipes-plasma/bluedevil_5.17.5.bb
rename to recipes-plasma/bluedevil_5.18.5.bb
diff --git a/recipes-plasma/breeze_5.17.5.bb b/recipes-plasma/breeze_5.18.5.bb
similarity index 100%
rename from recipes-plasma/breeze_5.17.5.bb
rename to recipes-plasma/breeze_5.18.5.bb
diff --git a/recipes-plasma/discover_5.17.5.bb b/recipes-plasma/discover_5.18.5.bb
similarity index 100%
rename from recipes-plasma/discover_5.17.5.bb
rename to recipes-plasma/discover_5.18.5.bb
diff --git a/recipes-plasma/kactivitymanagerd_5.17.5.bb b/recipes-plasma/kactivitymanagerd_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kactivitymanagerd_5.17.5.bb
rename to recipes-plasma/kactivitymanagerd_5.18.5.bb
diff --git a/recipes-plasma/kde-cli-tools_5.17.5.bb b/recipes-plasma/kde-cli-tools_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kde-cli-tools_5.17.5.bb
rename to recipes-plasma/kde-cli-tools_5.18.5.bb
diff --git a/recipes-plasma/kdecoration_5.17.5.bb b/recipes-plasma/kdecoration_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kdecoration_5.17.5.bb
rename to recipes-plasma/kdecoration_5.18.5.bb
diff --git a/recipes-plasma/kscreen.inc b/recipes-plasma/kscreen.inc
index c3a1f07..0410a9c 100644
--- a/recipes-plasma/kscreen.inc
+++ b/recipes-plasma/kscreen.inc
@@ -1,31 +1,32 @@
 DESCRIPTION = "KScreen"
 HOMEPAGE = ""
 LICENSE = "GPL-2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
     qtdeclarative \
+    qtsensors \
     kdbusaddons \
     plasma-framework \
     kconfigwidgets \
     kcmutils \
     kglobalaccel \
     kwidgetsaddons \
     kxmlgui \
     libkscreen \
 "
 
 SRC_URI = " \
     git://git.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
 FILES_${PN} += " \
     ${datadir}/kded_kscreen \
     ${datadir}/kcm_kscreen \
     ${datadir}/kpackage \
     ${datadir}/plasma/plasmoids/org.kde.kscreen \
 "
diff --git a/recipes-plasma/kscreen_5.17.5.bb b/recipes-plasma/kscreen_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kscreen_5.17.5.bb
rename to recipes-plasma/kscreen_5.18.5.bb
diff --git a/recipes-plasma/kscreenlocker_5.17.5.bb b/recipes-plasma/kscreenlocker_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kscreenlocker_5.17.5.bb
rename to recipes-plasma/kscreenlocker_5.18.5.bb
diff --git a/recipes-plasma/ksysguard_5.17.5.bb b/recipes-plasma/ksysguard_5.18.5.bb
similarity index 100%
rename from recipes-plasma/ksysguard_5.17.5.bb
rename to recipes-plasma/ksysguard_5.18.5.bb
diff --git a/recipes-plasma/kwayland-integration_5.17.5.bb b/recipes-plasma/kwayland-integration_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kwayland-integration_5.17.5.bb
rename to recipes-plasma/kwayland-integration_5.18.5.bb
diff --git a/recipes-plasma/kwin_5.17.5.bb b/recipes-plasma/kwin_5.18.5.bb
similarity index 100%
rename from recipes-plasma/kwin_5.17.5.bb
rename to recipes-plasma/kwin_5.18.5.bb
diff --git a/recipes-plasma/libkscreen_5.17.5.bb b/recipes-plasma/libkscreen_5.18.5.bb
similarity index 100%
rename from recipes-plasma/libkscreen_5.17.5.bb
rename to recipes-plasma/libkscreen_5.18.5.bb
diff --git a/recipes-plasma/libksysguard_5.17.5.bb b/recipes-plasma/libksysguard_5.18.5.bb
similarity index 100%
rename from recipes-plasma/libksysguard_5.17.5.bb
rename to recipes-plasma/libksysguard_5.18.5.bb
diff --git a/recipes-plasma/milou_5.17.5.bb b/recipes-plasma/milou_5.18.5.bb
similarity index 100%
rename from recipes-plasma/milou_5.17.5.bb
rename to recipes-plasma/milou_5.18.5.bb
diff --git a/recipes-plasma/plasma-integration_5.17.5.bb b/recipes-plasma/plasma-integration_5.18.5.bb
similarity index 100%
rename from recipes-plasma/plasma-integration_5.17.5.bb
rename to recipes-plasma/plasma-integration_5.18.5.bb
diff --git a/recipes-plasma/plasma-nm_5.17.5.bb b/recipes-plasma/plasma-nm_5.18.5.bb
similarity index 100%
rename from recipes-plasma/plasma-nm_5.17.5.bb
rename to recipes-plasma/plasma-nm_5.18.5.bb
diff --git a/recipes-plasma/plasma-pa_5.17.5.bb b/recipes-plasma/plasma-pa_5.18.5.bb
similarity index 100%
rename from recipes-plasma/plasma-pa_5.17.5.bb
rename to recipes-plasma/plasma-pa_5.18.5.bb
diff --git a/recipes-plasma/plasma-phone-components_5.17.5.bb b/recipes-plasma/plasma-phone-components_5.18.5.bb
similarity index 100%
rename from recipes-plasma/plasma-phone-components_5.17.5.bb
rename to recipes-plasma/plasma-phone-components_5.18.5.bb
diff --git a/recipes-plasma/plasma-phone-components_git.bb b/recipes-plasma/plasma-phone-components_git.bb
deleted file mode 100644
index d64ca99..0000000
--- a/recipes-plasma/plasma-phone-components_git.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require ${PN}.inc
-SRCREV = "f1dd73e6715f6be23af092760c2c5e496697f2d5"
diff --git a/recipes-plasma/plasma-settings_5.17.5.bb b/recipes-plasma/plasma-settings_5.18.5.bb
similarity index 100%
rename from recipes-plasma/plasma-settings_5.17.5.bb
rename to recipes-plasma/plasma-settings_5.18.5.bb
diff --git a/recipes-plasma/plasma-settings_git.bb b/recipes-plasma/plasma-settings_git.bb
index 276bf52..3a3fd0b 100644
--- a/recipes-plasma/plasma-settings_git.bb
+++ b/recipes-plasma/plasma-settings_git.bb
@@ -1,2 +1,2 @@
 require ${PN}.inc
-SRCREV = "c28d8da6850238b13b7d0891a24bc32ab4860b2e"
+SRCREV = "fe164bbbe642657abd2c3f69415ade845fb294d8"
diff --git a/recipes-plasma/plasma-workspace_5.17.5.bb b/recipes-plasma/plasma-workspace_5.18.5.bb
similarity index 100%
rename from recipes-plasma/plasma-workspace_5.17.5.bb
rename to recipes-plasma/plasma-workspace_5.18.5.bb
diff --git a/recipes-plasma/polkit-kde-agent-1_5.17.5.bb b/recipes-plasma/polkit-kde-agent-1_5.18.5.bb
similarity index 100%
rename from recipes-plasma/polkit-kde-agent-1_5.17.5.bb
rename to recipes-plasma/polkit-kde-agent-1_5.18.5.bb
diff --git a/recipes-plasma/powerdevil_5.17.5.bb b/recipes-plasma/powerdevil_5.18.5.bb
similarity index 100%
rename from recipes-plasma/powerdevil_5.17.5.bb
rename to recipes-plasma/powerdevil_5.18.5.bb
diff --git a/recipes-plasma/systemsettings_5.17.5.bb b/recipes-plasma/systemsettings_5.18.5.bb
similarity index 100%
rename from recipes-plasma/systemsettings_5.17.5.bb
rename to recipes-plasma/systemsettings_5.18.5.bb
diff --git a/recipes-plasma/xdg-desktop-portal-kde.inc b/recipes-plasma/xdg-desktop-portal-kde.inc
index 86f0cc5..80dcc56 100644
--- a/recipes-plasma/xdg-desktop-portal-kde.inc
+++ b/recipes-plasma/xdg-desktop-portal-kde.inc
@@ -1,24 +1,27 @@
 DESCRIPTION = "XDG Desktop Portal KDE"
 HOMEPAGE = ""
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 PR = "r0"
 
 DEPENDS += " \
     kcoreaddons \
     knotifications \
     kwayland \
     kwidgetsaddons \
+    kirigami \
     kio \
+    kdeclarative \
+    plasma-framework \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
 FILES_${PN} += " \
     ${datadir}/xdg-desktop-portal \
 "
diff --git a/recipes-plasma/xdg-desktop-portal-kde_5.17.5.bb b/recipes-plasma/xdg-desktop-portal-kde_5.18.5.bb
similarity index 100%
rename from recipes-plasma/xdg-desktop-portal-kde_5.17.5.bb
rename to recipes-plasma/xdg-desktop-portal-kde_5.18.5.bb
diff --git a/recipes-playground/calindori_git.bb b/recipes-playground/calindori_git.bb
index abc59c5..92fbe7e 100644
--- a/recipes-playground/calindori_git.bb
+++ b/recipes-playground/calindori_git.bb
@@ -1,2 +1,2 @@
 require ${BPN}.inc
-SRCREV = "9bb5f5e9e7c7996e351f20ca53e680ffe1f41465"
+SRCREV = "e766232d8a5298446eaa4c70a845536a64126262"
diff --git a/recipes-playground/koko_git.bb b/recipes-playground/koko_git.bb
index cf4d170..a14ebb0 100644
--- a/recipes-playground/koko_git.bb
+++ b/recipes-playground/koko_git.bb
@@ -1,3 +1,3 @@
 require ${BPN}.inc
 # SRCREV = "v${PV}"
-SRCREV = "8569b1c3b7a991738d80f921e485e2466a5512cf"
+SRCREV = "ced8368236f328577580aba01e3e89f278fb0c9b"
diff --git a/recipes-playground/plasma-camera_git.bb b/recipes-playground/plasma-camera_git.bb
index ecc8067..3cb3dcd 100644
--- a/recipes-playground/plasma-camera_git.bb
+++ b/recipes-playground/plasma-camera_git.bb
@@ -1,3 +1,3 @@
 require ${BPN}.inc
 # SRCREV = "v${PV}"
-SRCREV = "d46da415a3ea03d8ec432c6c838a6e4f5d35526e"
+SRCREV = "eb32234dc8da8f47a524be9d6b01b179303f0452"
diff --git a/recipes-support/qca_git.bb b/recipes-support/qca_git.bb
index 473c453..434a8e0 100644
--- a/recipes-support/qca_git.bb
+++ b/recipes-support/qca_git.bb
@@ -1,2 +1,2 @@
 require ${BPN}.inc
-SRCREV = "0be2a2ced313e1671cb947a2be8243cee59ab18c"
+SRCREV = "02585a58e3c988877292a573c3b86c49c67e7960"
diff --git a/recipes-support/simplelogin_git.bb b/recipes-support/simplelogin_git.bb
index 26c9db1..2f216b1 100644
--- a/recipes-support/simplelogin_git.bb
+++ b/recipes-support/simplelogin_git.bb
@@ -1,3 +1,3 @@
 require ${BPN}.inc
 # SRCREV = "v${PV}"
-SRCREV = "41f2090394597b27c37a5bc5f85ce7cf5620770d"
+SRCREV = "ffa841ec9766e4428f2f960b966bcc5b4e7e4982"