diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ec6a13..eb44c70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,65 +1,65 @@
 project(plasma-settings)
 
 cmake_minimum_required(VERSION 2.8.12)
 cmake_policy(SET CMP0063 NEW)
 
 ################# Disallow in-source build #################
 
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
    message(FATAL_ERROR "plasma-settings requires an out of source build. Please create a separate build directory and run 'cmake path_to_plasma-settings [options]' there.")
 endif()
 
 include(CPack)
 include(FeatureSummary)
 find_package(PkgConfig)
 
 ################# set KDE specific information #################
 
 find_package(ECM 0.0.8 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} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(ECMQMLModules)
 
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
 
 ################# now find all used packages #################
 
 set (QT_MIN_VERSION "5.4.0")
 
 find_package(KF5 REQUIRED COMPONENTS
     WindowSystem
     CoreAddons
     Solid
     Config
     Auth
     DBusAddons
     I18n
     Plasma
     PlasmaQuick
     Declarative
     KIO
     KDELibs4Support
 )
 
 find_package(KAccounts)
 find_package(AccountsQt5 1.10 CONFIG)
 find_package(SignOnQt5 8.55 CONFIG)
 
 ecm_find_qmlmodule(org.kde.kcm 1.0)
 
 if (KAccounts_FOUND AND AccountsQt5_FOUND AND SignOnQt5_FOUND)
     include_directories(${ACCOUNTSQT_INCLUDE_DIRS} ${SIGNONQT_INCLUDE_DIRS})
 endif()
 
 add_subdirectory(src)
 add_subdirectory(import)
 add_subdirectory(modules)
 
 install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kpackage/genericqml/org.kde.plasma.settings)
 
-install(FILES org.kde.mobile.plasmasettings.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES org.kde.mobile.plasmasettings.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/modules/accounts/CMakeLists.txt b/modules/accounts/CMakeLists.txt
index 0032f3a..549aa15 100644
--- a/modules/accounts/CMakeLists.txt
+++ b/modules/accounts/CMakeLists.txt
@@ -1,3 +1,2 @@
-
-install(FILES kaccounts.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES kaccounts.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 kpackage_install_package(package kaccounts kcms)
diff --git a/modules/powermanagement/CMakeLists.txt b/modules/powermanagement/CMakeLists.txt
index d146d74..9f7a418 100644
--- a/modules/powermanagement/CMakeLists.txt
+++ b/modules/powermanagement/CMakeLists.txt
@@ -1,3 +1,2 @@
-
-install(FILES powermanagement.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES powermanagement.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 kpackage_install_package(package kcm_mobile_power kcms)
diff --git a/modules/theme/CMakeLists.txt b/modules/theme/CMakeLists.txt
index 419e494..ac7d99a 100644
--- a/modules/theme/CMakeLists.txt
+++ b/modules/theme/CMakeLists.txt
@@ -1,27 +1,27 @@
-project( kcm_mobile_theme )
+project(kcm_mobile_theme)
 
 
 set(themesettings_SRCS
     themesettings.cpp
     themelistmodel.cpp
 )
 
 
 add_library(kcm_mobile_theme MODULE ${themesettings_SRCS})
 
 target_link_libraries(kcm_mobile_theme
     Qt5::DBus
     Qt5::Gui
     Qt5::Quick
     Qt5::Qml
     KF5::Plasma
     KF5::I18n
     KF5::QuickAddons
     )
 kcoreaddons_desktop_to_json(kcm_mobile_theme "themesettings.desktop")
 
 # Time and Date
 
-install(FILES themesettings.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(TARGETS kcm_mobile_theme DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
+install(FILES themesettings.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS kcm_mobile_theme DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 kpackage_install_package(package kcm_mobile_theme kcms)
diff --git a/modules/time/CMakeLists.txt b/modules/time/CMakeLists.txt
index 24831ba..da80640 100644
--- a/modules/time/CMakeLists.txt
+++ b/modules/time/CMakeLists.txt
@@ -1,30 +1,30 @@
 project(kcm_mobile_time)
 
 #include_directories(../../../../components/settings)
 
 #configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 
 set(timesettings_SRCS
     timesettings.cpp
     timezone.cpp
     timezonesmodel.cpp
 )
 
 qt5_add_dbus_interface(timesettings_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/timedated1.xml timedated_interface)
 
 add_library(kcm_mobile_time MODULE ${timesettings_SRCS})
 
 target_link_libraries(kcm_mobile_time
     Qt5::Quick
     Qt5::Qml
     KF5::KDELibs4Support
     KF5::QuickAddons
     )
 kcoreaddons_desktop_to_json(kcm_mobile_time "timesettings.desktop")
 
 # Time and Date
 
-install(FILES timesettings.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(TARGETS kcm_mobile_time DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
+install(FILES timesettings.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS kcm_mobile_time DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/kcms)
 kpackage_install_package(package kcm_mobile_time kcms)