diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62bc70b..dd84033 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,192 +1,192 @@
 cmake_minimum_required(VERSION 3.0.0)
 
 project(Audex VERSION "0.95")
 
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 set(CPACK_GENERATOR "DEB;RPM;TGZ")
 set(DEBIAN_PACKAGE_DESCRIPTION "Audex")
 set(DEBIAN_PACKAGE_SECTION "Multimedia")
 set(CPACK_SOURCE_GENERATOR "TBZ2")
 set(CPACK_PACKAGE_VERSION_MAJOR ${Audex_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${Audex_VERSION_MINOR})
 set(CPACK_PACKAGE_CONTACT "Marco Nelles <audex@maniatek.com>")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${Audex_VERSION}")
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${Audex_VERSION}")
 include(CPack)
 
 set(KF5_MIN_VERSION "5.64.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -g")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMAddTests)
 include(FeatureSummary)
 include(KDEClangFormat)
 
 find_package(Qt5 REQUIRED COMPONENTS
   Script
   Widgets
   X11Extras
 )
 find_package(KF5 ${KF5_MIN_VER} REQUIRED COMPONENTS
   Config
   Completion
   CoreAddons
   Crash
   I18n
   IconThemes
   KCMUtils
   KIO
   Solid
   TextWidgets
   WidgetsAddons
   XmlGui
 )
 find_package(KF5Cddb)
 set_package_properties(KF5Cddb PROPERTIES
   DESCRIPTION "KF5 branch for CDDB library"
   URL "https://commits.kde.org/libkcddb"
   TYPE REQUIRED
   PURPOSE "libkcddb is used to retrieve audio CD meta data from the internet."
 )
 find_package(Cdparanoia REQUIRED)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
 )
 
 # Silence some errors for now
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
 
 set(CMAKE_C_FLAGS "${AUDEX_ID3_CFLAGS} ${CMAKE_C_FLAGS}")
 
 set(audex_SRCS
   main.cpp
   mainwindow.cpp
   models/cddamodel.cpp
   models/profilemodel.cpp
   utils/pid.cpp
   utils/coverfetcher.cpp
   utils/patternparser.cpp
   utils/playlist.cpp
   utils/wavefilewriter.cpp
   utils/cddaparanoia.cpp
   utils/cddadevices.cpp
   utils/encoderwrapper.cpp
   utils/cddaextractthread.cpp
   utils/upload.cpp
   utils/encoderassistant.cpp
   utils/hashlist.cpp
   utils/3rdparty/crc32.cpp
   utils/parameters.cpp
   utils/cachedimage.cpp
   utils/cuesheetwriter.cpp
   utils/tmpdir.cpp
   utils/discidcalculator.cpp
   widgets/cddaheaderwidget.cpp
   widgets/generalsettingswidget.cpp
   widgets/devicewidget.cpp
   widgets/profilewidget.cpp
   widgets/remoteserversettingswidget.cpp
   widgets/lamewidget.cpp
   widgets/oggencwidget.cpp
   widgets/flacwidget.cpp
   widgets/faacwidget.cpp
   widgets/wavewidget.cpp
   widgets/customwidget.cpp
   dialogs/coverbrowserdialog.cpp
   dialogs/cddaheaderdatadialog.cpp
   dialogs/profiledatadialog.cpp
   dialogs/profiledatacoverdialog.cpp
   dialogs/profiledataplaylistdialog.cpp
   dialogs/profiledatainfodialog.cpp
   dialogs/profiledatahashlistdialog.cpp
   dialogs/profiledatacuesheetdialog.cpp
   dialogs/profiledatasinglefiledialog.cpp
   dialogs/patternwizarddialog.cpp
   dialogs/commandwizarddialog.cpp
   dialogs/simplepatternwizarddialog.cpp
   dialogs/extractingprogressdialog.cpp
   dialogs/protocoldialog.cpp
   dialogs/errordialog.cpp
   core/audex.cpp
 )
 
 ki18n_wrap_ui(audex_SRCS
   widgets/generalsettingswidgetUI.ui
   widgets/devicewidgetUI.ui
   widgets/profilewidgetUI.ui
   widgets/remoteserversettingswidgetUI.ui
   widgets/lamewidgetUI.ui
   widgets/oggencwidgetUI.ui
   widgets/flacwidgetUI.ui
   widgets/faacwidgetUI.ui
   widgets/wavewidgetUI.ui
   widgets/customwidgetUI.ui
   dialogs/coverbrowserwidgetUI.ui
   dialogs/cddaheaderdatawidgetUI.ui
   dialogs/profiledatawidgetUI.ui
   dialogs/profiledatacoverwidgetUI.ui
   dialogs/profiledataplaylistwidgetUI.ui
   dialogs/profiledatainfowidgetUI.ui
   dialogs/profiledatahashlistwidgetUI.ui
   dialogs/profiledatacuesheetwidgetUI.ui
   dialogs/profiledatasinglefilewidgetUI.ui
   dialogs/patternwizardwidgetUI.ui
   dialogs/commandwizardwidgetUI.ui
   dialogs/simplepatternwizardwidgetUI.ui
   dialogs/extractingprogresswidgetUI.ui
   dialogs/protocolwidgetUI.ui
 )
 
 kconfig_add_kcfg_files(audex_SRCS preferences.kcfgc)
 qt5_add_resources(audex_SRCS audex.qrc)
 
 add_executable(audex ${audex_SRCS})
 target_link_libraries(audex
     Qt5::Script
     Qt5::Widgets
     Qt5::X11Extras
     KF5::Completion
     KF5::CoreAddons
     KF5::Crash
     KF5::I18n
     KF5::IconThemes
     KF5::KCMUtils
     KF5::KIOWidgets
     KF5::Solid
     KF5::TextWidgets
     KF5::WidgetsAddons
     KF5::XmlGui
     KF5::Cddb
     ${CDPARANOIA_LIBRARIES}
 )
 
-install(TARGETS audex DESTINATION ${BIN_INSTALL_DIR})
-install(PROGRAMS org.kde.audex.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS audex DESTINATION ${KDE_INSTALL_BINDIR})
+install(PROGRAMS org.kde.audex.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.audex.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
-install(FILES audex-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
+install(FILES audex-rip-audiocd.desktop DESTINATION ${KDE_INSTALL_DATADIR}/solid/actions)
 
 add_subdirectory(icons)
 add_subdirectory(images)
 
 if(BUILD_TESTING)
     find_package(Qt5Test REQUIRED)
     add_subdirectory(test)
 endif()
 
 # add clang-format target for all our real source files
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES)
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 5d62790..c3bd427 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,11 +1,10 @@
 set(audex_ICONS
     16-apps-audex.png
     32-apps-audex.png
     48-apps-audex.png
     64-apps-audex.png
     128-apps-audex.png
 )
-ecm_install_icons(
-    ICONS ${audex_ICONS}
-    DESTINATION ${ICON_INSTALL_DIR}
+ecm_install_icons(ICONS ${audex_ICONS}
+    DESTINATION ${KDE_INSTALL_ICONDIR}
 )
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
index a707365..ed0674d 100644
--- a/images/CMakeLists.txt
+++ b/images/CMakeLists.txt
@@ -1 +1,18 @@
-install( FILES canada.png catalonia.png france.png germany.png italy.png japan.png netherlands.png poland.png portugal.png spain.png sweden.png usa.png uk.png nocover.png  DESTINATION  ${DATA_INSTALL_DIR}/audex/images)
+install(FILES
+        canada.png
+        catalonia.png
+        france.png
+        germany.png
+        italy.png
+        japan.png
+        netherlands.png
+        poland.png
+        portugal.png
+        spain.png
+        sweden.png
+        usa.png
+        uk.png
+        nocover.png
+    DESTINATION
+        ${KDE_INSTALL_DATADIR}/audex/images
+)