diff --git a/AppGrid.qml b/AppGrid.qml
index af7b15a..cb57abb 100644
--- a/AppGrid.qml
+++ b/AppGrid.qml
@@ -111,9 +111,11 @@ LauncherPage {
         "be.sncbnmbs.b2cmobapp": qsTr("De Trein"),
         "be.nexuzhealth.mobile.mynexuz": qsTr("Mynexuzhealth"),
         "com.codesynd.cashfree": qsTr("Bonsai"),
+        "be.introlution.myonlinecalendar": qsTr("MijnOnlineAgenda"),
         "com.facebook.lite": qsTr("Facebook"),
         "org.mozilla.fennec_fdroid": qsTr("Browser"),
         "com.google.android.gm" : qsTr("Mail"),
+        "eu.faircode.email" : qsTr("Mail"),
         "com.fsck.k9": qsTr("Mail"),
         "at.bitfire.davdroid": qsTr("Sync"),
         "hideme.android.vpn.noPlayStore": qsTr("VPN"),
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e1f354d..93271ca 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.17" android:versionCode="314" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.18" android:versionCode="315" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/main.qml b/main.qml
index 51893b6..d129a1c 100644
--- a/main.qml
+++ b/main.qml
@@ -1109,6 +1109,11 @@ ApplicationWindow {
         Component.onCompleted: {
             checkCustomParameters()
 
+            if (Universal.theme !== settings.theme) {
+                mainView.switchTheme(settings.theme, firstStart)
+            } else {
+                AN.SystemDispatcher.dispatch("volla.launcher.colorAction", { "value": theme, "updateLockScreen": firstStart})
+            }
             if (settings.firstStart) {
                 console.debug("AppWindow | ", "Will start tutorial")
                 var component = Qt.createComponent("/OnBoarding.qml")
@@ -1125,11 +1130,6 @@ ApplicationWindow {
                 settings.sttChecked = true
                 AN.SystemDispatcher.dispatch("volla.launcher.checkSttAvailability", {})
             }
-            if (Universal.theme !== settings.theme) {
-                mainView.switchTheme(settings.theme, firstStart)
-            } else {
-                AN.SystemDispatcher.dispatch("volla.launcher.colorAction", { "value": theme, "updateLockScreen": firstStart})
-            }
             if (fullscreen) {
                 appWindow.visibility = 5
             }