diff --git a/kde/baloo/APKBUILD b/kde/baloo/APKBUILD
deleted file mode 100644
index efcfed5bb..000000000
--- a/kde/baloo/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=baloo
-pkgver=5.37.0
-pkgrel=1
-pkgdesc="A framework for searching and managing metadata"
-arch="all"
-url='https://community.kde.org/Frameworks'
-license="LGPL"
-depends="kfilemetadata kio lmdb hicolor-icon-theme"
-makedepends="extra-cmake-modules kdoctools python qt5-qttools-dev kfilemetadata lmdb-dev
-			 kidletime-dev kcrash-dev solid-dev kdbusaddons-dev kcoreaddons-dev kconfig-dev
-			 kio-dev qt5-qtdeclarative-dev kio-dev kbookmarks-dev kservice-dev kwidgetsaddons-dev
-			 kcompletion-dev kitemviews-dev kjobwidgets-dev kxmlgui-dev kconfigwidgets-dev
-			 kauth-dev kcodecs-dev ki18n-dev kfilemetadata-dev doxygen"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-
-prepare() {
-	mkdir -p $srcdir/build
-}
-
-build() {
-	cd $srcdir/build
-	cmake "$srcdir"/$pkgname-$pkgver \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDE_INSTALL_LIBDIR=lib \
-		-DBUILD_TESTING=OFF \
-		-DBUILD_QCH=ON
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR="${pkgdir}" install
-}
-sha512sums="5380042aa5ab09460d101b46d60ea89ba735251563fb88803b877af86d1dc86267470b833992e3cf3fa807a4d4ce8d183a68ce684e2e97f5a8563e85d0584b8b  baloo-5.37.0.tar.xz"
diff --git a/kde/breeze/APKBUILD b/kde/breeze/APKBUILD
index dd3228f33..379220ed9 100644
--- a/kde/breeze/APKBUILD
+++ b/kde/breeze/APKBUILD
@@ -6,10 +6,13 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="frameworkintegration kdecoration kwayland"
-makedepends="extra-cmake-modules frameworkintegration
-             automoc4 kdecoration plasma-framework python kcmutils breeze-icons"
+makedepends="extra-cmake-modules frameworkintegration-dev kcoreaddons-dev kguiaddons-dev
+             automoc4 kdecoration-dev plasma-framework-dev python kcmutils-dev breeze-icons 
+			 kconfigwidgets-dev kauth-dev kcodecs-dev kconfig-dev kwidgetsaddons-dev
+			 kwindowsystem-dev ki18n-dev qt5-x11extras-dev qt5-qtdeclarative-dev
+			 kpackage-dev kservice-dev"
 source="https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
-subpackages="$pkgname-lang"
+subpackages="$pkgname-dev $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/dbus-nox11/APKBUILD b/kde/dbus-nox11/APKBUILD
index 14e31e76f..c3075c554 100644
--- a/kde/dbus-nox11/APKBUILD
+++ b/kde/dbus-nox11/APKBUILD
@@ -54,8 +54,8 @@ package() {
 
 libs() {
 	pkgdesc="Libraries for acces D-BUS"
-	provides="dbus-libs"
-	replaces="dbus dbus-libs"
+	provides="dbus dbus-dev dbus-doc dbus-x11 dbus-libs"
+	replaces="dbus dbus-dev dbus-doc dbus-x11 dbus-libs"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
diff --git a/kde/frameworkintegration/APKBUILD b/kde/frameworkintegration/APKBUILD
index c241617c6..23c56e20e 100644
--- a/kde/frameworkintegration/APKBUILD
+++ b/kde/frameworkintegration/APKBUILD
@@ -7,7 +7,8 @@ url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kpackage knewstuff"
 makedepends="extra-cmake-modules python kconfigwidgets-dev kiconthemes-dev knotifications-dev
-			 kpackage-dev knewstuff-dev qt5-x11extras-dev attica-qt5-dev"
+			 kpackage-dev knewstuff-dev qt5-x11extras-dev attica-qt5-dev kconfig-dev kauth-dev
+			 kcoreaddons-dev kcodecs-dev kwidgetsaddons-dev kxmlgui-dev kservice-dev ki18n-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev"
 
diff --git a/kde/kactivitymanagerd/APKBUILD b/kde/kactivitymanagerd/APKBUILD
index 7579ab414..9faf3c560 100644
--- a/kde/kactivitymanagerd/APKBUILD
+++ b/kde/kactivitymanagerd/APKBUILD
@@ -6,7 +6,11 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="kio"
-makedepends="extra-cmake-modules boost-dev python kio-dev"
+makedepends="extra-cmake-modules boost-dev python kio-dev kdbusaddons-dev ki18n-dev
+			 kconfig-dev kcoreaddons-dev kwindowsystem-dev kglobalaccel-dev kxmlgui-dev
+			 kconfigwidgets-dev kauth-dev kcodecs-dev kwidgetsaddons-dev kservice-dev
+			 kbookmarks-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev
+			 qt5-qtbase-dev"
 source="https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
diff --git a/kde/kauth/APKBUILD b/kde/kauth/APKBUILD
index 4244baeac..95add7d5f 100644
--- a/kde/kauth/APKBUILD
+++ b/kde/kauth/APKBUILD
@@ -6,9 +6,9 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="polkit-qt5"
-makedepends="extra-cmake-modules qt5-qttools-dev clang py3-qt5 doxygen polkit-qt5 kcoreaddons-dev"
+makedepends="extra-cmake-modules qt5-qttools-dev clang py3-qt5 doxygen polkit-qt5-dev kcoreaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/kbookmarks/APKBUILD b/kde/kbookmarks/APKBUILD
index 3601c1d3e..74c9749f3 100644
--- a/kde/kbookmarks/APKBUILD
+++ b/kde/kbookmarks/APKBUILD
@@ -6,8 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kxmlgui"
-makedepends="extra-cmake-modules qt5-qttools-dev python doxygen kcodecs-dev
-			 kconfig-dev kconfigwidgets-dev kiconthemes-dev kxmlgui-dev"
+makedepends="extra-cmake-modules qt5-qttools-dev python doxygen kcodecs-dev kconfig-dev kconfigwidgets-dev
+			 kiconthemes-dev kxmlgui-dev kcoreaddons-dev kauth-dev kwidgetsaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kcmutils/APKBUILD b/kde/kcmutils/APKBUILD
index da4ba5d13..1d05da976 100644
--- a/kde/kcmutils/APKBUILD
+++ b/kde/kcmutils/APKBUILD
@@ -7,7 +7,9 @@ url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kdeclarative"
 makedepends="extra-cmake-modules python doxygen qt5-qttools-dev kdeclarative-dev kiconthemes-dev
-			 kpackage-dev"
+			 kpackage-dev qt5-qtdeclarative-dev kitemviews-dev kconfigwidgets-dev kauth-dev
+			 kcoreaddons-dev kcodecs-dev kconfig-dev kwidgetsaddons-dev ki18n-dev kservice-dev
+			 kxmlgui-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kconfigwidgets/APKBUILD b/kde/kconfigwidgets/APKBUILD
index c9086ca66..b5279eeb7 100644
--- a/kde/kconfigwidgets/APKBUILD
+++ b/kde/kconfigwidgets/APKBUILD
@@ -7,7 +7,7 @@ url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kauth kcodecs kguiaddons ki18n kwidgetsaddons"
 makedepends="extra-cmake-modules kdoctools python mesa-dev clang py3-qt5 doxygen qt5-qttools-dev
-			 kauth-dev kguiaddons-dev kwidgetsaddons-dev kcodecs-dev kconfig-dev ki18n-dev"
+			 kauth-dev kguiaddons-dev kwidgetsaddons-dev kcodecs-dev kconfig-dev ki18n-dev kcoreaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kcrash/APKBUILD b/kde/kcrash/APKBUILD
index 5404b3542..add3e3fca 100644
--- a/kde/kcrash/APKBUILD
+++ b/kde/kcrash/APKBUILD
@@ -6,7 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kcoreaddons kwindowsystem"
-makedepends="extra-cmake-modules mesa-dev doxygen qt5-qttools-dev kcoreaddons-dev kwindowsystem-dev"
+makedepends="extra-cmake-modules mesa-dev doxygen qt5-qttools-dev kcoreaddons-dev kwindowsystem-dev
+			 qt5-x11extras-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
 
diff --git a/kde/kdeclarative/APKBUILD b/kde/kdeclarative/APKBUILD
index 423d25eb0..9a39fdd40 100644
--- a/kde/kdeclarative/APKBUILD
+++ b/kde/kdeclarative/APKBUILD
@@ -6,8 +6,11 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kio kpackage libepoxy"
-makedepends="extra-cmake-modules python doxygen qt5-qttools-dev kpackage-dev kconfig-dev
-			 kiconthemes-dev kio-dev kguiaddons-dev"
+makedepends="extra-cmake-modules python doxygen qt5-qttools-dev kpackage-dev kconfig-dev kiconthemes-dev
+			 kio-dev kguiaddons-dev qt5-qtdeclarative-dev ki18n-dev kcoreaddons-dev kservice-dev
+			 kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev
+			 solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kwindowsystem-dev
+			 kglobalaccel-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kdecoration/APKBUILD b/kde/kdecoration/APKBUILD
index 9b074bf08..fd2f2ddd1 100644
--- a/kde/kdecoration/APKBUILD
+++ b/kde/kdecoration/APKBUILD
@@ -6,8 +6,9 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="qt5-qtbase"
-makedepends="extra-cmake-modules"
+makedepends="extra-cmake-modules qt5-qtbase-dev"
 source="https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"
+subpackages="$pkgname-dev"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/kdelibs4support/APKBUILD b/kde/kdelibs4support/APKBUILD
index dab1e6d96..35251cee6 100644
--- a/kde/kdelibs4support/APKBUILD
+++ b/kde/kdelibs4support/APKBUILD
@@ -11,7 +11,8 @@ makedepends="extra-cmake-modules kdoctools-dev qt5-qttools-dev networkmanager pe
 			 qt5-x11extras-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kauth-dev kcodecs-dev kwidgetsaddons-dev
 			 kcrash-dev kglobalaccel-dev kservice-dev kguiaddons-dev ki18n-dev kiconthemes-dev kbookmarks-dev
 			 kitemviews-dev kjobwidgets-dev solid-dev kxmlgui-dev knotifications-dev ktextwidgets-dev sonnet-dev
-			 kwindowsystem-dev kdbusaddons-dev kded"
+			 kwindowsystem-dev kdbusaddons-dev kdesignerplugin-dev kbookmarks-dev kcoreaddons-dev kio-dev
+			 kded"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kdesignerplugin/APKBUILD b/kde/kdesignerplugin/APKBUILD
index c2ecc39d4..7a9b756f2 100644
--- a/kde/kdesignerplugin/APKBUILD
+++ b/kde/kdesignerplugin/APKBUILD
@@ -6,8 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kio kplotting"
-makedepends="extra-cmake-modules qt5-qttools-dev python kdoctools-dev kio-dev kplotting-dev
-			 kcoreaddons-dev kconfig-dev"
+makedepends="extra-cmake-modules qt5-qttools-dev python kdoctools-dev kio-dev kcoreaddons-dev
+			 kconfig-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kdesu/APKBUILD b/kde/kdesu/APKBUILD
index 882f6d7df..5b6899259 100644
--- a/kde/kdesu/APKBUILD
+++ b/kde/kdesu/APKBUILD
@@ -6,7 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kservice kpty"
-makedepends="extra-cmake-modules python qt5-qttools-dev kpty-dev"
+makedepends="extra-cmake-modules python qt5-qttools-dev kpty-dev kservice-dev kconfig-dev kcoreaddons-dev
+			 ki18n-dev doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kdoctools/APKBUILD b/kde/kdoctools/APKBUILD
index 9026a5281..6bfb38b44 100644
--- a/kde/kdoctools/APKBUILD
+++ b/kde/kdoctools/APKBUILD
@@ -6,8 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="karchive docbook-xsl"
-makedepends="extra-cmake-modules ki18n-dev python perl-uri karchive-dev docbook-xsl libxslt-dev libxml2-dev"
-options="staticlibs"
+makedepends="extra-cmake-modules ki18n-dev python perl-uri karchive-dev docbook-xsl libxslt-dev
+			 libxml2-dev qt5-qtbase-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kglobalaccel/APKBUILD b/kde/kglobalaccel/APKBUILD
index 12bef1b5d..710acf4cb 100644
--- a/kde/kglobalaccel/APKBUILD
+++ b/kde/kglobalaccel/APKBUILD
@@ -6,7 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kdbusaddons kconfig kcrash"
-makedepends="extra-cmake-modules doxygen qt5-qttools-dev"
+makedepends="extra-cmake-modules doxygen qt5-qttools-dev kconfig-dev kcoreaddons-dev kcrash-dev
+			 kdbusaddons-dev kwindowsystem-dev qt5-x11extras-dev xcb-util-keysyms-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kguiaddons/APKBUILD b/kde/kguiaddons/APKBUILD
index 189abbae6..09ed16f9a 100644
--- a/kde/kguiaddons/APKBUILD
+++ b/kde/kguiaddons/APKBUILD
@@ -8,7 +8,7 @@ license="LGPL"
 depends="qt5-x11extras"
 makedepends="extra-cmake-modules mesa-dev clang py3-qt5 doxygen qt5-qttools-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+subpackages="$pkgname-dev $pkgname-doc"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/kiconthemes/APKBUILD b/kde/kiconthemes/APKBUILD
index cf83e3c9b..08b671d30 100644
--- a/kde/kiconthemes/APKBUILD
+++ b/kde/kiconthemes/APKBUILD
@@ -6,8 +6,9 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="qt5-qtsvg kconfigwidgets kitemviews karchive"
-makedepends="extra-cmake-modules python mesa-dev doxygen qt5-qttools-dev qt5-qtsvg-dev
-			 kitemviews-dev kconfigwidgets-dev"
+makedepends="extra-cmake-modules python mesa-dev doxygen qt5-qttools-dev qt5-qtsvg-dev kitemviews-dev
+			 kconfigwidgets-dev karchive-dev ki18n-dev kcoreaddons-dev kauth-dev kcodecs-dev
+			 kconfig-dev kwidgetsaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kinit/APKBUILD b/kde/kinit/APKBUILD
index 579507bce..25013d166 100644
--- a/kde/kinit/APKBUILD
+++ b/kde/kinit/APKBUILD
@@ -6,7 +6,10 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kio"
-makedepends="extra-cmake-modules kdoctools python kio-dev kservice-dev kcrash-dev"
+makedepends="extra-cmake-modules kdoctools-dev python kio-dev kservice-dev kcrash-dev kbookmarks-dev
+			 kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kxmlgui-dev kconfig-dev
+			 kcoreaddons-dev kwidgetsaddons-dev kconfigwidgets-dev kauth-dev kcodecs-dev ki18n-dev
+			 kwindowsystem-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
 		D6598.patch"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/kde/kio/APKBUILD b/kde/kio/APKBUILD
index b7e80bf96..43657e3af 100644
--- a/kde/kio/APKBUILD
+++ b/kde/kio/APKBUILD
@@ -6,8 +6,11 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="solid kjobwidgets libxslt desktop-file-utils knotifications"
-makedepends="extra-cmake-modules kdoctools python doxygen qt5-qttools-dev kconfig-dev
-			 kdbusaddons-dev kservice-dev solid-dev kbookmarks-dev kjobwidgets-dev knotifications-dev"
+makedepends="extra-cmake-modules kdoctools python doxygen qt5-qttools-dev kconfig-dev kdbusaddons-dev
+			 kservice-dev solid-dev kbookmarks-dev kjobwidgets-dev knotifications-dev karchive-dev
+			 kcoreaddons-dev ki18n-dev kwidgetsaddons-dev kcompletion-dev kconfigwidgets-dev
+			 kauth-dev kcodecs-dev kiconthemes-dev kitemviews-dev kwindowsystem-dev qt5-x11extras-dev
+			 kxmlgui-dev ktextwidgets-dev sonnet-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kitemmodels/APKBUILD b/kde/kitemmodels/APKBUILD
index 521c4fb2f..ba5ec77d6 100644
--- a/kde/kitemmodels/APKBUILD
+++ b/kde/kitemmodels/APKBUILD
@@ -6,7 +6,7 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="qt5-qtbase"
-makedepends="extra-cmake-modules py3-qt5 clang qt5-qttools-dev"
+makedepends="extra-cmake-modules py3-qt5 clang qt5-qttools-dev doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
 
diff --git a/kde/kjs/APKBUILD b/kde/kjs/APKBUILD
index 808e0299a..09317094b 100644
--- a/kde/kjs/APKBUILD
+++ b/kde/kjs/APKBUILD
@@ -6,7 +6,7 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="qt5-qtbase"
-makedepends="extra-cmake-modules kdoctools-dev"
+makedepends="extra-cmake-modules kdoctools-dev qt5-qtbase-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
 
diff --git a/kde/kjsembed/APKBUILD b/kde/kjsembed/APKBUILD
index 05476fddf..1fec5f058 100644
--- a/kde/kjsembed/APKBUILD
+++ b/kde/kjsembed/APKBUILD
@@ -6,7 +6,7 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="qt5-qtsvg ki18n kjs"
-makedepends="extra-cmake-modules qt5-qttools-dev kdoctools-dev python qt5-qtsvg-dev kjs-dev"
+makedepends="extra-cmake-modules qt5-qttools-dev kdoctools-dev python qt5-qtsvg-dev kjs-dev ki18n-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/knewstuff/APKBUILD b/kde/knewstuff/APKBUILD
index 95f9a8a23..cf3ed7d6d 100644
--- a/kde/knewstuff/APKBUILD
+++ b/kde/knewstuff/APKBUILD
@@ -8,7 +8,9 @@ license="LGPL"
 depends="kio"
 makedepends="extra-cmake-modules python doxygen qt5-qttools-dev attica-qt5 karchive-dev
 			 kio-dev kservice-dev kbookmarks-dev kjobwidgets-dev solid-dev kxmlgui-dev
-			 qt5-qtdeclarative-dev qt5-qtquickcontrols"
+			 qt5-qtdeclarative-dev qt5-qtquickcontrols kcompletion-dev kcoreaddons-dev ki18n-dev
+			 kiconthemes-dev kitemviews-dev kconfigwidgets-dev kauth-dev kcodecs-dev ktextwidgets-dev
+			 sonnet-dev attica-qt5-dev kconfig-dev kwidgetsaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/knotifications/APKBUILD b/kde/knotifications/APKBUILD
index bffb1c0fd..1a12332ee 100644
--- a/kde/knotifications/APKBUILD
+++ b/kde/knotifications/APKBUILD
@@ -5,8 +5,9 @@ pkgdesc='Abstraction for system notifications'
 arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
-depends="phonon-dev kwindowsystem kconfig kcodecs kcoreaddons"
-makedepends="extra-cmake-modules qt5-qttools-dev python doxygen phonon-dev dbus-libs qt5-x11extras-dev kwindowsystem-dev kconfig-dev kcodecs-dev kcoreaddons-dev"
+depends=""
+makedepends="extra-cmake-modules qt5-qttools-dev python doxygen phonon-dev dbus-libs qt5-x11extras-dev
+			 kwindowsystem-dev kconfig-dev kcodecs-dev kcoreaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/knotifyconfig/APKBUILD b/kde/knotifyconfig/APKBUILD
index 44f33d7a8..2005814a0 100644
--- a/kde/knotifyconfig/APKBUILD
+++ b/kde/knotifyconfig/APKBUILD
@@ -8,9 +8,10 @@ license="LGPL"
 depends="kio"
 makedepends="extra-cmake-modules python qt5-qttools-dev kcompletion-dev ki18n-dev kio-dev
 			 kcoreaddons-dev kservice-dev kbookmarks-dev kitemviews-dev kjobwidgets-dev solid-dev
-			 kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev"
+			 kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kconfig-dev kwidgetsaddons-dev
+			 doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-subpackages="$pkgname-doc $pkgname-lang"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/kpackage/APKBUILD b/kde/kpackage/APKBUILD
index c51460666..e7ed129c5 100644
--- a/kde/kpackage/APKBUILD
+++ b/kde/kpackage/APKBUILD
@@ -6,7 +6,8 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="karchive ki18n"
-makedepends="extra-cmake-modules qt5-qttools-dev python kdoctools-dev kcoreaddons-dev"
+makedepends="extra-cmake-modules qt5-qttools-dev python kdoctools-dev kcoreaddons-dev karchive-dev
+			 ki18n-dev doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kparts/APKBUILD b/kde/kparts/APKBUILD
index d9f0f11f0..515551f3d 100644
--- a/kde/kparts/APKBUILD
+++ b/kde/kparts/APKBUILD
@@ -7,7 +7,9 @@ url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kio"
 makedepends="extra-cmake-modules python qt5-qttools-dev kio-dev kiconthemes-dev ktextwidgets-dev
-			 sonnet-dev"
+			 sonnet-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev
+			 solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kconfig-dev kcoreaddons-dev
+			 ki18n-dev kservice-dev doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kpty/APKBUILD b/kde/kpty/APKBUILD
index 62d910ee7..2268ed53e 100644
--- a/kde/kpty/APKBUILD
+++ b/kde/kpty/APKBUILD
@@ -6,7 +6,7 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kcoreaddons ki18n"
-makedepends="extra-cmake-modules python qt5-qttools-dev"
+makedepends="extra-cmake-modules python qt5-qttools-dev kcoreaddons-dev ki18n-dev doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/krunner/APKBUILD b/kde/krunner/APKBUILD
index 7530e1ab5..e46610d25 100644
--- a/kde/krunner/APKBUILD
+++ b/kde/krunner/APKBUILD
@@ -6,9 +6,11 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="GPL"
 depends="plasma-framework threadweaver"
-makedepends="extra-cmake-modules kdoctools-dev python qt5-qttools-dev plasma-framework threadweaver-dev
+makedepends="extra-cmake-modules kdoctools-dev python qt5-qttools-dev plasma-framework-dev threadweaver-dev
 			 kactivities-dev kbookmarks-dev kcompletion-dev kjobwidgets-dev solid-dev kxmlgui-dev
-			 plasma-framework-dev kpackage-dev"
+			 kpackage-dev qt5-qtdeclarative-dev kconfig-dev kcoreaddons-dev ki18n-dev kservice-dev
+			 kwidgetsaddons-dev kitemviews-dev kconfigwidgets-dev kauth-dev kcodecs-dev kwindowsystem-dev
+			 kio-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
 
diff --git a/kde/kscreenlocker/APKBUILD b/kde/kscreenlocker/APKBUILD
index 7839026aa..5f0d6b6be 100644
--- a/kde/kscreenlocker/APKBUILD
+++ b/kde/kscreenlocker/APKBUILD
@@ -6,9 +6,14 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="kidletime kwayland kdeclarative"
-makedepends="extra-cmake-modules python kdoctools kcmutils libxcursor linux-pam-dev kidletime kwayland kdeclarative"
+makedepends="extra-cmake-modules python kdoctools-dev kcmutils-dev libxcursor
+			 linux-pam-dev kidletime-dev kwayland-dev kdeclarative-dev qt5-qtdeclarative-dev
+			 kcrash-dev kdeclarative-dev kglobalaccel-dev ki18n-dev ktextwidgets-dev
+			 kwindowsystem-dev kxmlgui-dev kconfig-dev sonnet-dev kconfigwidgets-dev
+			 kauth-dev kcoreaddons-dev kcodecs-dev kwidgetsaddons-dev kservice-dev
+			 kpackage-dev knotifications-dev solid-dev xcb-util-keysyms-dev qt5-x11extras-dev"
 source="https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"
-subpackages="$pkgname-lang"
+subpackages="$pkgname-dev $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/kservice/APKBUILD b/kde/kservice/APKBUILD
index 07f5d3baf..0c5d1ec42 100644
--- a/kde/kservice/APKBUILD
+++ b/kde/kservice/APKBUILD
@@ -7,7 +7,7 @@ url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="ki18n kconfig kcrash kdbusaddons"
 makedepends="extra-cmake-modules kdoctools python doxygen qt5-qttools-dev kcrash-dev
-			 kconfig-dev kdbusaddons-dev ki18n-dev flex-dev bison"
+			 kconfig-dev kdbusaddons-dev ki18n-dev flex-dev bison kcoreaddons-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/ksysguard/APKBUILD b/kde/ksysguard/APKBUILD
index 26d33d984..a1b0bcc0c 100644
--- a/kde/ksysguard/APKBUILD
+++ b/kde/ksysguard/APKBUILD
@@ -6,10 +6,15 @@ arch="all"
 url='https://userbase.kde.org/KSysGuard'
 license="LGPL"
 depends="lm_sensors hicolor-icon-theme"
-makedepends="extra-cmake-modules kdoctools python knewstuff libksysguard libksysguard-dev kinit"
+makedepends="extra-cmake-modules kdoctools-dev python libksysguard-dev attica-qt5-dev
+			 kinit-dev kxmlgui-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev
+			 kiconthemes-dev kitemviews-dev kio-dev knotifications-dev kservice-dev
+			 kio-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kjobwidgets-dev
+			 solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kwindowsystem-dev
+			 knewstuff-dev"
 source="https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz
 		 D6631.patch"
-subpackages="$pkgname-lang"
+subpackages="$pkgname-doc $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/ktextwidgets/APKBUILD b/kde/ktextwidgets/APKBUILD
index 1438f2fe3..6309de651 100644
--- a/kde/ktextwidgets/APKBUILD
+++ b/kde/ktextwidgets/APKBUILD
@@ -6,8 +6,9 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kcompletion kservice kiconthemes sonnet"
-makedepends="extra-cmake-modules python doxygen qt5-qttools-dev kcompletion sonnet-dev
-			 kiconthemes-dev kservice-dev"
+makedepends="extra-cmake-modules python doxygen qt5-qttools-dev kcompletion sonnet-dev kauth-dev
+			 kiconthemes-dev kservice-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev
+			 kcodecs-dev kwidgetsaddons-dev ki18n-dev kwindowsystem-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kwallet/APKBUILD b/kde/kwallet/APKBUILD
index 73ad30c23..1a425a643 100644
--- a/kde/kwallet/APKBUILD
+++ b/kde/kwallet/APKBUILD
@@ -8,7 +8,8 @@ license="LGPL"
 depends="knotifications kiconthemes kservice gpgme"
 makedepends="extra-cmake-modules python kdoctools-dev boost doxygen qt5-qttools-dev gpgme-dev
 			 libgcrypt-dev kwindowsystem-dev kconfig-dev kconfigwidgets-dev kauth-dev kcodecs-dev
-			 kdbusaddons-dev kiconthemes-dev knotifications-dev"
+			 kdbusaddons-dev kiconthemes-dev knotifications-dev kcoreaddons-dev ki18n-dev kwidgetsaddons-dev
+			 kservice-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kwidgetsaddons/APKBUILD b/kde/kwidgetsaddons/APKBUILD
index 0c02e2948..467ca31df 100644
--- a/kde/kwidgetsaddons/APKBUILD
+++ b/kde/kwidgetsaddons/APKBUILD
@@ -7,7 +7,6 @@ url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="qt5-qtbase"
 makedepends="extra-cmake-modules qt5-qttools-dev clang py3-qt5 doxygen"
-groups="kf5"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/kwin/APKBUILD b/kde/kwin/APKBUILD
index 72b359c33..623ce2bd6 100644
--- a/kde/kwin/APKBUILD
+++ b/kde/kwin/APKBUILD
@@ -6,15 +6,19 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="xcb-util-cursor xcb-util-keysyms hicolor-icon-theme plasma-framework libinput
-		 consolekit2"
-makedepends="extra-cmake-modules qt5-qttools-dev kdoctools kdecoration
-			 libxkbcommon-dev libepoxy-dev libinput-dev kcmutils kscreenlocker
-			 breeze xcb-util-cursor-dev qt5-qtdeclarative-dev qt5-qtscript-dev
-			 plasma-framework kinit kio-dev xcb-util-keysyms-dev qt5-x11extras-dev"
-# qt5-qtvirtualkeyboard: optional for virtual keyboard support
+		 consolekit2 xorg-server-xwayland breeze"
+makedepends="extra-cmake-modules qt5-qttools-dev kdoctools-dev kdecoration-dev kjobwidgets-dev
+			 libxkbcommon-dev libepoxy-dev libinput-dev kcmutils-dev kscreenlocker-dev
+			 breeze-dev xcb-util-cursor-dev qt5-qtdeclarative-dev qt5-qtscript-dev kcompletion-dev
+			 plasma-framework-dev kinit-dev kio-dev xcb-util-keysyms-dev qt5-x11extras-dev
+			 kcrash-dev kglobalaccel-dev knotifications-dev kiconthemes-dev kconfig-dev
+			 kconfigwidgets-dev kcoreaddons-dev ki18n-dev kpackage-dev kwidgetsaddons-dev
+			 kwindowsystem-dev kidletime-dev kauth-dev kcodecs-dev ktextwidgets-dev
+			 knewstuff-dev kservice-dev kxmlgui-dev kbookmarks-dev kwayland-dev attica-qt5-dev
+			 sonnet-dev kitemviews-dev solid-dev kdeclarative-dev"
 source="https://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz
 		D6291.patch"
-subpackages="$pkgname-doc $pkgname-lang"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/kxmlrpcclient/APKBUILD b/kde/kxmlrpcclient/APKBUILD
index 728c640a0..959921280 100644
--- a/kde/kxmlrpcclient/APKBUILD
+++ b/kde/kxmlrpcclient/APKBUILD
@@ -7,8 +7,9 @@ url="https://projects.kde.org/projects/kde/pim/kxmlrpcclient"
 license="LGPL"
 depends="kio"
 makedepends="extra-cmake-modules python qt5-qttools-dev kio-dev kservice-dev kbookmarks-dev
-			 kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev
-			 kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev"
+			 kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kconfig-dev
+			 kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev ki18n-dev kcoreaddons-dev
+			 doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/libksysguard/APKBUILD b/kde/libksysguard/APKBUILD
index d830af59e..ab9fe812b 100644
--- a/kde/libksysguard/APKBUILD
+++ b/kde/libksysguard/APKBUILD
@@ -6,8 +6,10 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="libxres kwindowsystem kconfigwidgets"
-# qt5-qtwebkit
-makedepends="extra-cmake-modules kdoctools kwindowsystem-dev python plasma-framework qt5-qtscript-dev qt5-x11extras-dev"
+makedepends="extra-cmake-modules kdoctools kwindowsystem-dev python plasma-framework-dev
+			 qt5-qtscript-dev qt5-x11extras-dev kcoreaddons-dev kconfig-dev ki18n-dev
+			 kcompletion-dev kauth-dev kwidgetsaddons-dev kiconthemes-dev kconfigwidgets-dev
+			 kservice-dev kcodecs-dev plasma-framework kpackage-dev"
 source="https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
diff --git a/kde/libyaml/APKBUILD b/kde/libyaml/APKBUILD
deleted file mode 100644
index 0ce606d50..000000000
--- a/kde/libyaml/APKBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=libyaml
-pkgver=0.1.7
-pkgrel=1
-pkgdesc="YAML 1.1 library"
-arch="all"
-url="http://pyyaml.org/wiki/LibYAML"
-license="MIT"
-source="http://pyyaml.org/download/$pkgname/${pkgname/lib/}-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir/${pkgname/lib/}-$pkgver"
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/${pkgname/lib/}-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-sha512sums="1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975  yaml-0.1.7.tar.gz"
diff --git a/kde/media-player-info/APKBUILD b/kde/media-player-info/APKBUILD
deleted file mode 100644
index 624bd5159..000000000
--- a/kde/media-player-info/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgname=media-player-info
-pkgver=22
-pkgrel=2
-pkgdesc="Data files describing media player capabilities, for post-HAL systems"
-arch="noarch"
-license="BSD"
-url="http://cgit.freedesktop.org/media-player-info/"
-depends="eudev"
-makedepends="python3 eudev-dev"
-install="$pkgname.post-install"
-source="http://www.freedesktop.org/software/media-player-info/$pkgname-$pkgver.tar.gz
-		$install"
-
-build() {
-	./configure --prefix=/usr \
-		--with-udevdir=/usr/lib/udev
-	LANG="en_US.UTF-8" make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir/usr/share/licenses/$pkgname"
-	install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-sha512sums="7686aadb559b5a2cd2b969b9aadcf4c2b35037702e6fef4db66c6b8c0860d400c9f46a3b46150b9ce573d4f1fca53a5302fa7c1cdf888942a6489613c4d3c071  media-player-info-22.tar.gz
-db7416b230070782172b5999ae28d0e2e867f6c0cce1b40567c63ea39ca991fe4fadcb975aa3b2980a7df883dcf19bbb5a5f43706f8ca2b127204ce47bc4d949  media-player-info.post-install"
diff --git a/kde/media-player-info/media-player-info.post-install b/kde/media-player-info/media-player-info.post-install
deleted file mode 100644
index b5798f90b..000000000
--- a/kde/media-player-info/media-player-info.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-udevadm hwdb --update
-udevadm control --reload
-
-exit 0
diff --git a/kde/milou/APKBUILD b/kde/milou/APKBUILD
deleted file mode 100644
index aeae30c7f..000000000
--- a/kde/milou/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=milou
-pkgver=5.10.4
-pkgrel=1
-pkgdesc="A dedicated search application built on top of Baloo"
-arch="all"
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license="LGPL"
-depends="krunner"
-makedepends="extra-cmake-modules kdoctools python krunner"
-source="https://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
-subpackages="$pkgname-lang"
-
-prepare() {
-  mkdir -p $srcdir/build
-}
-
-build() {
-  cd $srcdir/build
-  cmake "$srcdir"/${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR="${pkgdir}" install
-}
-sha512sums="f30cf9370cf5d9df4c2c2a824578dfb7a6f8d552c019dab22296ee231679be998d803e4093cb6549020ba163c92333fe66aeed6d21026a7900a5587643037943  milou-5.10.4.tar.xz"
diff --git a/kde/networkmanager-qt/APKBUILD b/kde/networkmanager-qt/APKBUILD
deleted file mode 100644
index 823bd2625..000000000
--- a/kde/networkmanager-qt/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-pkgname=networkmanager-qt
-pkgver=5.37.0
-pkgrel=1
-pkgdesc='Qt wrapper for NetworkManager API'
-arch="all"
-url='https://community.kde.org/Frameworks'
-license="LGPL"
-depends="networkmanager qt5-qtbase"
-makedepends="extra-cmake-modules doxygen qt5-qttools-dev networkmanager-dev"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-subpackages="$pkgname-dev $pkgname-doc"
-
-prepare() {
-	mkdir -p $srcdir/build
-}
-
-build() {
-	cd $srcdir/build
-	cmake "$srcdir"/${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDE_INSTALL_LIBDIR=lib \
-		-DBUILD_TESTING=OFF \
-		-DBUILD_QCH=ON
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR="${pkgdir}" install
-}
-sha512sums="6a6cd1382cb6483928bb9eac7590c2984751f47fe0f71d7c05723509dc1bb4bda4bf6854f3b662c9ddcaa7d6c1f6d7001e459a0bd335a24f2c14d00d3878bc75  networkmanager-qt-5.37.0.tar.xz"
diff --git a/kde/phonon/APKBUILD b/kde/phonon/APKBUILD
index 1ebf344a7..b4b895475 100644
--- a/kde/phonon/APKBUILD
+++ b/kde/phonon/APKBUILD
@@ -7,8 +7,8 @@ arch="all"
 license="LGPL"
 depends_dev="qt5-qtbase-dev glib-dev"
 makedepends="$depends_dev extra-cmake-modules cmake automoc4"
-subpackages="$pkgname-dev"
 source="http://download.kde.org/stable/phonon/${pkgver}/phonon-$pkgver.tar.xz"
+subpackages="$pkgname-dev"
 
 builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
diff --git a/kde/plasma-framework/APKBUILD b/kde/plasma-framework/APKBUILD
index 94d37164b..5b335aac2 100644
--- a/kde/plasma-framework/APKBUILD
+++ b/kde/plasma-framework/APKBUILD
@@ -5,10 +5,14 @@ pkgdesc='Plasma library and runtime components based upon KF5 and Qt5'
 arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
-depends="qt5-qtquickcontrols kactivities-dev kdeclarative-dev kwayland-dev kio-dev"
-makedepends="extra-cmake-modules qt5-qttools-dev kdoctools python kactivities
-			 kdeclarative-dev knotifications-dev qt5-qtdeclarative-dev qt5-qtsvg-dev
-			 kio-dev kwayland-dev kdbusaddons-dev qt5-x11extras-dev"
+depends="qt5-qtquickcontrols"
+makedepends="extra-cmake-modules qt5-qttools-dev doxygen kdoctools-dev python kactivities-dev
+			 kdeclarative-dev knotifications-dev qt5-qtdeclarative-dev qt5-qtsvg-dev kio-dev
+			 kwayland-dev kdbusaddons-dev qt5-x11extras-dev karchive-dev kguiaddons-dev
+			 kservice-dev kbookmarks-dev kcompletion-dev kitemviews-dev kjobwidgets-dev
+			 solid-dev kxmlgui-dev kglobalaccel-dev kconfig-dev kconfigwidgets-dev kauth-dev
+			 kcoreaddons-dev kcodecs-dev kwidgetsaddons-dev kpackage-dev ki18n-dev kiconthemes-dev
+			 kwindowsystem-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
diff --git a/kde/plasma-mobile/APKBUILD b/kde/plasma-mobile/APKBUILD
index 6a44d2711..0bbda5017 100644
--- a/kde/plasma-mobile/APKBUILD
+++ b/kde/plasma-mobile/APKBUILD
@@ -6,7 +6,12 @@ arch="all"
 url="https://community.kde.org/Plasma/Mobile"
 license="GPL3"
 depends="plasma-workspace kio"
-makedepends="extra-cmake-modules baloo kdoctools plasma-workspace qt5-qtdeclarative-dev kio-dev kdelibs4support-dev kwindowsystem-dev"
+makedepends="extra-cmake-modules kdoctools-dev plasma-workspace-dev qt5-qtdeclarative-dev
+			 kio-dev kdelibs4support-dev kwindowsystem-dev kwayland-dev karchive-dev sonnet-dev
+			 knotifications-dev kiconthemes-dev plasma-framework-dev kpackage-dev kdeclarative-dev
+			 kactivities-dev kcodecs-dev kcoreaddons-dev solid-dev kconfig-dev kauth-dev
+			 kdbusaddons-dev ki18n-dev kservice-dev kcompletion-dev kbookmarks-dev kwidgetsaddons-dev
+			 kitemviews-dev kjobwidgets-dev kxmlgui-dev kconfigwidgets-dev"
 install="$pkgname.post-install
 		 $pkgname.post-upgrade
 		 $pkgname.post-deinstall"
diff --git a/kde/plasma-phone-components/APKBUILD b/kde/plasma-phone-components/APKBUILD
index 98bebc332..f367645dc 100644
--- a/kde/plasma-phone-components/APKBUILD
+++ b/kde/plasma-phone-components/APKBUILD
@@ -5,8 +5,12 @@ pkgdesc="Modules providing phone functionality for Plasma"
 arch="all"
 url="https://community.kde.org/Plasma/Mobile"
 license="GPL3"
-depends="plasma-workspace kpeople telepathy-qt qt5-qtgraphicaleffects"
-makedepends="kpeople telepathy-qt"
+depends="plasma-workspace qt5-qtgraphicaleffects"
+makedepends="extra-cmake-modules kpeople-dev telepathy-qt5-dev qt5-qtdeclarative-dev kpeople-dev
+			 plasma-framework-dev kservice-dev kdeclarative-dev ki18n-dev kio-dev kcoreaddons-dev
+			 kconfig-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev
+			 kjobwidgets-dev solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev
+			 kpackage-dev kwindowsystem-dev kdbusaddons-dev knotifications-dev kwayland-dev"
 install="$pkgname.post-install
 		 $pkgname.post-upgrade
 		 $pkgname.post-deinstall"
@@ -14,12 +18,12 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/KDE/$pkgname/archive/master.
 		$install"
 
 prepare() {
-	mkdir -p $srcdir/build
+	mkdir -p "$srcdir"/build
 }
 
 build() {
-	cd $srcdir/build
-	cmake $srcdir/$pkgname-master \
+	cd "$srcdir"/build
+	cmake "$srcdir"/$pkgname-master \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_TESTING=OFF \
 		-DLIB_INSTALL_DIR=lib \
@@ -30,7 +34,7 @@ build() {
 }
 
 package() {
-	cd $srcdir/build
+	cd "$srcdir"/build
 	make DESTDIR="$pkgdir/" install
 }
 sha512sums="abf94dc5c0801b333b434ba408952a1be45e3c58896204689bc62a8fde5605137ed6b69f7684f47a2834dc3d1e042bb00282501f2482434871acc92e084eddd8  plasma-phone-components-682.b79bb13.tar.gz
diff --git a/kde/plasma-workspace/APKBUILD b/kde/plasma-workspace/APKBUILD
index ee61a9e9c..d524e3d4d 100644
--- a/kde/plasma-workspace/APKBUILD
+++ b/kde/plasma-workspace/APKBUILD
@@ -6,15 +6,23 @@ arch="all"
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license="LGPL"
 depends="kjsembed knotifyconfig libxdamage qt5-qttools xrdb xsetroot
-		 kactivitymanagerd xprop milou kwin kdelibs4support kxmlgui
+		 kactivitymanagerd xprop kwin kdelibs4support kxmlgui
 		 kdesu iso-codes qt5-qtwayland"
-makedepends="extra-cmake-modules kdoctools gpsd krunner kdesignerplugin
-			 kxmlrpcclient kdelibs4support plasma-framework knotifyconfig kjsembed	
-			 baloo libxtst-dev kcmutils kdesu kwallet ksysguard kwin networkmanager-qt
-			 kxmlrpcclient ktexteditor kparts phonon qt5-qtwayland"
+makedepends="extra-cmake-modules kdoctools-dev gpsd krunner-dev kdesignerplugin kdesignerplugin-dev
+			 kxmlrpcclient-dev kdelibs4support-dev plasma-framework-dev knotifyconfig-dev
+			 libxtst-dev kcmutils-dev kdesu-dev kwallet-dev ksysguard kwin-dev kguiaddons-dev
+			 qt5-qtwayland kjsembed-dev knewstuff-dev libxrender-dev qt5-x11extras-dev
+			 kwallet-dev attica-qt5-dev kitemmodels-dev kscreenlocker-dev libksysguard-dev
+			 xcb-util-image-dev qt5-qtscript-dev karchive-dev kcrash-dev kpackage-dev
+			 kdeclarative-dev kpty-dev kjs-dev ktextwidgets-dev sonnet-dev kauth-dev
+			 kconfigwidgets-dev ki18n-dev kcodecs-dev kwidgetsaddons-dev kservice-dev
+			 kxmlgui-dev kwindowsystem-dev kcoreaddons-dev kconfig-dev kemoticons-dev
+			 kiconthemes-dev kinit-dev knotifications-dev kio-dev kbookmarks-dev kparts-dev
+			 kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kunitconversion-dev
+			 kdbusaddons-dev kidletime-dev kglobalaccel-dev phonon-dev kwayland-dev kactivities-dev"
 source="https://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz
 		kde.pam"
-subpackages="$pkgname-doc $pkgname-lang"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/polkit-qt5/APKBUILD b/kde/polkit-qt5/APKBUILD
index 4b32e3232..9beeecdbc 100644
--- a/kde/polkit-qt5/APKBUILD
+++ b/kde/polkit-qt5/APKBUILD
@@ -8,6 +8,7 @@ license="LGPL"
 depends="polkit"
 makedepends="cmake automoc4 polkit-dev qt5-qtbase-dev"
 source="$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-dev"
 
 prepare() {
 	mkdir -p $srcdir/build
diff --git a/kde/poppler-qt5/APKBUILD b/kde/poppler-qt5/APKBUILD
index 58169e943..f7fad961e 100644
--- a/kde/poppler-qt5/APKBUILD
+++ b/kde/poppler-qt5/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=poppler-qt5
 pkgdesc="Poppler Qt5 bindings"
-pkgver=0.56.0
+pkgver=0.57.0
 pkgrel=1
 arch="all"
 license="GPL"
@@ -12,7 +12,7 @@ url="https://poppler.freedesktop.org/"
 source="https://poppler.freedesktop.org/poppler-${pkgver}.tar.xz"
 
 build() {
-	cd "${pkgname/-qt5/}-${pkgver}"
+	cd "$srcdir"/${pkgname/-qt5/}-${pkgver}
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -42,4 +42,4 @@ package() {
 	install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
 	rm -f "${pkgdir}"/usr/lib/libpoppler.*
 }
-sha512sums="74d2ca63afcb7e155c153b4ddc71621b7f4f2c60d4fcafd873176d5ac59fafedc35b200a22c7af2013d7f75e670a1cc23d6ba878167a02209917f8d30002d528  poppler-0.56.0.tar.xz"
+sha512sums="197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f  poppler-0.57.0.tar.xz"
diff --git a/kde/solid/APKBUILD b/kde/solid/APKBUILD
index 39288170b..c03cb1a49 100644
--- a/kde/solid/APKBUILD
+++ b/kde/solid/APKBUILD
@@ -5,7 +5,7 @@ pkgdesc='Hardware integration and detection'
 arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
-depends="qt5-qtdeclarative media-player-info upower eudev"
+depends="qt5-qtdeclarative upower eudev"
 makedepends="extra-cmake-modules qt5-qttools-dev doxygen eudev-dev flex-dev bison"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/kde/syntax-highlighting/APKBUILD b/kde/syntax-highlighting/APKBUILD
index cc6f77eb7..43d091241 100644
--- a/kde/syntax-highlighting/APKBUILD
+++ b/kde/syntax-highlighting/APKBUILD
@@ -6,9 +6,10 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="GPL2"
 depends="qt5-qtbase"
-makedepends="extra-cmake-modules qt5-qtxmlpatterns-dev qt5-qttools-dev"
+makedepends="extra-cmake-modules qt5-qttools-dev doxygen"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        apkbuild-syntax-highlight.patch"
+        apkbuild-syntax-highlight.patch
+		remove-broken-regex.patch"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 prepare() {
@@ -17,6 +18,7 @@ prepare() {
 	# Add APKBUILD syntax highlighting
 	cd "$srcdir"/$pkgname-$pkgver
 	patch -p1 -i ../apkbuild-syntax-highlight.patch
+	patch -p1 -i ../remove-broken-regex.patch
 }
 
 build() {
@@ -35,4 +37,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 sha512sums="d49f62934283c07c1b6e8fad11b9fa469b21bb55f35ddbc6c28ab29bd79b7cba67a93d0b46abb8b3d86ee7ba7a90ea50a98553aac7bdfe396bc2b010611c24c2  syntax-highlighting-5.37.0.tar.xz
-0722d3c44c52f70eae5636c7f912e8e53491a728c96968705c14621fb38749583d855ffdf07ea84cecfcfce0e6c295fe500a06190f7bc82082d67986d879f66e  apkbuild-syntax-highlight.patch"
+0722d3c44c52f70eae5636c7f912e8e53491a728c96968705c14621fb38749583d855ffdf07ea84cecfcfce0e6c295fe500a06190f7bc82082d67986d879f66e  apkbuild-syntax-highlight.patch
+8a94d1c88736d8b3783588637e255a6ec81064fd9d6716eb5ace63161e29b986d58829f83c08816c652aa0a34974ad83f3a91c6cadb7974c6e19e160734e8052  remove-broken-regex.patch"
diff --git a/kde/syntax-highlighting/remove-broken-regex.patch b/kde/syntax-highlighting/remove-broken-regex.patch
new file mode 100644
index 000000000..2265e1054
--- /dev/null
+++ b/kde/syntax-highlighting/remove-broken-regex.patch
@@ -0,0 +1,35 @@
+diff --git a/data/syntax/rest.xml b/data/syntax/rest.xml
+index 1363965..f0f65a6 100644
+--- a/data/syntax/rest.xml
++++ b/data/syntax/rest.xml
+@@ -24,11 +24,9 @@
+         <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" column="0"/>
+         <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" column="0"/>
+         <RegExpr attribute="Code" String="^\s*\.\. code-block::" context="CodeBlock" column="0"/>
+-        <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" column="0"/>
+         <RegExpr attribute="Code" String="::$" context="CodeBlock" />
+         <RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" column="0"/>
+         <RegExpr attribute="Field" String=":(?=([^:]*\\:)*[^:]*:(\s|$))" context="Field" firstNonSpace="true"/>
+-        <RegExpr attribute="Comment" context="Comment" String="^(\s*)\.\.\s(?![\w-_\.]+::(\s|$))" column="0"/>
+       </context>
+ 
+       <context name="InlineMarkup" attribute="Normal" lineEndContext="#stay">
+@@ -38,8 +36,6 @@
+         <RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[&SimpleReferenceNameChars;]+\]_&inlineend;" minimal="true"/>
+         <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;`[^\s].*`_&inlineend;" minimal="true"/>
+         <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;\w+_&inlineend;" minimal="true"/>
+-        <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w-_\.\+]+:)" minimal="true"/>
+-        <RegExpr attribute="Role" String=":[\w-_\.\+]+:(?=`)" context="Role"/>
+       </context>
+ 
+       <context name="Field" attribute="Field" lineEndContext="#stay">
+@@ -55,9 +51,6 @@
+       <context name="Role" attribute="Role" lineEndContext="#pop">
+         <DetectChar attribute="InterpretedText" char="`" context="#pop!InterpretedText" />
+       </context>
+-      <context name="TrailingRole" attribute="Role" lineEndContext="#pop">
+-        <RegExpr attribute="Role" String=":[\w-_\.\+]+:" context="#pop"/>
+-      </context>
+       <context name="Comment" attribute="Comment" lineEndContext="#stay" dynamic="true">
+         <RegExpr attribute="Code" String="^%1   " context="#stay" column="0" dynamic="true"/>
+         <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" column="0" context="#pop"/>
diff --git a/kde/telepathy-farstream/APKBUILD b/kde/telepathy-farstream/APKBUILD
index 389fd97cb..a3f9a47c9 100644
--- a/kde/telepathy-farstream/APKBUILD
+++ b/kde/telepathy-farstream/APKBUILD
@@ -6,8 +6,11 @@ arch="all"
 url="https://telepathy.freedesktop.org/components/telepathy-farstream/"
 license="LGPL2.1"
 depends="telepathy-glib farstream"
-makedepends="dbus-glib gobject-introspection-dev python2 telepathy-glib farstream-dev farstream gtk-doc autoconf automake"
+makedepends="dbus-glib-dev file python2 telepathy-glib-dev farstream-dev farstream gtk-doc
+			 autoconf automake libtool gobject-introspection-dev"
 source="https://github.com/TelepathyIM/$pkgname/archive/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc"
+
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgname-$pkgver # why would somebody use this naming scheme?!
@@ -16,6 +19,7 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgname-$pkgver
+	NOCONFIGURE=1 ./autogen.sh
 	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/telepathy \
 		--disable-static --enable-gtk-doc
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/kde/telepathy-glib/APKBUILD b/kde/telepathy-glib/APKBUILD
index 5e5f508f1..d55222af4 100644
--- a/kde/telepathy-glib/APKBUILD
+++ b/kde/telepathy-glib/APKBUILD
@@ -6,14 +6,14 @@ arch="all"
 url="http://telepathy.freedesktop.org"
 license="LGPL2.1"
 depends="dbus-glib"
-makedepends="libxslt vala gobject-introspection python2 diffutils"
+makedepends="libxslt python2 diffutils dbus-glib-dev"
 source="https://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
 		--libexecdir=/usr/lib/telepathy \
-		--enable-vala-bindings \
 		--enable-static=no
 	make
 }
diff --git a/kde/telepathy-qt/APKBUILD b/kde/telepathy-qt5/APKBUILD
similarity index 76%
rename from kde/telepathy-qt/APKBUILD
rename to kde/telepathy-qt5/APKBUILD
index d420c326b..a30a4c8d1 100644
--- a/kde/telepathy-qt/APKBUILD
+++ b/kde/telepathy-qt5/APKBUILD
@@ -1,4 +1,4 @@
-pkgname=telepathy-qt
+pkgname=telepathy-qt5
 pkgver=0.9.7
 pkgrel=1
 arch="all"
@@ -6,11 +6,9 @@ url="http://telepathy.freedesktop.org/wiki/"
 license="LGPL"
 pkgdesc="A library for Qt-based Telepathy clients"
 depends="qt5-qtbase telepathy-farstream"
-makedepends="cmake doxygen python2 qt5-qttools-dev telepathy-farstream"
-conflicts="telepathy-qt5"
-provides="telepathy-qt5"
-replaces="telepathy-qt5"
-source="https://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+makedepends="cmake doxygen python2 qt5-qttools-dev telepathy-farstream dbus-glib-dev"
+source="https://telepathy.freedesktop.org/releases/${pkgname/qt5/qt}/${pkgname/qt5/qt}-$pkgver.tar.gz"
+subpackages="$pkgname-dev"
 
 prepare() {
 	mkdir -p $srcdir/build
@@ -18,7 +16,7 @@ prepare() {
 
 build() {
 	cd $srcdir/build
-	cmake $srcdir/$pkgname-$pkgver \
+	cmake $srcdir/${pkgname/qt5/qt}-$pkgver \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DPYTHON_EXECUTABLE=/usr/bin/python2 \
diff --git a/kde/threadweaver/APKBUILD b/kde/threadweaver/APKBUILD
index 1d5ba9453..fce717644 100644
--- a/kde/threadweaver/APKBUILD
+++ b/kde/threadweaver/APKBUILD
@@ -6,7 +6,7 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="qt5-qtbase"
-makedepends="extra-cmake-modules mesa-dev qt5-qttools-dev"
+makedepends="extra-cmake-modules mesa-dev qt5-qttools-dev doxygen qt5-qtdeclarative-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"