diff --git a/mobile/app/CMakeLists.txt b/mobile/app/CMakeLists.txt
index dc57bb711..87994f1e9 100644
--- a/mobile/app/CMakeLists.txt
+++ b/mobile/app/CMakeLists.txt
@@ -1,14 +1,7 @@
+set(CMAKE_AUTORCC ON)
+add_executable(okularkirigami main.cpp app.qrc)
+target_link_libraries(okularkirigami Qt5::Widgets Qt5::Qml KF5::I18n)
+install(TARGETS okularkirigami ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-include_directories(  ${QT_INCLUDES} )
-
-#add_subdirectory(src)
-
-# QML-only thing
-#install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATADIR}/plasma/packages/org.kde.active.documentviewer)
-
-install(DIRECTORY package/ DESTINATION ${KDE_INSTALL_DATADIR}/kpackage/genericqml/org.kde.mobile.okular)
 install(FILES package/metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.mobile.okular.desktop)
 
-
-#install(FILES active-documentviewer.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-
diff --git a/mobile/app/app.qrc b/mobile/app/app.qrc
new file mode 100644
index 000000000..66b5a495e
--- /dev/null
+++ b/mobile/app/app.qrc
@@ -0,0 +1,13 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<file>package/contents/ui/Bookmarks.qml</file>
+<file>package/contents/ui/Documents.qml</file>
+<file>package/contents/ui/main.qml</file>
+<file>package/contents/ui/MainView.qml</file>
+<file>package/contents/ui/OkularDrawer.qml</file>
+<file>package/contents/ui/TableOfContents.qml</file>
+<file>package/contents/ui/Thumbnails.qml</file>
+<file>package/contents/ui/ThumbnailsBase.qml</file>
+<file>package/contents/ui/TreeDelegate.qml</file>
+</qresource>
+</RCC>
diff --git a/mobile/app/main.cpp b/mobile/app/main.cpp
new file mode 100644
index 000000000..c6e51f114
--- /dev/null
+++ b/mobile/app/main.cpp
@@ -0,0 +1,46 @@
+/*************************************************************************************
+ *  Copyright (C) 2010 by Aleix Pol <aleixpol@kde.org>                               *
+ *                                                                                   *
+ *  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; if not, write to the Free Software                      *
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   *
+ *************************************************************************************/
+
+#include <QApplication>
+
+#include <KLocalizedContext>
+#include <QDebug>
+#include <QFileInfo>
+#include <QDir>
+#include <QStandardPaths>
+#include <QQmlEngine>
+#include <QQmlContext>
+#include <QQmlApplicationEngine>
+#include <QIcon>
+
+Q_DECL_EXPORT int main(int argc, char *argv[])
+{
+#ifdef __ANDROID__
+    qputenv("QT_QUICK_CONTROLS_STYLE", "material");
+#endif
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("okularmobile"));
+
+    QQmlApplicationEngine engine;
+    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
+
+    engine.setBaseUrl(QUrl("qrc:/package/contents/ui/"));
+    engine.load(QUrl("qrc:/package/contents/ui/main.qml"));
+    return app.exec();
+}
diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop
index d25cf7001..a377ddbea 100644
--- a/mobile/app/package/metadata.desktop
+++ b/mobile/app/package/metadata.desktop
@@ -1,125 +1,125 @@
 [Desktop Entry]
 Name=Okular
 Name[ar]=اوكلار
 Name[ast]=Okular
 Name[bg]=Okular
 Name[bs]=Okular
 Name[ca]=Okular
 Name[ca@valencia]=Okular
 Name[cs]=Okular
 Name[da]=Okular
 Name[de]=Okular
 Name[el]=Okular
 Name[en_GB]=Okular
 Name[eo]=Okular
 Name[es]=Okular
 Name[et]=Okular
 Name[eu]=Okular
 Name[fi]=Okular
 Name[fr]=Okular
 Name[ga]=Okular
 Name[gl]=Okular
 Name[hne]=ओकुलर
 Name[hr]=Okular
 Name[hu]=Okular
 Name[ia]=Okular
 Name[is]=Okular
 Name[it]=Okular
 Name[ja]=Okular
 Name[kk]=Okular
 Name[km]=Okular
 Name[ko]=Okular
 Name[ku]=Okular
 Name[lt]=Okular
 Name[lv]=Okular
 Name[mr]=ओक्युलर
 Name[nb]=Okular
 Name[nds]=Okular
 Name[nl]=Okular
 Name[nn]=Okular
 Name[pa]=ਓਕੁਲਾਰ
 Name[pl]=Okular
 Name[pt]=Okular
 Name[pt_BR]=Okular
 Name[ro]=Okular
 Name[ru]=Okular
 Name[si]=Okular
 Name[sk]=Okular
 Name[sl]=Okular
 Name[sq]=Okular
 Name[sr]=Окулар
 Name[sr@ijekavian]=Окулар
 Name[sr@ijekavianlatin]=Okular
 Name[sr@latin]=Okular
 Name[sv]=Okular
 Name[th]=โอกูลาร์
 Name[tr]=Okular
 Name[ug]=Okular
 Name[uk]=Okular
 Name[x-test]=xxOkularxx
 Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document viewer
 GenericName[ar]=عارض المستندات
 GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
 GenericName[ca@valencia]=Visualitzador de documents
 GenericName[cs]=Prohlížeč dokumentů
 GenericName[da]=Dokumentfremviser
 GenericName[de]=Dokumentenbetrachter
 GenericName[el]=Προβολέας εγγράφων
 GenericName[en_GB]=Document Viewer
 GenericName[es]=Visor de documentos
 GenericName[et]=Dokumendinäitaja
 GenericName[fi]=Asiakirjakatselin
 GenericName[fr]=Afficheur de document
 GenericName[ga]=Amharcán cáipéisí
 GenericName[gl]=Visor de documentos
 GenericName[hu]=Dokumentummegjelenítő
 GenericName[ia]=Visor de documento
 GenericName[is]=Skjalaskoðari
 GenericName[it]=Visore di documenti
 GenericName[ja]=文書ビューア
 GenericName[kk]=Құжатты қарау құралы
 GenericName[ko]=문서 뷰어
 GenericName[lt]=Dokumentų žiūryklė
 GenericName[mr]=दस्तऐवज प्रदर्शक
 GenericName[nb]=Dokumentviser
 GenericName[nds]=Dokmentkieker
 GenericName[nl]=Documentenviewer
 GenericName[nn]=Dokumentvisar
 GenericName[pa]=ਡੌਕੂਮੈਂਟ ਦਰਸ਼ਕ
 GenericName[pl]=Przeglądarka dokumentów
 GenericName[pt]=Visualizador de documentos
 GenericName[pt_BR]=Visualizador de documentos
 GenericName[ro]=Vizualizor de documente
 GenericName[ru]=Просмотр документов
 GenericName[sk]=Prehliadač dokumentov
 GenericName[sl]=Pregledovalnik dokumentov
 GenericName[sr]=Приказивач докумената
 GenericName[sr@ijekavian]=Приказивач докумената
 GenericName[sr@ijekavianlatin]=Prikazivač dokumenata
 GenericName[sr@latin]=Prikazivač dokumenata
 GenericName[sv]=Dokumentvisare
 GenericName[tr]=Belge görüntüleyici
 GenericName[uk]=Переглядач документів
 GenericName[x-test]=xxDocument viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Type=Application
-Exec=kpackagelauncherqml -a org.kde.mobile.okular %u
+Exec=okularkirigami
 Icon=okular
 NoDisplay=true
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Email=mart@kde.org
 X-KDE-PluginInfo-Name=org.kde.mobile.okular
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-Website=http://kde.org
 X-KDE-PluginInfo-Category=Office
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-Plasma-MainScript=ui/main.qml