diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index eaf586bb..1aff9dec 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -181,10 +181,10 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_NTFS_3G=y
 BR2_PACKAGE_DEJAVU=y
 BR2_PACKAGE_LIBERATION=y
-BR2_PACKAGE_GLMARK2=y
-BR2_PACKAGE_KMSCUBE=y
 BR2_PACKAGE_FREERDP=y
+# BR2_PACKAGE_FREERDP_CLIENT_X11 is not set
 BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_LLVM=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
@@ -195,7 +195,6 @@ BR2_PACKAGE_QT53D=y
 BR2_PACKAGE_QT5BASE_CONCURRENT=y
 BR2_PACKAGE_QT5BASE_SQLITE_QT=y
 BR2_PACKAGE_QT5BASE_LINUXFB=y
-BR2_PACKAGE_QT5BASE_XCB=y
 BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
 BR2_PACKAGE_QT5BASE_HARFBUZZ=y
 BR2_PACKAGE_QT5BASE_GIF=y
@@ -216,7 +215,6 @@ BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
 BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="en_US"
 BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y
 BR2_PACKAGE_QT5WAYLAND=y
-BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y
 BR2_PACKAGE_QT5WEBENGINE=y
 BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
 BR2_PACKAGE_QT5WEBVIEW=y
@@ -225,7 +223,26 @@ BR2_PACKAGE_KF5_KCOREADDONS=y
 BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y
 BR2_PACKAGE_XORG7=y
 BR2_PACKAGE_XCB_UTIL_CURSOR=y
+BR2_PACKAGE_XCB_UTIL_KEYSYMS=y
+BR2_PACKAGE_XCB_UTIL_WM=y
 BR2_PACKAGE_XLIB_LIBSM=y
+BR2_PACKAGE_XLIB_LIBXSCRNSAVER=y
+BR2_PACKAGE_XLIB_LIBXCOMPOSITE=y
+BR2_PACKAGE_XLIB_LIBXCURSOR=y
+BR2_PACKAGE_XLIB_LIBXDAMAGE=y
+BR2_PACKAGE_XLIB_LIBXFONT2=y
+BR2_PACKAGE_XLIB_LIBXFT=y
+BR2_PACKAGE_XLIB_LIBXINERAMA=y
+BR2_PACKAGE_XLIB_LIBXRANDR=y
+BR2_PACKAGE_XLIB_LIBXRES=y
+BR2_PACKAGE_XLIB_LIBXTST=y
+BR2_PACKAGE_XLIB_LIBXXF86VM=y
+BR2_PACKAGE_XLIB_LIBXSHMFENCE=y
+BR2_PACKAGE_XFONT_FONT_ALIAS=y
+BR2_PACKAGE_XFONT_FONT_CURSOR_MISC=y
+BR2_PACKAGE_XFONT_FONT_MISC_MISC=y
+BR2_PACKAGE_MCOOKIE=y
+BR2_PACKAGE_XDATA_XBITMAPS=y
 BR2_PACKAGE_XKEYBOARD_CONFIG=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
@@ -382,6 +399,7 @@ BR2_PACKAGE_TIFF=y
 BR2_PACKAGE_WAFFLE=y
 BR2_PACKAGE_LIBCEC=y
 BR2_PACKAGE_LIBINPUT=y
+BR2_PACKAGE_LIBPCIACCESS=y
 BR2_PACKAGE_LIBV4L=y
 BR2_PACKAGE_LIBV4L_UTILS=y
 BR2_PACKAGE_WIRINGPI=y
diff --git a/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.mk b/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.mk
index 6845ac2e..d5afb30b 100644
--- a/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.mk
+++ b/buildroot-external/package/kf5-kactivities-stats/kf5-kactivities-stats.mk
@@ -10,7 +10,7 @@ KF5_KACTIVITIES_STATS_SOURCE = kactivities-stats-$(KF5_KACTIVITIES_STATS_VERSION
 KF5_KACTIVITIES_STATS_LICENSE = BSD-3-Clause
 KF5_KACTIVITIES_STATS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
 
-KF5_KACTIVITIES_STATS_DEPENDENCIES = host-pkgconf
+KF5_KACTIVITIES_STATS_DEPENDENCIES = host-pkgconf kf5-kconfig kf5-kactivities
 KF5_KACTIVITIES_STATS_INSTALL_STAGING = YES
 KF5_KACTIVITIES_STATS_SUPPORTS_IN_SOURCE_BUILD = NO
 
diff --git a/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.mk b/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.mk
index bf7d8c93..2a8e3471 100644
--- a/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.mk
+++ b/buildroot-external/package/kf5-kcmutils/kf5-kcmutils.mk
@@ -10,7 +10,7 @@ KF5_KCMUTILS_SOURCE = kcmutils-$(KF5_KCMUTILS_VERSION).tar.xz
 KF5_KCMUTILS_LICENSE = BSD-3-Clause
 KF5_KCMUTILS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
 
-KF5_KCMUTILS_DEPENDENCIES = host-pkgconf
+KF5_KCMUTILS_DEPENDENCIES = host-pkgconf kf5-kservice kf5-kdeclarative
 KF5_KCMUTILS_INSTALL_STAGING = YES
 KF5_KCMUTILS_SUPPORTS_IN_SOURCE_BUILD = NO
 
diff --git a/buildroot-external/package/kf5-kcrash/0001-No-X11.patch b/buildroot-external/package/kf5-kcrash/0001-No-X11.patch
new file mode 100644
index 00000000..86fc8975
--- /dev/null
+++ b/buildroot-external/package/kf5-kcrash/0001-No-X11.patch
@@ -0,0 +1,25 @@
+From c09ce373ae05594809d2bbf89d68dea167e9cae4 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 14:44:47 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 484a1bb..894ee75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ 
+ if (NOT APPLE)
+-    find_package(X11)
++#    find_package(X11)
+ endif()
+ 
+ set(HAVE_X11 ${X11_FOUND})
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch b/buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch
new file mode 100644
index 00000000..74825352
--- /dev/null
+++ b/buildroot-external/package/kf5-kdelibs4support/0001-No-X11.patch
@@ -0,0 +1,29 @@
+From 10eedaf25c738042836e4cddc525deb693cb0794 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Wed, 28 Oct 2020 10:27:10 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17eb825d..2c79cede 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,9 +49,9 @@ if(WIN32)
+     find_package(KDEWin REQUIRED)
+ endif()
+ 
+-if (NOT APPLE AND NOT WIN32)
+-    find_package(X11)
+-endif()
++#if (NOT APPLE AND NOT WIN32)
++#    find_package(X11)
++#endif()
+ set(HAVE_X11 ${X11_FOUND})
+ if (HAVE_X11)
+   add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication")
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-kdelibs4support/0001-Remove-DocTools-dependency.patch.bu b/buildroot-external/package/kf5-kdelibs4support/0001-Remove-DocTools-dependency.patch.bu
deleted file mode 100644
index 3e55a6e3..00000000
--- a/buildroot-external/package/kf5-kdelibs4support/0001-Remove-DocTools-dependency.patch.bu
+++ /dev/null
@@ -1,36 +0,0 @@
-From 91ac8de52e9998ea0399e51ead4cc66ad01afb14 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Fri, 16 Oct 2020 14:44:34 +0200
-Subject: [PATCH 1/1] Remove DocTools dependency
-
----
- CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17eb825d..0d579425 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,6 @@ find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5DesignerPlugin ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
-@@ -158,11 +157,9 @@ install(
- 
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-     ki18n_install(po)
--    kdoctools_install(po)
- endif()
- add_subdirectory(cmake)
- add_subdirectory(data)
--add_subdirectory(docs)
- add_subdirectory(src)
- 
- if (BUILD_TESTING)
--- 
-2.20.1
-
diff --git a/buildroot-external/package/kf5-kdesignerplugin/0001-Remove-DocTools-dependency.patch b/buildroot-external/package/kf5-kdesignerplugin/0001-Remove-DocTools-dependency.patch
deleted file mode 100644
index 81f15de6..00000000
--- a/buildroot-external/package/kf5-kdesignerplugin/0001-Remove-DocTools-dependency.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 504ea075fe4ea351b1c90a79d36e3139463d2fa3 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Thu, 15 Oct 2020 16:32:16 +0200
-Subject: [PATCH 1/1] Remove DocTools dependency
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 552369d..bbe1954 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,7 +29,6 @@ include(ECMPoQmTools)
- 
- find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5DocTools ${KF5_DEP_VERSION})
- 
- 
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DesignerPlugin")
--- 
-2.20.1
-
diff --git a/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.mk b/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.mk
index c31e5167..5a8119cc 100644
--- a/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.mk
+++ b/buildroot-external/package/kf5-kdesignerplugin/kf5-kdesignerplugin.mk
@@ -14,7 +14,11 @@ KF5_KDESIGNERPLUGIN_DEPENDENCIES = host-pkgconf host-kf5-kdesignerplugin
 KF5_KDESIGNERPLUGIN_INSTALL_STAGING = YES
 KF5_KDESIGNERPLUGIN_SUPPORTS_IN_SOURCE_BUILD = NO
 
-KF5_KDESIGNERPLUGIN_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
+KF5_KDESIGNERPLUGIN_POST_INSTALL_STAGING_HOOKS += KF5_KDESIGNERPLUGIN_COPY_BINS
+
+define KF5_KDESIGNERPLUGIN_COPY_BINS
+        cp ${HOST_DIR}/bin/kgendesignerplugin $(STAGING_DIR)/usr/bin
+endef
 
 $(eval $(cmake-package))
 
diff --git a/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.mk b/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.mk
index e4574ee8..c86df25f 100644
--- a/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.mk
+++ b/buildroot-external/package/kf5-kdoctools/kf5-kdoctools.mk
@@ -36,6 +36,8 @@ HOST_KF5_KDOCTOOLS_CONF_OPTS += -DINSTALL_INTERNAL_TOOLS=ON
 
 define HOST_KF5_KDOCTOOLS_INSTALL_CMDS
 	cp $(@D)/buildroot-build/bin/docbookl10nhelper $(HOST_DIR)/bin
+	cp $(@D)/buildroot-build/bin/meinproc5 $(HOST_DIR)/bin
+	cp $(@D)/buildroot-build/bin/checkXML5 $(HOST_DIR)/bin
 endef
 
 $(eval $(host-cmake-package))
diff --git a/buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch b/buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch
new file mode 100644
index 00000000..cdec9af5
--- /dev/null
+++ b/buildroot-external/package/kf5-kglobalaccel/0001-No-X11.patch
@@ -0,0 +1,41 @@
+From 9116b1bcc3a1230015c70af9116e4abb51f2d8ce Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 15:02:48 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f08d6d5..e8629c2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,15 +47,15 @@ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ 
+ # no X11 stuff on mac
+-if (NOT APPLE)
+-    find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB)
+-    set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
+-                       URL "http://xcb.freedesktop.org"
+-                       TYPE OPTIONAL
+-                      )
+-
+-    find_package(X11)
+-endif()
++#if (NOT APPLE)
++#    find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB)
++#    set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
++#                       URL "http://xcb.freedesktop.org"
++#                       TYPE OPTIONAL
++#                      )
++#
++#    find_package(X11)
++#endif()
+ 
+ set(HAVE_X11 0)
+ 
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-kidletime/0001-No-X11.patch b/buildroot-external/package/kf5-kidletime/0001-No-X11.patch
new file mode 100644
index 00000000..363c4b02
--- /dev/null
+++ b/buildroot-external/package/kf5-kidletime/0001-No-X11.patch
@@ -0,0 +1,31 @@
+From 32515bb6e2427c5792ee45173c9af52293cdfc25 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Wed, 28 Oct 2020 11:25:12 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 447ff81..c8e4760 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,10 +37,10 @@ if(APPLE)
+     cmake_find_frameworks(CoreFoundation Carbon)
+ endif()
+ 
+-if(NOT APPLE)
+-    find_package(X11)
+-    find_package(XCB COMPONENTS XCB)
+-endif()
++#if(NOT APPLE)
++#    find_package(X11)
++#    find_package(XCB COMPONENTS XCB)
++#endif()
+ 
+ if(X11_FOUND)
+     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-kinit/0001-No-X11.patch b/buildroot-external/package/kf5-kinit/0001-No-X11.patch
new file mode 100644
index 00000000..ba3d3e56
--- /dev/null
+++ b/buildroot-external/package/kf5-kinit/0001-No-X11.patch
@@ -0,0 +1,33 @@
+From e7be823455a9b7c3be7abc60c1e757845ae18408 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Wed, 28 Oct 2020 12:07:34 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bed6183..e41e8e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,12 +32,12 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KINIT
+ include(ConfigureChecks.cmake)
+ 
+ #optional features
+-if (NOT APPLE)
+-    find_package(X11)
+-endif()
++#if (NOT APPLE)
++#    find_package(X11)
++#endif()
+ set(HAVE_X11 ${X11_FOUND})
+ 
+-find_package(XCB MODULE COMPONENTS XCB)
++#find_package(XCB MODULE COMPONENTS XCB)
+ set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
+ set(HAVE_XCB ${XCB_XCB_FOUND})
+ 
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-kinit/kf5-kinit.mk b/buildroot-external/package/kf5-kinit/kf5-kinit.mk
index 9767d1de..239c5555 100644
--- a/buildroot-external/package/kf5-kinit/kf5-kinit.mk
+++ b/buildroot-external/package/kf5-kinit/kf5-kinit.mk
@@ -14,6 +14,4 @@ KF5_KINIT_DEPENDENCIES = host-pkgconf
 KF5_KINIT_INSTALL_STAGING = YES
 KF5_KINIT_SUPPORTS_IN_SOURCE_BUILD = NO
 
-KF5_KINIT_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
-
 $(eval $(cmake-package))
diff --git a/buildroot-external/package/kf5-kio/0001-No-X11.patch b/buildroot-external/package/kf5-kio/0001-No-X11.patch
new file mode 100644
index 00000000..75923ea1
--- /dev/null
+++ b/buildroot-external/package/kf5-kio/0001-No-X11.patch
@@ -0,0 +1,29 @@
+From 1bd3b99ffea595f324ea8995a7bc32c3b37bce6b Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 15:49:28 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e4e8676..32b6c839 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -101,9 +101,9 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of
+                        PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used"
+                       )
+ 
+-if (NOT APPLE AND NOT WIN32)
+-    find_package(X11)
+-endif()
++#if (NOT APPLE AND NOT WIN32)
++#    find_package(X11)
++#endif()
+ 
+ set(HAVE_X11 ${X11_FOUND})
+ if (HAVE_X11)
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch b/buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch
new file mode 100644
index 00000000..2ad52a9b
--- /dev/null
+++ b/buildroot-external/package/kf5-kjobwidgets/0001-No-X11.patch
@@ -0,0 +1,29 @@
+From 72fd2e1837a5870c925235c3d7056c76abdf22a1 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 15:15:11 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5a1a7e2..b832f4b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,9 +22,9 @@ include(ECMPoQmTools)
+ set(REQUIRED_QT_VERSION 5.12.0)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
+ 
+-if (NOT APPLE)
+-    find_package(X11)
+-endif()
++#if (NOT APPLE)
++#    find_package(X11)
++#endif()
+ 
+ set(HAVE_X11 ${X11_FOUND})
+ 
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-knotifications/0001-No-X11.patch b/buildroot-external/package/kf5-knotifications/0001-No-X11.patch
new file mode 100644
index 00000000..f7d58fef
--- /dev/null
+++ b/buildroot-external/package/kf5-knotifications/0001-No-X11.patch
@@ -0,0 +1,29 @@
+From 028fe875e3bedbe17f6e67a358f99bda5115bb9c Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 15:25:53 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e5b861..5ffb90f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,9 +59,9 @@ include(KDEInstallDirs)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ 
+-if (NOT APPLE AND NOT WIN32)
+-    find_package(X11)
+-endif()
++#if (NOT APPLE AND NOT WIN32)
++#    find_package(X11)
++#endif()
+ 
+ set(HAVE_X11 ${X11_FOUND})
+ set(HAVE_XTEST ${X11_XTest_FOUND})
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.mk b/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.mk
index cee19f4d..d24b06d3 100644
--- a/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.mk
+++ b/buildroot-external/package/kf5-ktextwidgets/kf5-ktextwidgets.mk
@@ -10,7 +10,7 @@ KF5_KTEXTWIDGETS_SOURCE = ktextwidgets-$(KF5_KTEXTWIDGETS_VERSION).tar.xz
 KF5_KTEXTWIDGETS_LICENSE = BSD-3-Clause
 KF5_KTEXTWIDGETS_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
 
-KF5_KTEXTWIDGETS_DEPENDENCIES = host-pkgconf kf5-sonnet
+KF5_KTEXTWIDGETS_DEPENDENCIES = host-pkgconf kf5-sonnet kf5-kcompletion
 KF5_KTEXTWIDGETS_INSTALL_STAGING = YES
 KF5_KTEXTWIDGETS_SUPPORTS_IN_SOURCE_BUILD = NO
 
diff --git a/buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch b/buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch
new file mode 100644
index 00000000..8198b19d
--- /dev/null
+++ b/buildroot-external/package/kf5-kwindowsystem/0001-No-X11.patch
@@ -0,0 +1,25 @@
+From 7a81f31ac138413c2eb6ff0f3ab0c28e09c5fb8c Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 14:13:22 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b252a39..4098c14 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@ if(WIN32)
+ endif()
+ 
+ if (NOT APPLE)
+-    find_package(X11)
++#    find_package(X11)
+ endif()
+ 
+ set(KWINDOWSYSTEM_HAVE_X11 ${X11_FOUND})
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch b/buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch
new file mode 100644
index 00000000..cf19a9d1
--- /dev/null
+++ b/buildroot-external/package/kf5-plasma-framework/0001-No-X11.patch
@@ -0,0 +1,53 @@
+From d7b6f9fe841076c573a1f1b70ae9eb944d7174fb Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Tue, 27 Oct 2020 16:54:50 +0100
+Subject: [PATCH 1/1] No X11
+
+---
+ CMakeLists.txt | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 31a3a4fb1..16e145bd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,22 +79,22 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc
+                       )
+ 
+ #optional features
+-find_package(X11 MODULE)
+-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
+-                       URL "https://www.x.org/"
+-                       TYPE OPTIONAL
+-                      )
+-find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
+-set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
+-                       URL "https://xcb.freedesktop.org/"
+-                       TYPE OPTIONAL
+-                      )
+-if(X11_FOUND AND XCB_XCB_FOUND)
+-  set(HAVE_X11 1)
+-  find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras)
++#find_package(X11 MODULE)
++#set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++#                       URL "https://www.x.org/"
++#                       TYPE OPTIONAL
++#                      )
++#find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER)
++#set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
++#                       URL "https://xcb.freedesktop.org/"
++#                       TYPE OPTIONAL
++#                      )
++#if(X11_FOUND AND XCB_XCB_FOUND)
++#  set(HAVE_X11 1)
++#  find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras)
+   #X11_Xrender discovery is done by FindX11
+   #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
+-endif()
++#endif()
+ 
+ find_package(OpenGL)
+ set_package_properties(OpenGL PROPERTIES DESCRIPTION "The OpenGL libraries"
+-- 
+2.20.1
+
diff --git a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk
index 509bd2a0..c4ec3488 100644
--- a/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk
+++ b/buildroot-external/package/kf5-plasma-framework/kf5-plasma-framework.mk
@@ -10,10 +10,9 @@ KF5_PLASMA_FRAMEWORK_SOURCE = plasma-framework-$(KF5_PLASMA_FRAMEWORK_VERSION).t
 KF5_PLASMA_FRAMEWORK_LICENSE = BSD-3-Clause
 KF5_PLASMA_FRAMEWORK_LICENSE_FILES = COPYING-CMAKE-SCRIPTS
 
-KF5_PLASMA_FRAMEWORK_DEPENDENCIES = host-pkgconf
+KF5_PLASMA_FRAMEWORK_DEPENDENCIES = host-pkgconf kf5-kdoctools kf5-kirigami2
 KF5_PLASMA_FRAMEWORK_INSTALL_STAGING = YES
 
-KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DKF5_HOST_TOOLING="$(HOST_DIR)/lib/x86_64-linux-gnu/cmake"
 KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DHAVE_EGL=1
 KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_INCLUDE_DIR="$(STAGING_DIR)/usr/include"
 KF5_PLASMA_FRAMEWORK_CONF_OPTS += -DEGL_LIBRARY="$(STAGING_DIR)/usr/lib/libEGL.so"
diff --git a/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch b/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch
new file mode 100644
index 00000000..9ec8e49a
--- /dev/null
+++ b/buildroot-patches/0114-Add-and-build-the-qtdesigner-tools.patch
@@ -0,0 +1,102 @@
+From ad5ead73536b5558b5f8457f54d8eb9076ac5b7d Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Wed, 28 Oct 2020 10:20:56 +0100
+Subject: [PATCH 1/1] Add and build the qtdesigner tools
+
+---
+ .../qt5tools/0001-Build-designer-tools.patch  | 53 +++++++++++++++++++
+ package/qt5/qt5tools/Config.in                |  5 ++
+ package/qt5/qt5tools/qt5tools.mk              |  3 ++
+ 3 files changed, 61 insertions(+)
+ create mode 100644 package/qt5/qt5tools/0001-Build-designer-tools.patch
+
+diff --git a/package/qt5/qt5tools/0001-Build-designer-tools.patch b/package/qt5/qt5tools/0001-Build-designer-tools.patch
+new file mode 100644
+index 0000000000..2a8389e6a1
+--- /dev/null
++++ b/package/qt5/qt5tools/0001-Build-designer-tools.patch
+@@ -0,0 +1,53 @@
++From 8441d3adeb285862632e4d05c60af2dc17ab31f3 Mon Sep 17 00:00:00 2001
++From: j1nx <p.steenbergen@j1nx.nl>
++Date: Wed, 28 Oct 2020 10:00:30 +0100
++Subject: [PATCH 1/1] Build designer tools
++
++---
++ src/designer/src/src.pro | 30 +++++++++---------------------
++ 1 file changed, 9 insertions(+), 21 deletions(-)
++
++diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
++index 79e9e64e..8af9edf8 100644
++--- a/src/designer/src/src.pro
+++++ b/src/designer/src/src.pro
++@@ -2,27 +2,15 @@ TEMPLATE = subdirs
++ 
++ SUBDIRS = \
++     uiplugin \
++-    uitools
++-
++-qtConfig(process) {
++-    SUBDIRS += \
++-        lib \
++-        components \
++-        designer
++-
++-    lib.depends = uiplugin
++-    components.depends = lib
++-    designer.depends = components
++-    plugins.depends = lib
+++    uitools \
+++    lib \
+++    components \
+++    designer
++ 
++-    contains(QT_CONFIG, shared): SUBDIRS += plugins
++-}
+++contains(QT_CONFIG, shared): SUBDIRS += plugins
++ 
++ uitools.depends = uiplugin
++-
++-qtNomakeTools( \
++-    lib \
++-    components \
++-    designer \
++-    plugins \
++-)
+++lib.depends = uiplugin
+++components.depends = lib
+++designer.depends = components
+++plugins.depends = lib
++-- 
++2.20.1
++
+diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
+index 60106c1ee3..b538c0f05c 100644
+--- a/package/qt5/qt5tools/Config.in
++++ b/package/qt5/qt5tools/Config.in
+@@ -56,4 +56,9 @@ config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO
+ 	help
+ 	  Compile and install the qtplugininfo program.
+ 
++config BR2_PACKAGE_QT5TOOLS_DESIGNER
++        bool "qtdesigner"
++        help
++          Compile and install the qtdesigner programs.
++
+ endif
+diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
+index 0d00022998..9100d21ccd 100644
+--- a/package/qt5/qt5tools/qt5tools.mk
++++ b/package/qt5/qt5tools/qt5tools.mk
+@@ -50,6 +50,9 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
+ QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
+ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
+ 
++QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
++QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
++
+ define QT5TOOLS_CONFIGURE_CMDS
+ 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+ endef
+-- 
+2.20.1
+
diff --git a/buildroot-patches/0114-Add-the-qtdesigner-programs-to-qt5tools-packages.patch b/buildroot-patches/0114-Add-the-qtdesigner-programs-to-qt5tools-packages.patch
deleted file mode 100644
index e577a062..00000000
--- a/buildroot-patches/0114-Add-the-qtdesigner-programs-to-qt5tools-packages.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 773d2f8333c9120a75e9b9b2db788e32228ab25b Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Tue, 13 Oct 2020 12:20:40 +0200
-Subject: [PATCH 1/1] Add the qtdesigner programs to qt5tools packages
-
----
- package/qt5/qt5tools/Config.in   | 5 +++++
- package/qt5/qt5tools/qt5tools.mk | 3 +++
- 2 files changed, 8 insertions(+)
-
-diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
-index 60106c1ee3..b538c0f05c 100644
---- a/package/qt5/qt5tools/Config.in
-+++ b/package/qt5/qt5tools/Config.in
-@@ -56,4 +56,9 @@ config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO
- 	help
- 	  Compile and install the qtplugininfo program.
- 
-+config BR2_PACKAGE_QT5TOOLS_DESIGNER
-+        bool "qtdesigner"
-+        help
-+          Compile and install the qtdesigner programs.
-+
- endif
-diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
-index 0d00022998..9100d21ccd 100644
---- a/package/qt5/qt5tools/qt5tools.mk
-+++ b/package/qt5/qt5tools/qt5tools.mk
-@@ -50,6 +50,9 @@ QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
- QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
- QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
- 
-+QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
-+QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_DESIGNER) += designer
-+
- define QT5TOOLS_CONFIGURE_CMDS
- 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
- endef
--- 
-2.20.1
-