diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7ecbc3..9c617ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,133 +1,132 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(KF5_VERSION "5.63.0") # handled by release scripts
 set(KF5_DEP_VERSION "5.62.0") # handled by release scripts
 
 project(qqc2-desktop-style VERSION ${KF5_VERSION})
 
 set(REQUIRED_QT_VERSION 5.11.0)
 
 ################# Disallow in-source build #################
 
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
    message(FATAL_ERROR "qqc2-desktop-style requires an out of source build. Please create a separate build directory and run 'cmake path_to_qqc2-desktop-style [options]' there.")
 endif()
 
 
 
 # Make CPack available to easy generate binary packages
 include(CPack)
 include(FeatureSummary)
 
 ################# set KDE specific information #################
 
 find_package(ECM 5.62.0 REQUIRED NO_MODULE)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
 find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Gui Widgets QuickControls2)
 
-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Kirigami2)
+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config Kirigami2)
 
-find_package(KF5 ${KF5_DEP_VERSION} COMPONENTS
-                IconThemes #KIconLoader
-                ConfigWidgets #KColorScheme
-            )
+# IconThemes and ConfigWidgets are optional
+find_package(KF5IconThemes)
+find_package(KF5ConfigWidgets)
 
 if (NOT APPLE AND NOT WIN32)
     find_package(X11)
 endif()
 
 # When building as a static plugin, dependencies may add a -lQt5X11Extras
 # to the linker, in that case, it requires to have the proper variables
 # to exists.
 if(X11_FOUND)
     find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE QUIET)
 endif()
 
 set_package_properties(IconThemes PROPERTIES DESCRIPTION "KF5 IconThemes framework"
                        TYPE OPTIONAL
                        PURPOSE "Optional integration of Kirigami with KIconLoader icons handling for a better integration with Plasma Desktop"
                       )
 set_package_properties(ConfigWidgets PROPERTIES DESCRIPTION "KF5 WidgetAddons framework"
                        TYPE OPTIONAL
                        PURPOSE "Optional integration of Kirigami with KColorScheme for color palettes integration with Plasma Desktop"
                       )
 
 find_package(PkgConfig)
 
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5QQC2DeskopStyle")
 
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KF5QQC2DeskopStyleConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DeskopStyleConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
   PATH_VARS  KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
 )
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DeskopStyleConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DeskopStyleConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 
 ecm_setup_version(PROJECT
     VARIABLE_PREFIX QQC2DESKTOPSTYLE
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/qqc2desktopstyle_version.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DeskopStyleConfigVersion.cmake"
     SOVERSION 5)
 
 #########################################################################
 add_definitions(-DQT_NO_FOREACH)
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
 add_subdirectory(plugin)
 
 if (KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
 add_subdirectory(kirigami-plasmadesktop-integration)
 endif(KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND)
 
 #FIXME: this assumes there will always be a QQC2 release for each Qt release, needs
 #something to discover what's the latest qqc2 version available
 math(EXPR QQC2_VERSION_MINOR "${Qt5QuickControls2_VERSION_MINOR} - 7")
 set(QQC2_VERSION "2.${QQC2_VERSION_MINOR}")
 
 if (QQC2_VERSION_MINOR LESS 3)
     set(DISABLE_UNDER_QQC2_2_3 "//Needs QtQuick.Controls 2.3 ")
 else()
     set(DISABLE_UNDER_QQC2_2_3 "")
 endif()
 
 if (QQC2_VERSION_MINOR LESS 4)
     set(DISABLE_UNDER_QQC2_2_4 "//Needs QtQuick.Controls 2.4 ")
 else()
     set(DISABLE_UNDER_QQC2_2_4 "")
 endif()
 
 # Find all the source qml files
 FILE(GLOB_RECURSE inFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
     "${CMAKE_CURRENT_SOURCE_DIR}/org.kde.desktop/*")
 
     #for each file, replace @QQC2_VERSION@ with the version we found
 FOREACH(infileName ${inFiles})
     configure_package_config_file(
         "${CMAKE_CURRENT_SOURCE_DIR}/${infileName}"
         "${CMAKE_CURRENT_BINARY_DIR}/${infileName}"
         INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
         PATH_VARS  QQC2_VERSION DISABLE_UNDER_QQC2_2_3
         DISABLE_UNDER_QQC2_2_4
     )
 ENDFOREACH(infileName)
 
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/org.kde.desktop DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 90bbaea..9466df7 100644
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -1,27 +1,27 @@
 project(qqc2desktopstyle)
 
 set(qqc2desktopstyle_SRCS
     qqc2desktopstyleplugin.cpp
     kquickstyleitem.cpp
     )
 
 if(Qt5_VERSION VERSION_LESS "5.8.0")
 set(qqc2desktopstyle_SRCS
     ${qqc2desktopstyle_SRCS}
     #FIXME: remove when we can depend from Qt 5.8+
     qsgninepatchnode.cpp
     qsgdefaultninepatchnode.cpp
     )
 endif()
 
 add_library(qqc2desktopstyleplugin SHARED ${qqc2desktopstyle_SRCS})
-target_link_libraries(qqc2desktopstyleplugin Qt5::Core Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets KF5::Kirigami2)
+target_link_libraries(qqc2desktopstyleplugin Qt5::Core Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Widgets KF5::ConfigCore KF5::Kirigami2)
 
 if(KF5ConfigWidgets_FOUND)
     target_link_libraries(qqc2desktopstyleplugin
         KF5::ConfigWidgets
     )
 endif()
 
 install(TARGETS qqc2desktopstyleplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/qqc2desktopstyle/private)
 install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/qqc2desktopstyle/private)