diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ef6e517f..1be3f25f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,33 +1,33 @@
 
 include_directories( ToolTips )
 
 set( systemsettings_SRCS
      SystemSettingsApp.cpp
      SettingsBase.cpp
      ToolTips/ktooltip.cpp
      ToolTips/ktooltipwindow.cpp
      ToolTips/tooltipmanager.cpp
      main.cpp )
 
 kde4_add_app_icon( systemsettings_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/categories/preferences-system.png" )
 kde4_add_ui_files( systemsettings_SRCS configDialog.ui )
 kconfig_add_kcfg_files( systemsettings_SRCS BaseConfig.kcfgc )
 qt5_add_dbus_adaptor( systemsettings_SRCS org.kde.systemsettings.xml SystemSettingsApp.h SystemSettingsApp  )
 
 add_executable( systemsettings ${systemsettings_SRCS})
 
 target_link_libraries( systemsettings systemsettingsview
     KF5::ItemViews
     KF5::KCMUtils
-    KF5::KI18n
-    KF5::KIconThemes
+    KF5::I18n
+    KF5::IconThemes
     KF5::KIOWidgets
-    KF5::KService
-    KF5::KWindowSystem
+    KF5::Service
+    KF5::WindowSystem
     KF5::XmlGui
-    KF5::KDBusAddons
+    KF5::DBusAddons
 )
 
 install( TARGETS systemsettings ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES systemsettingsui.rc systemsettings.kcfg DESTINATION ${DATA_INSTALL_DIR}/systemsettings )
 install( PROGRAMS kdesystemsettings.desktop systemsettings.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
diff --git a/classic/CMakeLists.txt b/classic/CMakeLists.txt
index 550cca0c..445ca824 100644
--- a/classic/CMakeLists.txt
+++ b/classic/CMakeLists.txt
@@ -1,24 +1,24 @@
 set(classic_mode_srcs
     ClassicMode.cpp
     CategoryList.cpp
 )
 
 kde4_add_ui_files( classic_mode_srcs configClassic.ui )
 add_library(classic_mode MODULE ${classic_mode_srcs})
 
 target_link_libraries(classic_mode systemsettingsview
     KF5::ItemViews
-    KF5::KConfigCore
+    KF5::ConfigCore
     KF5::KCMUtils
-    KF5::KIconThemes
-    KF5::KI18n
+    KF5::IconThemes
+    KF5::I18n
     KF5::KIOWidgets
-    KF5::KService
+    KF5::Service
     KF5::KHtml
     KF5::KDE4Support
 )
 
 install( TARGETS classic_mode DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES settings-classic-view.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES main.html systemsettings-classic.css DESTINATION ${DATA_INSTALL_DIR}/systemsettings/classic/ )
 
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 76c460cf..7d5a9fb9 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,38 +1,38 @@
 set(systemsettingsview_LIB_SRCS
     MenuItem.cpp
     MenuModel.cpp
     MenuProxyModel.cpp
     ModuleView.cpp
     BaseData.cpp
     BaseMode.cpp
     ExternalAppModule.cpp
 )
 
 kde4_add_ui_files( systemsettingsview_LIB_SRCS externalModule.ui )
 
 set(systemsettingsview_LIB_HDRS
     systemsettingsview_export.h
     MenuItem.h
     MenuModel.h
     MenuProxyModel.h
     BaseData.h
     BaseMode.h
     ModuleView.h
 )
 
 add_library( systemsettingsview SHARED ${systemsettingsview_LIB_SRCS} )
 
 target_link_libraries( systemsettingsview
     KF5::ItemViews
     KF5::KCMUtils
-    KF5::KI18n
+    KF5::I18n
     KF5::KIOWidgets
-    KF5::KService
-    KF5::KIconThemes
+    KF5::Service
+    KF5::IconThemes
  )
 
 set_target_properties( systemsettingsview PROPERTIES SOVERSION 2 )
 
 install( TARGETS systemsettingsview  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES ${systemsettingsview_LIB_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/systemsettingsview COMPONENT Devel )
 install( FILES systemsettingsview.desktop systemsettingsexternalapp.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index fe868a9d..d0f67163 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,19 +1,19 @@
 set( icon_mode_srcs
      IconMode.cpp
      CategoryDrawer.cpp
      CategorizedView.cpp
 ) 
 
 add_library(icon_mode MODULE ${icon_mode_srcs})
 
 target_link_libraries(icon_mode systemsettingsview
     KF5::ItemViews
     KF5::KCMUtils
-    KF5::KI18n
+    KF5::I18n
     KF5::KIOWidgets
-    KF5::KService
+    KF5::Service
     KF5::KDE4Support)
 
 install( TARGETS icon_mode DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES settings-icon-view.desktop DESTINATION ${SERVICES_INSTALL_DIR} )