diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa980cf8..3dc1bc5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,142 +1,190 @@
 cmake_minimum_required (VERSION 3.0 FATAL_ERROR)
 
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "19")
 set (KDE_APPLICATIONS_VERSION_MINOR "03")
 set (KDE_APPLICATIONS_VERSION_MICRO "70")
 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 project(gwenview VERSION ${KDE_APPLICATIONS_VERSION})
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 
 set (QT_MIN_VERSION "5.9.0")
 set (KF5_MIN_VERSION "5.43.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMOptionalAddSubdirectory)
 include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMMarkNonGuiExecutable)
 include(ECMGenerateHeaders)
 include(ECMAddAppIcon)
 include(GenerateExportHeader)
 include(FeatureSummary)
 
 ## Generate header with version number
 ecm_setup_version(${KDE_APPLICATIONS_VERSION}
                   VARIABLE_PREFIX GWENVIEW
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/lib/gwenview_version.h"
 )
 
 ## CMake options
 set(GWENVIEW_SEMANTICINFO_BACKEND_NONE OFF)
 set(GWENVIEW_SEMANTICINFO_BACKEND_FAKE OFF)
 set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO OFF)
 
 set(GWENVIEW_SEMANTICINFO_BACKEND "Baloo" CACHE STRING "Semantic info backend for Gwenview (Baloo/Fake/None)")
 
 # Init GWENVIEW_SEMANTICINFO_BACKEND_* vars
 if(GWENVIEW_SEMANTICINFO_BACKEND STREQUAL "None")
     set(GWENVIEW_SEMANTICINFO_BACKEND_NONE ON)
 elseif(GWENVIEW_SEMANTICINFO_BACKEND STREQUAL "Fake")
     set(GWENVIEW_SEMANTICINFO_BACKEND_FAKE ON)
 else()
     set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
 endif()
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Concurrent Svg OpenGL PrintSupport)
 find_package(Qt5DBus ${QT_MIN_VERSION} CONFIG QUIET)
 set(HAVE_QTDBUS ${Qt5DBus_FOUND})
 
 find_package(Phonon4Qt5 4.6.60 NO_MODULE REQUIRED)
 include_directories(BEFORE ${PHONON_INCLUDES})
 add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     KIO
     ItemModels
     I18n
     DocTools
     Parts
     WindowSystem
     IconThemes
     Notifications
 )
 find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
 )
 
 ## Dependencies
 find_package(JPEG)
 set_package_properties(JPEG PROPERTIES URL "http://libjpeg.sourceforge.net/" DESCRIPTION "JPEG image manipulation support" TYPE REQUIRED)
 
 find_package(PNG)
 set_package_properties(PNG PROPERTIES URL "http://www.libpng.org" DESCRIPTION "PNG image manipulation support" TYPE REQUIRED)
 
 find_package(Exiv2)
 set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED)
 
 find_package(CFitsio)
 set_package_properties(CFitsio PROPERTIES URL "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html" DESCRIPTION "FITS format support" TYPE OPTIONAL)
 if(CFITSIO_FOUND)
     set(HAVE_FITS true)
 endif()
 
 find_package(KF5Kipi)
 if (KF5Kipi_FOUND)
    set(KIPI_FOUND true)
 endif()
 set_package_properties(KF5Kipi PROPERTIES URL "https://phabricator.kde.org/source/kipi-plugins/" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
 
 find_package(LCMS2)
 set_package_properties(LCMS2 PROPERTIES URL "http://www.littlecms.com" DESCRIPTION "Color management engine" TYPE REQUIRED)
 
 if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO)
     find_package(KF5Baloo 5.1.90)
     set_package_properties(KF5Baloo PROPERTIES URL "https://projects.kde.org/projects/kde/kdelibs/baloo" DESCRIPTION "Desktop-wide semantic information support" TYPE OPTIONAL)
     if (NOT KF5Baloo_FOUND)
         message (STATUS "You have selected Baloo for semantic backend, but required version was not found. Overriding the backend to None")
         unset(GWENVIEW_SEMANTICINFO_BACKEND_BALOO)
         set(GWENVIEW_SEMANTICINFO_BACKEND_NONE ON)
     endif ()
 endif ()
 
 find_package(KF5KDcraw)
 if (KF5KDcraw_FOUND)
    add_definitions(-DKDCRAW_FOUND)
 endif()
 set_package_properties(KF5KDcraw PROPERTIES URL "https://phabricator.kde.org/source/libkdcraw/" DESCRIPTION "C++ interface around LibRaw library used to decode RAW picture files" TYPE OPTIONAL)
 
 
 find_package(X11)
 if(X11_FOUND)
    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
    set(HAVE_X11 1)
 endif()
 
 configure_file(config-gwenview.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gwenview.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
+function(JoinListAsString VALUES GLUE OUTPUT)
+    string(REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
+    set(${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
+endfunction()
+
+set(IMAGE_MIME_TYPES_LIST
+    image/gif
+    image/jpeg
+    image/png
+    image/bmp
+    image/x-eps
+    image/x-icns
+    image/x-ico
+    image/x-portable-bitmap
+    image/x-portable-graymap
+    image/x-portable-pixmap
+    image/x-xbitmap
+    image/x-xpixmap
+    image/tiff
+    image/x-psd
+    image/x-webp
+    image/webp
+    image/x-tga
+)
+if (KF5KDcraw_FOUND)
+    list(APPEND IMAGE_MIME_TYPES_LIST
+        image/x-kde-raw
+        image/x-canon-cr2
+        image/x-canon-crw
+        image/x-kodak-dcr
+        image/x-adobe-dng
+        image/x-kodak-k25
+        image/x-kodak-kdc
+        image/x-minolta-mrw
+        image/x-nikon-nef
+        image/x-olympus-orf
+        image/x-pentax-pef
+        image/x-fuji-raf
+        image/x-panasonic-rw
+        image/x-sony-sr2
+        image/x-sony-srf
+        image/x-sigma-x3f
+        image/x-sony-arw
+        image/x-panasonic-rw2
+    )
+endif()
+JoinListAsString("${IMAGE_MIME_TYPES_LIST}" ";" IMAGE_MIME_TYPES)
+
 ## dirs to build
 add_subdirectory(lib)
 add_subdirectory(app)
 add_subdirectory(importer)
 add_subdirectory(part)
 add_subdirectory(tests)
 add_subdirectory(icons)
 add_subdirectory(images)
 add_subdirectory(cursors)
 add_subdirectory(color-schemes)
 add_subdirectory(doc)
 add_subdirectory(kconf_update)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 2288c943..329be933 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,125 +1,121 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${EXIV2_INCLUDE_DIR}
     )
 
 # For lib/gwenviewconfig.h and config-gwenview.h
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/..
     )
 
 set(gwenview_SRCS
     abstractcontextmanageritem.cpp
     configdialog.cpp
     gvcore.cpp
     documentinfoprovider.cpp
     viewmainpage.cpp
     fileoperations.cpp
     filtercontroller.cpp
     folderviewcontextmanageritem.cpp
     fullscreencontent.cpp
     infocontextmanageritem.cpp
     imagemetainfodialog.cpp
     imageopscontextmanageritem.cpp
     fileopscontextmanageritem.cpp
     main.cpp
     mainwindow.cpp
     preloader.cpp
     renamedialog.cpp
     saveallhelper.cpp
     savebar.cpp
     sidebar.cpp
     startmainpage.cpp
     thumbnailviewhelper.cpp
     browsemainpage.cpp
     )
 
 if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
     set (gwenview_SRCS
         ${gwenview_SRCS}
         semanticinfocontextmanageritem.cpp
         )
 endif()
 
 if (KF5Kipi_FOUND)
     set (gwenview_SRCS
         ${gwenview_SRCS}
         kipiexportaction.cpp
         kipiimagecollectionselector.cpp
         kipiinterface.cpp
         kipiuploadwidget.cpp
         )
 endif()
 
 ki18n_wrap_ui(gwenview_SRCS
     advancedconfigpage.ui
     fullscreenconfigwidget.ui
     generalconfigpage.ui
     imageviewconfigpage.ui
     renamedialog.ui
     semanticinfodialog.ui
     startmainpage.ui
     browsemainpage.ui
     )
 
 qt5_add_resources(gwenview_SRCS gwenview.qrc)
 
 
 if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
     ki18n_wrap_ui(gwenview_SRCS
         semanticinfosidebaritem.ui
         )
 endif()
 
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/*-apps-gwenview.png")
 ecm_add_app_icon(gwenview_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(gwenview ${gwenview_SRCS})
 
 target_link_libraries(gwenview
     KF5::ItemModels
     KF5::Notifications
     gwenviewlib
     )
 
 if (KF5Activities_FOUND)
     target_link_libraries(gwenview KF5::Activities)
 endif()
 
 target_link_libraries(gwenview LINK_INTERFACE_LIBRARIES KF5::KIOCore Qt5::Core)
 
 if (KF5Kipi_FOUND)
     target_link_libraries(gwenview KF5::Kipi)
 endif()
 
 if (APPLE)
     # own plist template
     set_target_properties (gwenview PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in)
     # the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake,
     # so has to be set for all targets in this cmake file
     set(MACOSX_BUNDLE_DISPLAY_NAME Gwenview5)
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.gwenview")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Gwenview5")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "Gwenview5")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_INFO_STRING "Gwenview, KDE Image Viewer")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "Gwenview ${KDE_APPLICATIONS_VERSION}")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDE_APPLICATIONS_VERSION}")
     set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_COPYRIGHT "2002-2016 The Gwenview Authors")
 endif (APPLE)
 
-if (KF5KDcraw_FOUND)
-    set(RAW_MIME_TYPES "image/x-kde-raw;image/x-canon-cr2;image/x-canon-crw;image/x-kodak-dcr;image/x-adobe-dng;image/x-kodak-k25;image/x-kodak-kdc;image/x-minolta-mrw;image/x-nikon-nef;image/x-olympus-orf;image/x-pentax-pef;image/x-fuji-raf;image/x-panasonic-rw;image/x-sony-sr2;image/x-sony-srf;image/x-sigma-x3f;image/x-sony-arw;image/x-panasonic-rw2;")
-endif()
-
 configure_file(org.kde.gwenview.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.gwenview.desktop)
 
 install(TARGETS gwenview
     ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.gwenview.desktop
     DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.gwenview.appdata.xml
     DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES slideshow.desktop
     DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)
diff --git a/app/org.kde.gwenview.desktop.cmake b/app/org.kde.gwenview.desktop.cmake
index ab847eb7..0392257f 100644
--- a/app/org.kde.gwenview.desktop.cmake
+++ b/app/org.kde.gwenview.desktop.cmake
@@ -1,193 +1,193 @@
 [Desktop Entry]
 Name=Gwenview
 Name[ar]=جوِينفيو
 Name[be]=Gwenview
 Name[bg]=Gwenview
 Name[bs]=Gwenview
 Name[ca]=Gwenview
 Name[ca@valencia]=Gwenview
 Name[cs]=Gwenview
 Name[da]=Gwenview
 Name[de]=Gwenview
 Name[el]=Gwenview
 Name[en_GB]=Gwenview
 Name[eo]=Gwenview
 Name[es]=Gwenview
 Name[et]=Gwenview
 Name[eu]=Gwenview
 Name[fa]=Gwenview
 Name[fi]=Gwenview
 Name[fr]=Gwenview
 Name[ga]=Gwenview
 Name[gl]=Gwenview
 Name[hi]=ग्वेन-व्यू
 Name[hne]=ग्वेन-व्यू
 Name[hr]=Gwenview
 Name[hu]=Gwenview
 Name[ia]=Gwenview
 Name[id]=Gwenview
 Name[is]=Gwenview
 Name[it]=Gwenview
 Name[ja]=Gwenview
 Name[kk]=Gwenview
 Name[km]=Gwenview
 Name[ko]=Gwenview
 Name[ku]=Gwenview
 Name[lt]=Gwenview
 Name[lv]=Gwenview
 Name[mr]=ग्वेनव्यु
 Name[nb]=Gwenview
 Name[nds]=Gwenview
 Name[ne]=जीवेनभ्यू
 Name[nl]=Gwenview
 Name[nn]=Gwenview
 Name[oc]=Gwenview
 Name[pa]=ਜੀਵੀਨ-ਵਿਊ
 Name[pl]=Gwenview
 Name[pt]=Gwenview
 Name[pt_BR]=Gwenview
 Name[ro]=Gwenview
 Name[ru]=Gwenview
 Name[si]=Gwenview
 Name[sk]=Gwenview
 Name[sl]=Gwenview
 Name[sr]=Гвенвју
 Name[sr@ijekavian]=Гвенвју
 Name[sr@ijekavianlatin]=GwenView
 Name[sr@latin]=GwenView
 Name[sv]=Gwenview
 Name[th]=เกวนวิว
 Name[tr]=Gwenview
 Name[ug]=Gwenview
 Name[uk]=Gwenview
 Name[vi]=Gwenview
 Name[x-test]=xxGwenviewxx
 Name[zh_CN]=Gwenview
 Name[zh_TW]=影像檢視_Gwenview
 GenericName=KDE Image Viewer
 GenericName[ar]=عارض صور كدي
 GenericName[bg]=Преглед на изображения в KDE
 GenericName[bs]=KDE Prikazivač slika
 GenericName[ca]=Visor d'imatges del KDE
 GenericName[ca@valencia]=Visor d'imatges del KDE
 GenericName[cs]=Prohlížeč obrázků KDE
 GenericName[da]=KDE billedfremviser
 GenericName[de]=KDE-Bildbetrachter
 GenericName[el]=Προβολέας εικόνων του KDE
 GenericName[en_GB]=KDE Image Viewer
 GenericName[es]=Visor de imágenes de KDE
 GenericName[et]=KDE pildinäitaja
 GenericName[eu]=KDEren irudi erakuslea
 GenericName[fa]=مشاهده‌گر تصویر کی‌دی‌ای
 GenericName[fi]=KDE:n kuvankatselin
 GenericName[fr]=Afficheur d'images de KDE
 GenericName[ga]=Amharcán Íomhánna KDE
 GenericName[gl]=Visor de imaxes de KDE
 GenericName[he]=מציג תמונות של KDE
 GenericName[hu]=KDE képnézegető
 GenericName[ia]=Visor de imagine de KDE
 GenericName[id]=Penampil Image KDE
 GenericName[is]=Myndskoðari fyrir KDE
 GenericName[it]=Visore di immagini per KDE
 GenericName[ja]=KDE 画像ビューア
 GenericName[kk]=KDE кескін қарау құралы
 GenericName[ko]=KDE 그림 뷰어
 GenericName[lt]=KDE Paveikslėlių žiūryklė
 GenericName[mr]=केडीई प्रतिमा प्रदर्शक
 GenericName[nb]=KDE bildeviser
 GenericName[nds]=KDE-Bildkieker
 GenericName[nl]=KDE afbeeldingenviewer
 GenericName[nn]=Biletvisar for KDE
 GenericName[pa]=ਕੇਡੀਈ ਚਿੱਤਰ ਦਰਸ਼ਕ
 GenericName[pl]=Przeglądarka obrazów
 GenericName[pt]=Visualizador de Imagens do KDE
 GenericName[pt_BR]=Visualizador de imagens do KDE
 GenericName[ro]=Vizualizor de imagini pentru KDE
 GenericName[ru]=Программа просмотра изображений
 GenericName[sk]=Prehliadač obrázkov KDE
 GenericName[sl]=Pregledovalnik slik za KDE
 GenericName[sr]=КДЕ приказивач слика
 GenericName[sr@ijekavian]=КДЕ приказивач слика
 GenericName[sr@ijekavianlatin]=KDE prikazivač slika
 GenericName[sr@latin]=KDE prikazivač slika
 GenericName[sv]=Bildvisare för KDE
 GenericName[tr]=KDE Resim Gösterici
 GenericName[uk]=Переглядач зображень KDE
 GenericName[x-test]=xxKDE Image Viewerxx
 GenericName[zh_CN]=KDE 图像查看器
 GenericName[zh_TW]=KDE 影像檢視程式
 Comment=A simple image viewer
 Comment[ar]=عارض صور بسيط
 Comment[bg]=Програма за преглед на изображения
 Comment[bs]=Jednostavan prikazivač slika
 Comment[ca]=Un visualitzador d'imatges senzill
 Comment[ca@valencia]=Un visualitzador d'imatges senzill
 Comment[cs]=Jednoduchý prohlížeč obrázků
 Comment[da]=Simpel billedfremviser
 Comment[de]=Ein einfacher Bildbetrachter
 Comment[el]=Ένας απλός προβολέας εικόνων
 Comment[en_GB]=A simple image viewer
 Comment[eo]=Simpla bildorigardilo
 Comment[es]=Un visor de imágenes sencillo
 Comment[et]=Lihtne pildinäitaja
 Comment[eu]=Irudi erakusle erraz bat
 Comment[fa]=مشاهده‌گر تصویر  ساده
 Comment[fi]=Yksinkertainen kuvankatselin
 Comment[fr]=Un afficheur simple d'images
 Comment[ga]=Amharcán simplí íomhánna
 Comment[gl]=Un visor de imaxes sinxelo
 Comment[he]=מציג תמונות פשוט
 Comment[hi]=एक सरल चित्र प्रदर्शक
 Comment[hne]=एक सरल फोटू प्रदर्सक
 Comment[hr]=Jednostavni preglednik slika
 Comment[hu]=Egyszerű képnézegető
 Comment[ia]=Un simplice visor de imagine
 Comment[id]=Sebuah penampil image sederhana
 Comment[is]=Einfaldur myndskoðari
 Comment[it]=Un semplice visore di immagini
 Comment[ja]=シンプルな画像ビューア
 Comment[kk]=Қарапайым кескінді қарау құралы
 Comment[km]=កម្មវិធី​មើល​រូបភាព​ធម្មតា
 Comment[ko]=간단한 그림 뷰어
 Comment[ku]=Nîşanderê wêneyan yê hêsanî
 Comment[lt]=Paprasta paveikslėlių žiūryklė
 Comment[lv]=Vienkāršs attēlu skatītājs
 Comment[mr]=एक सोपा प्रतिमा प्रदर्शक
 Comment[nb]=En enkel bildeviser
 Comment[nds]=En eenfach Bildkieker
 Comment[nl]=Een eenvoudige afbeeldingenviewer
 Comment[nn]=Ein enkel biletvisar
 Comment[pa]=ਇੱਕ ਸਧਾਰਨ ਚਿੱਤਰ ਦਰਸ਼ਕ
 Comment[pl]=Prosta przeglądarka obrazów
 Comment[pt]=Um visualizador de imagens simples
 Comment[pt_BR]=Um visualizador de imagens simples
 Comment[ro]=Un vizualizator de imagini simplu
 Comment[ru]=Просмотр изображений
 Comment[si]=සරල පිංතූර දසුන
 Comment[sk]=Jednoduchý prehliadač obrázkov
 Comment[sl]=Preprost pregledovalnik slik
 Comment[sr]=Једноставан приказивач слика
 Comment[sr@ijekavian]=Једноставан приказивач слика
 Comment[sr@ijekavianlatin]=Jednostavan prikazivač slika
 Comment[sr@latin]=Jednostavan prikazivač slika
 Comment[sv]=En enkel bildvisare
 Comment[th]=เครื่องมือแสดงภาพแบบพื้นฐาน
 Comment[tr]=Basit bir resim gösterici
 Comment[ug]=ئاددىي سۈرەت كۆرگۈ
 Comment[uk]=Простий переглядач зображень
 Comment[vi]=Bộ xem ảnh đơn giản
 Comment[x-test]=xxA simple image viewerxx
 Comment[zh_CN]=简单图像查看器
 Comment[zh_TW]=一個簡單的影像檢視程式
 Exec=gwenview %U
 Terminal=false
 Icon=gwenview
 Type=Application
 Categories=Qt;KDE;Graphics;Viewer;Photography;
-MimeType=inode/directory;image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-icns;image/x-ico;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/tiff;image/x-psd;image/x-webp;image/webp;image/x-tga;${RAW_MIME_TYPES}
+MimeType=inode/directory;${IMAGE_MIME_TYPES};
 X-DocPath=gwenview/index.html
 # InitialPreference should be greater than Okular so that Gwenview is the
 # primary application associated with images, but less than Konqueror or Dolphin
 # so that Gwenview is not the primary applications for folders.
 InitialPreference=8
 X-DBUS-ServiceName=org.kde.gwenview
diff --git a/part/CMakeLists.txt b/part/CMakeLists.txt
index 9d17eed2..c3cfc89b 100644
--- a/part/CMakeLists.txt
+++ b/part/CMakeLists.txt
@@ -1,20 +1,22 @@
 add_definitions(-DTRANSLATION_DOMAIN="gwenview")
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${EXIV2_INCLUDE_DIR}
     )
 
 set(gvpart_SRCS
     gvbrowserextension.cpp
     gvpart.cpp
     )
 
 add_library(gvpart MODULE ${gvpart_SRCS})
 
 target_link_libraries(gvpart KF5::Parts gwenviewlib)
 
+configure_file(gvpart.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/gvpart.desktop)
+
 install(TARGETS gvpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
-install(FILES gvpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gvpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 install(FILES gvpart.rc
     DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/gvpart)
diff --git a/part/gvpart.desktop b/part/gvpart.desktop.cmake
similarity index 93%
rename from part/gvpart.desktop
rename to part/gvpart.desktop.cmake
index cb27cf45..069596fc 100644
--- a/part/gvpart.desktop
+++ b/part/gvpart.desktop.cmake
@@ -1,71 +1,71 @@
 [Desktop Entry]
 Type=Service
 Name=Gwenview Image Viewer
 Name[ar]=جوِينفيو مستعرض الصورة
 Name[bg]=Програма за снимки Gwenview
 Name[bs]=Gvenview prikazivač slika
 Name[ca]=Visualitzador d'imatges Gwenview
 Name[ca@valencia]=Visualitzador d'imatges Gwenview
 Name[cs]=Prohlížeč obrázků Gwenview
 Name[da]=Gwenview billedfremviser
 Name[de]=Gwenview Bildbetrachter
 Name[el]=Προβολέας εικόνων Gwenview
 Name[en_GB]=Gwenview Image Viewer
 Name[eo]=Gwenview bildorigardilo
 Name[es]=Visor de imágenes Gwenview
 Name[et]=Gwenview pildinäitaja
 Name[eu]=Gwenview irudi erakuslea
 Name[fa]=مشاهده‌گر تصویر Gwenview
 Name[fi]=Gwenview-kuvankatselin
 Name[fr]=Afficheur d'images Gwenview
 Name[ga]=Amharcán Íomhánna Gwenview
 Name[gl]=Visor de imaxes Gwenview
 Name[he]=מציג התמונות Gwenview
 Name[hi]=ग्वेन-व्यू छवि प्रदर्शक
 Name[hne]=ग्वेन-व्यू फोटू प्रदर्सक
 Name[hr]=Preglednik slika Gwenview
 Name[hu]=Gwenview képnézegető
 Name[ia]=Visor de imagine Gwenview
 Name[id]=Penampil Image Gwenview
 Name[is]=Gwenview myndskoðari
 Name[it]=Visore di immagini Gwenview
 Name[ja]=Gwenview 画像ビューア
 Name[kk]=Gwenview кескінді қарау құралы
 Name[km]=កម្មវិធី​មើល​រូបភាព​របស់ Gwenview
 Name[ko]=Gwenview 그림 뷰어
 Name[ku]=Gwenview Nîşanderê Wêneyan
 Name[lt]=Gwenview paveikslėlių žiūryklė
 Name[lv]=Gwenview attēlu skatītājs
 Name[mr]=ग्वेनव्यु प्रतिमा प्रदर्शक
 Name[nb]=Bildeviseren Gwenview
 Name[nds]=Bildkieker Gwenview
 Name[ne]=जीवेनभ्यू छवि दर्शक
 Name[nl]=GWenview Afbeeldingenviewer
 Name[nn]=Gwenview biletvisar
 Name[pa]=ਜੀਵੀਨ-ਵਿਊ ਚਿੱਤਰ ਦਰਸ਼ਕ
 Name[pl]=Przeglądarka obrazów Gwenview
 Name[pt]=Visualizador de Imagens Gwenview
 Name[pt_BR]=Visualizador de imagens do Gwenview
 Name[ro]=Vizualizator de imagini KView
 Name[ru]=Просмотр изображений в Gwenview
 Name[si]=Gwenview පිංතූර දසුන
 Name[sk]=Prehliadač obrázkov Gwenview
 Name[sl]=Pregledovalnik slik Gwenview
 Name[sr]=Гвенвју приказивач слика
 Name[sr@ijekavian]=Гвенвју приказивач слика
 Name[sr@ijekavianlatin]=GwenView prikazivač slika
 Name[sr@latin]=GwenView prikazivač slika
 Name[sv]=Gwenview bildvisare
 Name[th]=เกวนวิว - เครื่องมือแสดงภาพ
 Name[tr]=Gwenview Resim Gösterici
 Name[ug]=Gwenview سۈرەت كۆرگۈ
 Name[uk]=Переглядач зображень Gwenview
 Name[vi]=Bộ xem ảnh Gwenview
 Name[x-test]=xxGwenview Image Viewerxx
 Name[zh_CN]=Gwenview 图像查看器
 Name[zh_TW]=Gwenview 影像檢視程式
-MimeType=image/gif;image/jpeg;image/jp2;image/png;image/bmp;image/x-eps;image/x-icns;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-webp;image/webp;image/x-tga;
+MimeType=${IMAGE_MIME_TYPES};
 X-KDE-ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=gvpart
 InitialPreference=12
 Icon=gwenview