diff --git a/kde-apps/okular/okular-23.08.5.recipe b/kde-apps/okular/okular-23.08.5.recipe
deleted file mode 100644
index edcc9d972..000000000
--- a/kde-apps/okular/okular-23.08.5.recipe
+++ /dev/null
@@ -1,226 +0,0 @@
-SUMMARY="Universal document viewer based on KDE Frameworks"
-DESCRIPTION="Okular is a universal document viewer developed by KDE. Okular works on multiple platforms, \
-including but not limited to Linux, Windows, Mac OS X, *BSD, etc.
-
-Features:
-* Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
-* Sidebar with contents, thumbnails, reviews and bookmarks
-* Annotations support"
-HOMEPAGE="https://okular.kde.org"
-COPYRIGHT="2010-2024 KDE Organisation"
-LICENSE="GNU LGPL v2"
-REVISION="2"
-SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/okular-$portVersion.tar.xz"
-CHECKSUM_SHA256="d5d51f69b176a250907ee70e8f97143fc9d705cee3ef7ff448626c8a529ce364"
-PATCHES="okular-$portVersion.patchset"
-ADDITIONAL_FILES="okular.rdef.in"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	okular$secondaryArchSuffix = $portVersion
-	app:Okular$secondaryArchSuffix = $portVersion
-	lib:libOkular5Core$secondaryArchSuffix = 11.0.0 compat >= 11
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libchm$secondaryArchSuffix
-	lib:libdjvulibre$secondaryArchSuffix
-	lib:libepub$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libKF5Activities$secondaryArchSuffix
-	lib:libKF5Archive$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
-	lib:libKF5Bookmarks$secondaryArchSuffix
-	lib:libKF5Codecs$secondaryArchSuffix
-	lib:libKF5Completion$secondaryArchSuffix
-	lib:libKF5ConfigCore$secondaryArchSuffix
-	lib:libKF5ConfigGui$secondaryArchSuffix
-	lib:libKF5ConfigWidgets$secondaryArchSuffix
-	lib:libKF5CoreAddons$secondaryArchSuffix
-	lib:libKF5Crash$secondaryArchSuffix
-	lib:libKF5DBusAddons$secondaryArchSuffix
-	lib:libKF5DocTools$secondaryArchSuffix
-	lib:libKF5GuiAddons$secondaryArchSuffix
-	lib:libKF5I18n$secondaryArchSuffix
-	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemModels$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
-	lib:libKF5JobWidgets$secondaryArchSuffix
-	lib:libKF5JS$secondaryArchSuffix
-	lib:libKF5JSApi$secondaryArchSuffix
-	lib:libKF5KExiv2$secondaryArchSuffix
-	lib:libKF5KIOCore$secondaryArchSuffix
-	lib:libKF5KIOFileWidgets$secondaryArchSuffix
-	lib:libKF5KIOWidgets$secondaryArchSuffix
-	lib:libKF5KHtml$secondaryArchSuffix
-	lib:libKF5Notifications$secondaryArchSuffix
-	lib:libKF5Parts$secondaryArchSuffix
-	lib:libKF5Pty$secondaryArchSuffix
-	lib:libKF5Purpose$secondaryArchSuffix
-	lib:libKF5Service$secondaryArchSuffix
-	lib:libKF5Solid$secondaryArchSuffix
-	lib:libKF5SonnetUi$secondaryArchSuffix
-	lib:libKF5TextEditor$secondaryArchSuffix
-	lib:libKF5TextWidgets$secondaryArchSuffix
-	lib:libKF5ThreadWeaver$secondaryArchSuffix
-	lib:libKF5UnitConversion$secondaryArchSuffix
-	lib:libKF5Wallet$secondaryArchSuffix
-	lib:libKF5WidgetsAddons$secondaryArchSuffix
-	lib:libKF5WindowSystem$secondaryArchSuffix
-	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libmarkdown$secondaryArchSuffix
-	lib:libphonon4qt5$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libpoppler_qt5$secondaryArchSuffix
-	lib:libqca_qt5$secondaryArchSuffix
-	lib:libqmobipocket$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	lib:libspectre$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libzip$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix
-	devel:libchm$secondaryArchSuffix
-	devel:libdjvulibre$secondaryArchSuffix
-	devel:libepub$secondaryArchSuffix
-	devel:libfreetype$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libKF5Activities$secondaryArchSuffix
-	devel:libKF5Archive$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
-	devel:libKF5Bookmarks$secondaryArchSuffix
-	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5Completion$secondaryArchSuffix
-	devel:libKF5ConfigCore$secondaryArchSuffix
-	devel:libKF5ConfigGui$secondaryArchSuffix
-	devel:libKF5ConfigWidgets$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
-	devel:libKF5Crash$secondaryArchSuffix
-	devel:libKF5DBusAddons$secondaryArchSuffix
-	devel:libKF5DocTools$secondaryArchSuffix
-	devel:libKF5GuiAddons$secondaryArchSuffix
-	devel:libKF5I18n$secondaryArchSuffix
-	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemModels$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
-	devel:libKF5JobWidgets$secondaryArchSuffix
-	devel:libKF5JS$secondaryArchSuffix
-	devel:libKF5KExiv2$secondaryArchSuffix
-	devel:libKF5KIOCore$secondaryArchSuffix
-	devel:libKF5KIOFileWidgets$secondaryArchSuffix
-	devel:libKF5KIOWidgets$secondaryArchSuffix
-	devel:libKF5KHtml$secondaryArchSuffix
-	devel:libKF5Notifications$secondaryArchSuffix
-	devel:libKF5Parts$secondaryArchSuffix
-	devel:libKF5Pty$secondaryArchSuffix
-	devel:libKF5Purpose$secondaryArchSuffix
-	devel:libKF5Service$secondaryArchSuffix
-	devel:libKF5Solid$secondaryArchSuffix
-	devel:libKF5SonnetUi$secondaryArchSuffix
-	devel:libKF5TextEditor$secondaryArchSuffix
-	devel:libKF5TextWidgets$secondaryArchSuffix
-	devel:libKF5ThreadWeaver$secondaryArchSuffix
-	devel:libKF5UnitConversion$secondaryArchSuffix
-	devel:libKF5Wallet$secondaryArchSuffix
-	devel:libKF5WidgetsAddons$secondaryArchSuffix
-	devel:libKF5WindowSystem$secondaryArchSuffix
-	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libmarkdown$secondaryArchSuffix
-	devel:libphonon4qt5$secondaryArchSuffix
-	devel:libpng16$secondaryArchSuffix
-	devel:libpoppler$secondaryArchSuffix >= 131
-	devel:libpoppler_qt5$secondaryArchSuffix >= 1.33
-	devel:libqca_qt5$secondaryArchSuffix >= 2
-	devel:libqmobipocket$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libspectre$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libzip$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	okular${secondaryArchSuffix}_devel = $portVersion
-	devel:libOkular5Core$secondaryArchSuffix = 11.0.0 compat >= 11
-	"
-REQUIRES_devel="
-	okular$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:g++$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
-	cmd:make
-	cmd:msgfmt$secondaryArchSuffix
-	cmd:msgmerge$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3
-	"
-
-BUILD()
-{
-	export LDFLAGS="-lbsd"
-
-	cmake -Bbuild -S. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_FLAGS="-D_BSD_SOURCE -D_GNU_SOURCE" \
-		-DCMAKE_CXX_FLAGS="-D_BSD_SOURCE -D_GNU_SOURCE" \
-		-DCMAKE_INSTALL_PREFIX=$appsDir \
-		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-		-DCMAKE_INSTALL_LIBDIR=$libDir \
-		-DCMAKE_INSTALL_BINDIR=$appsDir \
-		-DSHARE_INSTALL_PREFIX=$dataDir \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-
-	make -C build $jobArgs
-}
-
-INSTALL()
-{
-	mkdir -p $dataDir/Qt5
-	make -C build install
-
-	mv $appsDir/okular $appsDir/Okular
-	rm -rf \
-		$libDir/qml \
-		$appsDir/okularkirigami \
-		$dataDir/{applications,config.kcfg,icons,kconf_update,Qt5,qlogging-categories5}
-
-	prepareInstalledDevelLibs \
-		libOkular5Core
-
-	packageEntries devel \
-		$libDir/cmake \
-		$developDir
-
-	local APP_SIGNATURE="application/x-vnd.kde-okular"
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	local LONG_INFO="$SUMMARY"
-	sed \
-		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		-e "s|@LONG_INFO@|$LONG_INFO|" \
-		$portDir/additional-files/okular.rdef.in > okular.rdef
-
-	addResourcesToBinaries okular.rdef $appsDir/Okular
-	addAppDeskbarSymlink $appsDir/Okular
-}
diff --git a/kde-apps/okular/okular_kf6-24.12.3.recipe b/kde-apps/okular/okular-24.12.3.recipe
similarity index 92%
rename from kde-apps/okular/okular_kf6-24.12.3.recipe
rename to kde-apps/okular/okular-24.12.3.recipe
index b47df3c1f..13f99e8a3 100644
--- a/kde-apps/okular/okular_kf6-24.12.3.recipe
+++ b/kde-apps/okular/okular-24.12.3.recipe
@@ -10,7 +10,7 @@ Plucker, EPub, Fax
 HOMEPAGE="https://okular.kde.org"
 COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/okular-$portVersion.tar.xz"
 CHECKSUM_SHA256="8d0894dc006b715dec2d8d57c228b8a9d5d9488e3144dd1af93b3b8363e466a0"
 SOURCE_DIR="okular-$portVersion"
@@ -24,8 +24,8 @@ libVersion="3.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	okular_kf6$secondaryArchSuffix = $portVersion
-	app:Okular$secondaryArchSuffix = $portVersion
+	okular$secondaryArchSuffix = $portVersion
+	app:Okular = $portVersion
 	lib:libOkular6Core$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -57,8 +57,10 @@ REQUIRES="
 	lib:libKF6JobWidgets$secondaryArchSuffix
 	lib:libKF6KIOCore$secondaryArchSuffix
 	lib:libKF6Parts$secondaryArchSuffix
+	lib:libKF6Purpose$secondaryArchSuffix
 	lib:libKF6Service$secondaryArchSuffix
 	lib:libKF6Solid$secondaryArchSuffix
+	lib:libKF6TextWidgets$secondaryArchSuffix
 	lib:libKF6ThreadWeaver$secondaryArchSuffix
 	lib:libKF6WidgetsAddons$secondaryArchSuffix
 	lib:libKF6WindowSystem$secondaryArchSuffix
@@ -74,13 +76,16 @@ REQUIRES="
 	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libQt6Xml$secondaryArchSuffix
 	"
+REPLACES="
+	okular_kf6$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	okular_kf6${secondaryArchSuffix}_devel = $portVersion
+	okular${secondaryArchSuffix}_devel = $portVersion
 	devel:libOkular6Core$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	okular_kf6$secondaryArchSuffix == $portVersion base
+	okular$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -131,6 +136,10 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+TEST_REQUIRES="
+	qthaikuplugins$secondaryArchSuffix
+	"
+
 PATCH()
 {
 	# disable docs generation
@@ -150,6 +159,7 @@ BUILD()
 		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DBUILD_TESTING=OFF \
 		-Wno-dev
 
 	make -C build $jobArgs
@@ -187,3 +197,9 @@ INSTALL()
 	addResourcesToBinaries okular.rdef $appsDir/Okular
 	addAppDeskbarSymlink $appsDir/Okular
 }
+
+TEST()
+{
+	# 93% tests passed, 2 tests failed out of 28
+	ctest --test-dir build --output-on-failure
+}