diff --git a/kde/calendarsupport/APKBUILD b/kde/calendarsupport/APKBUILD
index 2d5a9eb4d02e008a147a065f282463d5d7310c15..dbedf9732efa13854d9c7cb1f9b9c6dc53d2e5ac 100644
--- a/kde/calendarsupport/APKBUILD
+++ b/kde/calendarsupport/APKBUILD
@@ -8,11 +8,11 @@ arch="all"
 url="https://api.kde.org/kdepim/calendarsupport/html"
 license="GPL-2.0 LGPL-2.1"
 depends=""
-depends_dev="akonadi-dev kmime-dev akonadi-mime-dev kcalutils-dev kholidays-dev akonadi-calendar-dev"
+depends_dev="akonadi-dev kmime-dev akonadi-mime-dev kcalutils-dev kholidays-dev akonadi-calendar-dev
+	pimcommon-dev kdepim-apps-libs-dev"
 makedepends="$depends_dev extra-cmake-modules qt5-qttools-dev"
 source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
 	cmake \
diff --git a/kde/grantleetheme/APKBUILD b/kde/grantleetheme/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..fcfc0be59a01d3876ec2f65bb64a39a894569834
--- /dev/null
+++ b/kde/grantleetheme/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=grantleetheme
+pkgver=18.08.1
+pkgrel=0
+pkgdesc="KDE PIM mail related libraries"
+arch="all"
+url="https://kontact.kde.org/"
+license="GPL-2.0 LGPL-2.1"
+depends=
+makedepends="extra-cmake-modules qt5-qtbase-dev ki18n-dev kiconthemes-dev knewstuff-dev
+	grantlee-dev"
+source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-lang"
+options="!check" # Requires running X11 server
+
+build() {
+	cd "$builddir"
+	cmake ../$pkgname-$pkgver \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib	
+	make
+}
+
+check() {
+	cd "$builddir"
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+sha512sums="1e83eb236856961eee43da212a37f0e58d9fbc1f151303007a27367b04098c813c64f2edb5741988ef4f00bc5053c6cc1b4edc746d8be0a524648cfc8e517e70  grantleetheme-18.08.1.tar.xz"
diff --git a/kde/kdepim-apps-libs/APKBUILD b/kde/kdepim-apps-libs/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..2247f7468fac5d8ba7f6dabab100dfc8615c4b9c
--- /dev/null
+++ b/kde/kdepim-apps-libs/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=kdepim-apps-libs
+pkgver=18.08.1
+pkgrel=0
+pkgdesc="KDE PIM mail related libraries"
+arch="all"
+url="https://kontact.kde.org/"
+license="GPL-2.0 LGPL-2.1"
+depends=
+makedepends="extra-cmake-modules grantleetheme-dev akonadi-dev akonadi-contacts-dev libkleo-dev
+	gpgme-dev pimcommon-dev"
+source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-lang"
+
+build() {
+	cd "$builddir"
+	cmake ../$pkgname-$pkgver \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib	
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+sha512sums="f30e3183b5212993a41eafce081f7d6f7e5636ba9996b6ec4af0f6ca69e68d7bc5b53151c03203b556c01e3325ccab01f3742ab3ca54e339187df391b2757b04  kdepim-apps-libs-18.08.1.tar.xz"
diff --git a/kde/libkleo/APKBUILD b/kde/libkleo/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..59dd816781ec6411d195e823512bfcc6d94248fa
--- /dev/null
+++ b/kde/libkleo/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=libkleo
+pkgver=18.08.1
+pkgrel=0
+pkgdesc="KDE PIM cryptographic library"
+arch="all"
+url="https://kontact.kde.org"
+license="GPL-2.0 LGPL-2.1"
+depends=""
+makedepends="extra-cmake-modules qt5-qtbase-dev ki18n-dev kconfig-dev kwidgetsaddons-dev
+	kcompletion-dev kwindowsystem-dev kcoreaddons-dev kcodecs-dev kitemmodels-dev gpgme-dev
+	kpimtextedit-dev boost-dev"
+source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-lang"
+
+build() {
+	cd "$builddir"
+	cmake ../$pkgname-$pkgver \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib	
+	make
+}
+
+check() {
+	cd "$builddir"
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+sha512sums="3df1d5236d31636de4811dea600b660d1920613a56c0ec7821fdf3451737d896ba129746f5a838cfb96d106dcd68b3170efdf2616f8e56b562e59cd7ec7ce1ed  libkleo-18.08.1.tar.xz"
diff --git a/kde/okular/APKBUILD b/kde/okular/APKBUILD
index 1d129761f35dd976fe80e44130ab0443409dabfc..da83e0846b7cfc559f896aa0a2a6203bae1cf559 100644
--- a/kde/okular/APKBUILD
+++ b/kde/okular/APKBUILD
@@ -7,19 +7,22 @@ arch="all"
 url="https://github.com/KDE/koko"
 pkgdesc="KDE document viewer"
 license="GPL-2.0 LGPL-2.1 GFDL-1.2"
-depends="kirigami2"
+depends=""
 makedepends="extra-cmake-modules qt5-qtbase-dev kparts-dev threadweaver-dev kjs-dev kwallet-dev
-	kactivities-dev kpty-dev qca-qt5-dev kirigami2-dev"
+	kactivities-dev kpty-dev qca-qt5-dev kirigami2-dev kdoctools-dev khtml-dev libzip-dev
+	libpng-dev"
 source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz
-	musl-fixes.patch"
-subpackages="$pkgname-doc $pkgname-lang"
+	musl-fixes.patch
+	enable-kirigami-desktop-file.patch"
+subpackages="$pkgname-doc $pkgname-lang $pkgname-mobile"
 options="!check" # Requires running X11
 
 build() {
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_OKULARKIRIGAMI=ON
 	make
 }
 
@@ -33,5 +36,15 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
+mobile() {
+	depends="kirigami2"
+	mkdir -p "$subpkgdir"/usr/bin
+	mkdir -p "$subpkgdir"/usr/share/applications
+	
+	mv "$pkgdir"/usr/bin/okularkirigami "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/share/applications/org.kde.okular.kirigami.desktop "$subpkgdir"/usr/share/applications/
+}
+
 sha512sums="4114c614c3d773de158469a201c976ad36d706a0eb00b238af49d5e5a97fb272ce6033f744101c7e26110a7ac6b9c6cda26e3fc8c9c1bde22277f3ba2c55a375  okular-18.08.1.tar.xz
-41245d4e13603d82047ef8222f212d7f0ac72de4415a8c6409e537249da52a5669e1f3d64b99db376fe384b36abfa6362ccf5686a4f0558837b7b5a8f61530b9  musl-fixes.patch"
+41245d4e13603d82047ef8222f212d7f0ac72de4415a8c6409e537249da52a5669e1f3d64b99db376fe384b36abfa6362ccf5686a4f0558837b7b5a8f61530b9  musl-fixes.patch
+63d8f3ea3515e70cc015f2deaaee9d61313177656ee56a9a5a3d3a71823fbdabd0da9a3b57c02ba8d1e8d71d2886fdf628bdb70650d14589e8de8f38c19f439f  enable-kirigami-desktop-file.patch"
diff --git a/kde/okular/enable-kirigami-desktop-file.patch b/kde/okular/enable-kirigami-desktop-file.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0fbfd0cb971086a40a5933d393b77d4c885a0990
--- /dev/null
+++ b/kde/okular/enable-kirigami-desktop-file.patch
@@ -0,0 +1,13 @@
+diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop
+index 55b6547..639cad8 100644
+--- a/mobile/app/package/metadata.desktop
++++ b/mobile/app/package/metadata.desktop
+@@ -112,7 +112,7 @@ GenericName[zh_TW]=文件檢視器
+ Type=Application
+ Exec=okularkirigami
+ Icon=okular
+-NoDisplay=true
++NoDisplay=false
+ X-KDE-ParentApp=
+ X-KDE-PluginInfo-Author=Marco Martin
+ X-KDE-PluginInfo-Email=mart@kde.org