diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4135a6f..98e692e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,64 +1,33 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 project(FrameworkIntegration)
 
 find_package(ECM 0.0.9 REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings)
 include(KDECMakeSettings)
 
 find_package(Qt5 5.2.0 CONFIG REQUIRED Widgets DBus)
 
 include(FeatureSummary)
-include(GenerateExportHeader)
-include(CMakePackageConfigHelpers)
-include(ECMSetupVersion)
-include(ECMGenerateHeaders)
 
 set(KF5_VERSION "5.0.0")
 
-ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
-                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegrationConfigVersion.cmake")
-
-if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  find_package(KF5I18n ${KF5_VERSION} REQUIRED)
-  find_package(KF5GuiAddons ${KF5_VERSION} REQUIRED) #
-  find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) #
-  find_package(KF5ConfigWidgets ${KF5_VERSION} REQUIRED)
-  find_package(KF5ItemViews ${KF5_VERSION} REQUIRED) #
-  find_package(KF5Config ${KF5_VERSION} REQUIRED)
-  find_package(KF5IconThemes ${KF5_VERSION} REQUIRED)
-  find_package(KF5Notifications ${KF5_VERSION} REQUIRED)
-  find_package(KF5I18n ${KF5_VERSION} REQUIRED)
-  find_package(KF5KIO ${KF5_VERSION} REQUIRED)
-endif()
+find_package(KF5Config ${KF5_VERSION} REQUIRED)
+find_package(KF5ConfigWidgets ${KF5_VERSION} REQUIRED)
+find_package(KF5GuiAddons ${KF5_VERSION} REQUIRED)
+find_package(KF5I18n ${KF5_VERSION} REQUIRED)
+find_package(KF5IconThemes ${KF5_VERSION} REQUIRED)
+find_package(KF5ItemViews ${KF5_VERSION} REQUIRED)
+find_package(KF5KIO ${KF5_VERSION} REQUIRED)
+find_package(KF5Notifications ${KF5_VERSION} REQUIRED)
+find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED)
 
 add_subdirectory(src)
 add_subdirectory(autotests)
 add_subdirectory(tests)
 
-# create a Config.cmake and a ConfigVersion.cmake file and install them
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/frameworkintegration")
-
-#configure_package_config_file("${CMAKE_CURRENT_LIST_DIR}/frameworkintegrationConfig.cmake.in"
-#                              "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegrationConfig.cmake"
-#                              INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
-#                              PATH_VARS  INCLUDE_INSTALL_DIR LIB_INSTALL_DIR CMAKE_INSTALL_PREFIX )
-
-#install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegrationConfig.cmake"
-#               "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegrationConfigVersion.cmake"
-#        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-#        COMPONENT Devel )
-
-#install(EXPORT frameworkintegrationTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE frameworkintegrationTargets.cmake NAMESPACE KDE4__ )
-
-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h
-#        DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
-
-if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-  feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
-endif()
+feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/platformtheme/CMakeLists.txt b/src/platformtheme/CMakeLists.txt
index 141c788..5fd949b 100644
--- a/src/platformtheme/CMakeLists.txt
+++ b/src/platformtheme/CMakeLists.txt
@@ -1,20 +1,28 @@
 
 set(platformtheme_SRCS
-   kdeplatformtheme.cpp
-   kfontsettingsdata.cpp
-   khintssettings.cpp
-   kdeplatformfiledialoghelper.cpp
-   main.cpp
+    kdeplatformtheme.cpp
+    kfontsettingsdata.cpp
+    khintssettings.cpp
+    kdeplatformfiledialoghelper.cpp
+    main.cpp
 )
 
 include_directories(
-   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
 )
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 
 add_library(KDEPlatformTheme MODULE ${platformtheme_SRCS})
 
 # We link to KIO to pull in the qfiledialog hooks
-target_link_libraries(KDEPlatformTheme PRIVATE Qt5::DBus KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::KIOFileWidgets KF5::I18n)
+target_link_libraries(KDEPlatformTheme
+    PRIVATE
+        Qt5::DBus
+        KF5::ConfigWidgets
+        KF5::ConfigCore
+        KF5::IconThemes
+        KF5::KIOFileWidgets
+        KF5::I18n
+)
 
 install(TARGETS KDEPlatformTheme DESTINATION ${QT_PLUGIN_INSTALL_DIR}/platformthemes)