diff --git a/Map/MapView.cpp b/Map/MapView.cpp
index 3f9aba6e..e54ca6bc 100644
--- a/Map/MapView.cpp
+++ b/Map/MapView.cpp
@@ -1,237 +1,240 @@
 /* Copyright (C) 2014-2018 Tobias Leupold <tobias.leupold@gmx.de>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 // Local includes
 #include "MapView.h"
 #include "Logging.h"
 
 // Marble includes
 #include <marble/MarbleWidget.h>
 
+// Marble includes
+#include <marble/MarbleWidget.h>
+
 // Qt includes
 #include <QLabel>
 #include <QLoggingCategory>
 #include <QPixmap>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QDebug>
 
 // KDE includes
 #include <KConfigGroup>
 #include <KIconLoader>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KSharedConfig>
 
 Map::MapView::MapView(QWidget *parent, UsageType type) : QWidget(parent)
 {
     if (type == MapViewWindow) {
         setWindowFlags(Qt::Window);
         setAttribute(Qt::WA_DeleteOnClose);
     }
 
     QVBoxLayout *layout = new QVBoxLayout(this);
 
     m_statusLabel = new QLabel;
     m_statusLabel->setAlignment(Qt::AlignCenter);
     m_statusLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
     m_statusLabel->hide();
     layout->addWidget(m_statusLabel);
 
     m_mapWidget = new Marble::MarbleWidget;
     m_mapWidget->setProjection(Marble::Mercator);
     m_mapWidget->setMapThemeId(QString::fromUtf8("earth/openstreetmap/openstreetmap.dgml"));
     layout->addWidget(m_mapWidget);
     m_mapWidget->show();
 
     QHBoxLayout *controlLayout = new QHBoxLayout;
     layout->addLayout(controlLayout);
 
     QPushButton *saveButton = new QPushButton;
     saveButton->setIcon(QPixmap(SmallIcon(QString::fromUtf8("media-floppy"))));
     saveButton->setToolTip(i18n("Save the current map settings"));
     controlLayout->addWidget(saveButton);
     connect(saveButton, &QPushButton::clicked, this, &MapView::saveSettings);
 
     QPushButton *showOverviewMap = new QPushButton;
     showOverviewMap->setIcon(QPixmap(SmallIcon(QString::fromUtf8("view-preview"))));
     showOverviewMap->setToolTip(i18n("Show the overview map"));
     showOverviewMap->setCheckable(true);
     showOverviewMap->setChecked(true);
     controlLayout->addWidget(showOverviewMap);
     connect(showOverviewMap, &QPushButton::clicked,
             m_mapWidget, &Marble::MarbleWidget::setShowOverviewMap);
 
     QPushButton *showCompass = new QPushButton;
     showCompass->setIcon(QPixmap(SmallIcon(QString::fromUtf8("compass"))));
     showCompass->setToolTip(i18n("Show the compass"));
     showCompass->setCheckable(true);
     showCompass->setChecked(true);
     controlLayout->addWidget(showCompass);
     connect(showCompass, &QPushButton::clicked, m_mapWidget, &Marble::MarbleWidget::setShowCompass);
 
     QPushButton *showScaleBar = new QPushButton;
     showScaleBar->setIcon(QPixmap(SmallIcon(QString::fromUtf8("insert-horizontal-rule"))));
     showScaleBar->setToolTip(i18n("Show the scale bar"));
     showScaleBar->setCheckable(true);
     showScaleBar->setChecked(true);
     controlLayout->addWidget(showScaleBar);
     connect(showScaleBar, &QPushButton::clicked,
             m_mapWidget, &Marble::MarbleWidget::setShowScaleBar);
 
     m_setLastCenterButton = new QPushButton;
     m_setLastCenterButton->setIcon(QPixmap(SmallIcon(QString::fromUtf8("go-first"))));
     m_setLastCenterButton->setToolTip(i18n("Go to last map position"));
     controlLayout->addWidget(m_setLastCenterButton);
     connect(m_setLastCenterButton, &QPushButton::clicked, this, &MapView::setLastCenter);
 
     controlLayout->addStretch();
 }
 
 Map::MapView::~MapView()
 {
 }
 
 void Map::MapView::clear()
 {
     qDebug() << ">>> Implement me! Map::MapView::clear()";
 }
 
 void Map::MapView::addImage(const DB::ImageInfo &image)
 {
     Q_UNUSED(image);
     qDebug() << ">>> Implement me! Map::MapView::addImage(const DB::ImageInfo& image)";
 }
 
 void Map::MapView::addImage(const DB::ImageInfoPtr image)
 {
     Q_UNUSED(image)
     qDebug() << ">>> Implement me! Map::MapView::addImage(const DB::ImageInfoPtr image)";
 }
 
 void Map::MapView::zoomToMarkers()
 {
     qDebug() << ">>> Implement me! Map::MapView::zoomToMarkers()";
 }
 
 void Map::MapView::setCenter(const DB::ImageInfo &image)
 {
     m_lastCenter = image.coordinates();
     qDebug() << ">>> Implement me! Map::MapView::setCenter(const DB::ImageInfo &image)";
 }
 
 void Map::MapView::setCenter(const DB::ImageInfoPtr image)
 {
     m_lastCenter = image->coordinates();
     qDebug() << ">>> Implement me! Map::MapView::setCenter(const DB::ImageInfoPtr image)";
 }
 
 void Map::MapView::saveSettings()
 {
     qDebug() << ">>> Implement me! Map::MapView::saveSettings()";
 }
 
 void Map::MapView::setShowThumbnails(bool state)
 {
     Q_UNUSED(state);
     qDebug() << ">>> Implement me! Map::MapView::setShowThumbnails(bool state)";
 }
 
 void Map::MapView::displayStatus(MapStatus status)
 {
     switch (status) {
     case MapStatus::Loading:
         m_statusLabel->setText(i18n("<i>Loading coordinates from the images ...</i>"));
         m_statusLabel->show();
         m_mapWidget->hide();
         //m_mapWidget->clearRegionSelection();
         m_setLastCenterButton->setEnabled(false);
         break;
     case MapStatus::ImageHasCoordinates:
         m_statusLabel->hide();
         //m_mapWidget->setAvailableMouseModes(KGeoMap::MouseModePan);
         //m_mapWidget->setVisibleMouseModes(0);
         //m_mapWidget->setMouseMode(KGeoMap::MouseModePan);
         //m_mapWidget->clearRegionSelection();
         m_mapWidget->show();
         m_setLastCenterButton->show();
         m_setLastCenterButton->setEnabled(true);
         break;
     case MapStatus::ImageHasNoCoordinates:
         m_statusLabel->setText(i18n("<i>This image does not contain geographic coordinates.</i>"));
         m_statusLabel->show();
         m_mapWidget->hide();
         m_setLastCenterButton->show();
         m_setLastCenterButton->setEnabled(false);
         break;
     case MapStatus::SomeImagesHaveNoCoordinates:
         m_statusLabel->setText(i18n("<i>Some of the selected images do not contain geographic "
                                     "coordinates.</i>"));
         m_statusLabel->show();
         //m_mapWidget->setAvailableMouseModes(KGeoMap::MouseModePan);
         //m_mapWidget->setVisibleMouseModes(0);
         //m_mapWidget->setMouseMode(KGeoMap::MouseModePan);
         //m_mapWidget->clearRegionSelection();
         m_mapWidget->show();
         m_setLastCenterButton->show();
         m_setLastCenterButton->setEnabled(true);
         break;
     case MapStatus::SearchCoordinates:
         m_statusLabel->setText(i18n("<i>Search for geographic coordinates.</i>"));
         m_statusLabel->show();
         //m_mapWidget->setAvailableMouseModes(KGeoMap::MouseModePan
         //                                    | KGeoMap::MouseModeRegionSelectionFromIcon
         //                                    | KGeoMap::MouseModeRegionSelection);
         //m_mapWidget->setVisibleMouseModes(KGeoMap::MouseModePan
         //                                  | KGeoMap::MouseModeRegionSelectionFromIcon
         //                                  | KGeoMap::MouseModeRegionSelection);
         //m_mapWidget->setMouseMode(KGeoMap::MouseModeRegionSelectionFromIcon);
         m_mapWidget->show();
         //m_mapWidget->setCenter(KGeoMap::GeoCoordinates());
         m_setLastCenterButton->hide();
         break;
     case MapStatus::NoImagesHaveNoCoordinates:
         m_statusLabel->setText(i18n("<i>None of the selected images contain geographic "
                                     "coordinates.</i>"));
         m_statusLabel->show();
         m_mapWidget->hide();
         m_setLastCenterButton->show();
         m_setLastCenterButton->setEnabled(false);
         break;
     }
     emit displayStatusChanged(status);
 }
 
 void Map::MapView::setLastCenter()
 {
     qDebug() << ">>> Implement me! Map::MapView::setLastCenter()";
 }
 
 Map::GeoCoordinates::Pair Map::MapView::getRegionSelection() const
 {
     qDebug() << ">>> Implement me! Map::MapView::getRegionSelection()";
     return GeoCoordinates::makePair(0, 0, 0, 0);
 }
 
 bool Map::MapView::regionSelected() const
 {
     qDebug() << ">>> Implement me! Map::MapView::regionSelected()";
     return false;
 }
 
 // vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/org.kde.kphotoalbum.appdata.xml b/org.kde.kphotoalbum.appdata.xml
index da67c14e..f930ea0b 100644
--- a/org.kde.kphotoalbum.appdata.xml
+++ b/org.kde.kphotoalbum.appdata.xml
@@ -1,95 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component type="desktop">
   <id>org.kde.kphotoalbum</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
   <name>KPhotoAlbum </name>
   <name xml:lang="ast">KPhotoAlbum</name>
   <name xml:lang="ca">KPhotoAlbum</name>
   <name xml:lang="ca-valencia">KPhotoAlbum</name>
   <name xml:lang="cs">KPhotoAlbum</name>
   <name xml:lang="de">KPhotoAlbum</name>
   <name xml:lang="en-GB">KPhotoAlbum</name>
   <name xml:lang="es">KPhotoAlbum</name>
   <name xml:lang="fr">KPhotoAlbum</name>
   <name xml:lang="gl">KPhotoAlbum</name>
   <name xml:lang="id">KPhotoAlbum</name>
   <name xml:lang="it">KPhotoAlbum</name>
   <name xml:lang="nl">KPhotoAlbum</name>
   <name xml:lang="pl">KPhotoAlbum</name>
   <name xml:lang="pt">KPhotoAlbum</name>
   <name xml:lang="pt-BR">KPhotoAlbum</name>
   <name xml:lang="ru">KPhotoAlbum</name>
   <name xml:lang="sk">KPhotoAlbum</name>
   <name xml:lang="sv">Kfotoalbum</name>
   <name xml:lang="tr">KPhotoAlbum</name>
   <name xml:lang="uk">KPhotoAlbum</name>
   <name xml:lang="x-test">xxKPhotoAlbumxx</name>
   <name xml:lang="zh-CN">KPhotoAlbum</name>
   <summary>KDE image management software</summary>
   <summary xml:lang="ca">Programari per a gestionar les imatges al KDE</summary>
   <summary xml:lang="ca-valencia">Programari per a gestionar les imatges al KDE</summary>
   <summary xml:lang="de">KDE-Bildverwaltungssoftware</summary>
   <summary xml:lang="en-GB">KDE image management software</summary>
   <summary xml:lang="es">Software de gestión de imágenes para KDE</summary>
   <summary xml:lang="fr">Logiciel de gestion d'images KDE</summary>
   <summary xml:lang="gl">Software de xestión de imaxes de KDE</summary>
   <summary xml:lang="id">Perangkat lunak pengelolaan citra KDE</summary>
   <summary xml:lang="it">Software KDE per la gestione delle immagini</summary>
   <summary xml:lang="nl">Software voor beheer van afbeeldingen</summary>
   <summary xml:lang="pl">Oprogramowanie do zarządzania obrazami w KDE</summary>
   <summary xml:lang="pt">Aplicação de gestão de imagens do KDE</summary>
   <summary xml:lang="pt-BR">Software de gerenciamento de imagens do KDE</summary>
   <summary xml:lang="sk">KDE softvér na manipuláciu s obrázkami</summary>
   <summary xml:lang="sv">KDE bildhanteringsprogramvara</summary>
   <summary xml:lang="tr">KDE resim yönetim yazılımı</summary>
   <summary xml:lang="uk">Програма для керування зображеннями у KDE</summary>
   <summary xml:lang="x-test">xxKDE image management softwarexx</summary>
   <description>
     <p>KPhotoAlbum is an application for tagging and managing a photo collection and making it searchable.</p>
     <p xml:lang="ca">El KPhotoAlbum és una aplicació per etiquetar i gestionar una col·lecció de fotografies i fer-les fàcils de trobar.</p>
     <p xml:lang="ca-valencia">El KPhotoAlbum és una aplicació per etiquetar i gestionar una col·lecció de fotografies i fer-les fàcils de trobar.</p>
     <p xml:lang="de">KPhotoalbum ist eine Anwendung zum verschlagworten, verwalten und durchsuchen Ihrer Fotosammlung.</p>
     <p xml:lang="en-GB">KPhotoAlbum is an application for tagging and managing a photo collection and making it searchable.</p>
     <p xml:lang="es">KPhotoAlbum es una aplicación para etiquetar y gestionar una colección de fotografías que permite realizar búsquedas.</p>
     <p xml:lang="fr">KPhotoAlbum est une application permettant de gérer une collection de photos, en y définissant des balises et en y effectuant des recherches.</p>
     <p xml:lang="gl">KPhotoAlbum é un aplicativo para etiquetar e xestionar unha colección de fotos e permitir buscar nela.</p>
     <p xml:lang="id">KPhotoAlbum adalah sebuah aplikasi untuk penandaan dan pengelolaan sebuah koleksi foto dan membuatnya dapat dicari.</p>
     <p xml:lang="it">KPhotoAlbum è un'applicazione per etichettare e gestire una raccolta di immagini in modo da poter eseguire ricerche al suo interno.</p>
     <p xml:lang="nl">KPhotoAlbum is een toepassing voor aanbrengen van tags en beheer van een fotoverzameling en deze doorzoekbaar maken.</p>
     <p xml:lang="pl">KPhotoAlbum jest programem do znaczenia i zarządzania zbiorami zdjęć.</p>
     <p xml:lang="pt">O KPhotoAlbum é uma aplicação para marcar e gerir uma colecção de fotografias, tornando-a fácil de pesquisar.</p>
     <p xml:lang="pt-BR">KPhotoAlbum é um aplicativo para etiquetar e gerenciar uma coleção de fotos e torná-la pesquisável.</p>
     <p xml:lang="sk">KPhotoAlbum je aplikácia na označovanie a správu kolekcie fotografií a jej prehľadávanie.</p>
     <p xml:lang="sv">Kfotoalbum är ett program för att etikettera och hantera en fotosamling och göra den sökbar.</p>
     <p xml:lang="tr">KPhotoAlbum resim koleksiyonunu etiketlemek ve yöneten ve onu aranabilir yapan için bir uygulamadır.</p>
     <p xml:lang="uk">KPhotoAlbum — програма для створення міток у збірці фотографій та керування збіркою із можливостями пошуку зображень.</p>
     <p xml:lang="x-test">xxKPhotoAlbum is an application for tagging and managing a photo collection and making it searchable.xx</p>
   </description>
   <screenshots>
     <screenshot type="default">
       <image width="853" height="659">https://www.kphotoalbum.org/kphotoalbum_big.jpg</image>
       <caption>The main screen in KPhotoAlbum</caption>
       <caption xml:lang="ca">La pantalla principal del KPhotoAlbum</caption>
       <caption xml:lang="ca-valencia">La pantalla principal del KPhotoAlbum</caption>
       <caption xml:lang="cs">Hlavní obrazovka pro KPhotoAlbum</caption>
       <caption xml:lang="en-GB">The main screen in KPhotoAlbum</caption>
       <caption xml:lang="es">La ventana principal de KPhotoAlbum</caption>
       <caption xml:lang="fr">L'écran principal de KPhotoAlbum</caption>
       <caption xml:lang="it">La schermata principale in KPhotoAlbum</caption>
       <caption xml:lang="nl">Het hoofdscherm in KPhotoAlbum</caption>
       <caption xml:lang="pt">O ecrã principal no KPhotoAlbum</caption>
       <caption xml:lang="pt-BR">A tela principal do KPhotoAlbum</caption>
       <caption xml:lang="sv">Huvudskärmen i Kfotoalbum</caption>
       <caption xml:lang="uk">Знімок головного вікна KPhotoAlbum</caption>
       <caption xml:lang="x-test">xxThe main screen in KPhotoAlbumxx</caption>
     </screenshot>
   </screenshots>
   <url type="homepage">http://kphotoalbum.org</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kphotoalbum</url>
   <update_contact>kphotoalbum@mail.kdab.com</update_contact>
   <project_group>KDE</project_group>
   <provides>
     <binary>kphotoalbum</binary>
   </provides>
+  <launchable type="desktop-id">org.kde.kphotoalbum.desktop</launchable>
 </component>