diff --git a/khelpcenter/PKGBUILD b/khelpcenter/PKGBUILD
index a26bc5667..ae81e8ff3 100644
--- a/khelpcenter/PKGBUILD
+++ b/khelpcenter/PKGBUILD
@@ -3,12 +3,12 @@ source ../plasma.conf
 pkgname=khelpcenter
 pkgver=${PVersion}
 pkgrel=1
-pkgdesc="KHelpCenter"
+pkgdesc="Application to show KDE Applications' documentation"
 arch=('x86_64')
-url='http://projects.kde.org'
+url='https://projects.kde.org/projects/kde/workspace/khelpcenter'
 license=('LGPL')
-depends=('qt5-base')
-makedepends=('extra-cmake-modules' 'kdelibs4support' 'kemoticons' 'kinit' 'khtml' 'kcmutils' 'kitemmodels')
+depends=('khtml' 'kdelibs4support' 'kcmutils')
+makedepends=('extra-cmake-modules' 'kdoctools')
 checkdepends=("cmake")
 groups=('plasma')
 options=("debug")
@@ -21,10 +21,7 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=${PBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${PInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib 
+  cmake_kf5 ../${pkgname}-${pkgver}
   make
 }
 
diff --git a/kinfocenter/PKGBUILD b/kinfocenter/PKGBUILD
index b07007183..b5798253e 100644
--- a/kinfocenter/PKGBUILD
+++ b/kinfocenter/PKGBUILD
@@ -5,11 +5,11 @@ source ../plasma.conf
 pkgname=kinfocenter
 pkgver=${PVersion}
 pkgrel=1
-pkgdesc='kinfocenter'
+pkgdesc='KInfocenter'
 arch=('x86_64')
-url='projects.kde.org/'
+url='https://projects.kde.org/projects/kde/workspace/kinfocenter'
 license=('LGPL')
-depends=('qt5-base' 'kxmlgui' 'solid' 'kwidgetsaddons' 'plasma-framework' 'kdelibs4support' 'kemoticons' 'kcmutils') # kwayland add when ready
+depends=('kdelibs4support' 'kcmutils' 'pciutils' 'glu' 'libraw1394' 'kwayland')
 makedepends=('extra-cmake-modules')
 checkdepends=("cmake")
 groups=('plasma')
@@ -23,10 +23,7 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=${PBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${PInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib 
+  cmake_kf5 ../${pkgname}-${pkgver}
   make
 }
 
diff --git a/kwrited/PKGBUILD b/kwrited/PKGBUILD
index 88539bf05..687739a50 100644
--- a/kwrited/PKGBUILD
+++ b/kwrited/PKGBUILD
@@ -5,12 +5,12 @@ source ../plasma.conf
 pkgname=kwrited
 pkgver=${PVersion}
 pkgrel=1
-pkgdesc="KWrited"
+pkgdesc='Kwrited'
 arch=('x86_64')
-url='projects.kde.org/'
+url='https://projects.kde.org/projects/kde/workspace/kwrited'
 license=('LGPL')
-depends=('qt5-base' 'kpty' 'kdelibs4support' 'kemoticons' 'kitemmodels' 'kinit')
-makedepends=('extra-cmake-modules')
+depends=('kpty' 'kdelibs4support')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python3')
 checkdepends=("cmake")
 groups=('plasma')
 options=("debug")
@@ -23,10 +23,8 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=${PBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${PInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib 
+  cmake_kf5 ../${pkgname}-${pkgver} \
+    -DPYTHON_EXECUTABLE=/usr/bin/python3
   make
 }
 
diff --git a/libkscreen-kf5/PKGBUILD b/libkscreen-kf5/PKGBUILD
index 34e289338..565466ca2 100644
--- a/libkscreen-kf5/PKGBUILD
+++ b/libkscreen-kf5/PKGBUILD
@@ -6,11 +6,11 @@ pkgname=libkscreen-kf5
 _pkgname=libkscreen
 pkgver=${PVersion}
 pkgrel=1
-pkgdesc="KDE's screen management library"
+pkgdesc='KDE screen management software'
 arch=('x86_64')
-url='projects.kde.org/'
+url='https://projects.kde.org/projects/extragear/libs/libkscreen'
 license=('LGPL')
-depends=('qt5-base' 'qt5-x11extras')
+depends=('qt5-x11extras' 'libxrandr')
 makedepends=('extra-cmake-modules')
 checkdepends=("cmake")
 groups=('plasma')
@@ -27,10 +27,7 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${_pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=${PBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${PInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib 
+  cmake_kf5 ../${_pkgname}-${pkgver}
   make
 }
 
diff --git a/plasma-workspace-wallpapers/PKGBUILD b/plasma-workspace-wallpapers/PKGBUILD
index e2db6d846..f94152ad2 100644
--- a/plasma-workspace-wallpapers/PKGBUILD
+++ b/plasma-workspace-wallpapers/PKGBUILD
@@ -3,13 +3,11 @@ source ../plasma.conf
 pkgname=plasma-workspace-wallpapers
 pkgver=${PVersion}
 pkgrel=1
-pkgdesc="Plasma Desktop"
-arch=('x86_64')
-url='http://projects.kde.org'
+pkgdesc='Additional wallpapers for the Plasma Workspace'
+arch=('any')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
 license=('LGPL')
-depends=('plasma-workspace')
 makedepends=('extra-cmake-modules')
-checkdepends=("cmake")
 groups=('plasma')
 options=("debug")
 source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz")
@@ -21,18 +19,10 @@ prepare() {
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=${PBuildType} \
-    -DCMAKE_INSTALL_PREFIX=${PInstallPrefix} \
-    -DLIB_INSTALL_DIR=lib 
+  cmake_kf5 ../${pkgname}-${pkgver}
   make
 }
 
-check() {
-  cd build
-  make test || return 0
-}
-
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
diff --git a/polkit-kde-frameworks/PKGBUILD b/polkit-kde-agent-frameworks/PKGBUILD
similarity index 100%
rename from polkit-kde-frameworks/PKGBUILD
rename to polkit-kde-agent-frameworks/PKGBUILD
diff --git a/polkit-kde-frameworks/libexecpath.patch b/polkit-kde-agent-frameworks/libexecpath.patch
similarity index 100%
rename from polkit-kde-frameworks/libexecpath.patch
rename to polkit-kde-agent-frameworks/libexecpath.patch