diff --git a/app/App_Resources/Android/app.gradle b/App_Resources/Android/app.gradle
similarity index 100%
rename from app/App_Resources/Android/app.gradle
rename to App_Resources/Android/app.gradle
diff --git a/app/App_Resources/Android/src/main/AndroidManifest.xml b/App_Resources/Android/src/main/AndroidManifest.xml
similarity index 89%
rename from app/App_Resources/Android/src/main/AndroidManifest.xml
rename to App_Resources/Android/src/main/AndroidManifest.xml
index 76ecbcfa..ce9087eb 100644
--- a/app/App_Resources/Android/src/main/AndroidManifest.xml
+++ b/App_Resources/Android/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
 	<uses-permission android:name="android.permission.INTERNET" tools:node="remove" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
 	<application android:name="com.tns.NativeScriptApplication" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:hardwareAccelerated="true" android:largeHeap="true" android:theme="@style/AppTheme" android:requestLegacyExternalStorage="true">
-		<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:screenOrientation="portrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode" android:theme="@style/LaunchScreenTheme" android:windowSoftInputMode="adjustResize">
+		<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:screenOrientation="userPortrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode" android:theme="@style/LaunchScreenTheme" android:windowSoftInputMode="adjustResize">
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
diff --git a/app/App_Resources/Android/src/main/res/PlayStore-Icon.png b/App_Resources/Android/src/main/res/PlayStore-Icon.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/PlayStore-Icon.png
rename to App_Resources/Android/src/main/res/PlayStore-Icon.png
diff --git a/app/App_Resources/Android/src/main/res/PlayStore-Icon@2x.png b/App_Resources/Android/src/main/res/PlayStore-Icon@2x.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/PlayStore-Icon@2x.png
rename to App_Resources/Android/src/main/res/PlayStore-Icon@2x.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/App_Resources/Android/src/main/res/drawable-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-anydpi-v26/ic_launcher.xml
rename to App_Resources/Android/src/main/res/drawable-anydpi-v26/ic_launcher.xml
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/camera.png b/App_Resources/Android/src/main/res/drawable-hdpi/camera.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/camera.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/camera.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/check.png b/App_Resources/Android/src/main/res/drawable-hdpi/check.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/check.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/check.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/detail.png b/App_Resources/Android/src/main/res/drawable-hdpi/detail.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/detail.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/detail.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher.png b/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/ic_launcher_foreground.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/logo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/photo.png b/App_Resources/Android/src/main/res/drawable-hdpi/photo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/photo.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/photo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/plus.png b/App_Resources/Android/src/main/res/drawable-hdpi/plus.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/plus.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/plus.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-hdpi/share.png b/App_Resources/Android/src/main/res/drawable-hdpi/share.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-hdpi/share.png
rename to App_Resources/Android/src/main/res/drawable-hdpi/share.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/camera.png b/App_Resources/Android/src/main/res/drawable-ldpi/camera.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/camera.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/camera.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/check.png b/App_Resources/Android/src/main/res/drawable-ldpi/check.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/check.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/check.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/detail.png b/App_Resources/Android/src/main/res/drawable-ldpi/detail.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/detail.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/detail.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher.png b/App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/logo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/photo.png b/App_Resources/Android/src/main/res/drawable-ldpi/photo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/photo.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/photo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/plus.png b/App_Resources/Android/src/main/res/drawable-ldpi/plus.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/plus.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/plus.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-ldpi/share.png b/App_Resources/Android/src/main/res/drawable-ldpi/share.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-ldpi/share.png
rename to App_Resources/Android/src/main/res/drawable-ldpi/share.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/camera.png b/App_Resources/Android/src/main/res/drawable-mdpi/camera.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/camera.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/camera.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/check.png b/App_Resources/Android/src/main/res/drawable-mdpi/check.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/check.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/check.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/detail.png b/App_Resources/Android/src/main/res/drawable-mdpi/detail.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/detail.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/detail.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher.png b/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/ic_launcher_foreground.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/logo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/photo.png b/App_Resources/Android/src/main/res/drawable-mdpi/photo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/photo.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/photo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/plus.png b/App_Resources/Android/src/main/res/drawable-mdpi/plus.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/plus.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/plus.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-mdpi/share.png b/App_Resources/Android/src/main/res/drawable-mdpi/share.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-mdpi/share.png
rename to App_Resources/Android/src/main/res/drawable-mdpi/share.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
rename to App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/camera.png b/App_Resources/Android/src/main/res/drawable-xhdpi/camera.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/camera.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/camera.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/check.png b/App_Resources/Android/src/main/res/drawable-xhdpi/check.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/check.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/check.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/detail.png b/App_Resources/Android/src/main/res/drawable-xhdpi/detail.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/detail.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/detail.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/photo.png b/App_Resources/Android/src/main/res/drawable-xhdpi/photo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/photo.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/photo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/plus.png b/App_Resources/Android/src/main/res/drawable-xhdpi/plus.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/plus.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/plus.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xhdpi/share.png b/App_Resources/Android/src/main/res/drawable-xhdpi/share.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xhdpi/share.png
rename to App_Resources/Android/src/main/res/drawable-xhdpi/share.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/camera.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/camera.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/camera.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/camera.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/check.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/check.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/check.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/check.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/detail.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/detail.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/detail.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/detail.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/photo.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/photo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/photo.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/photo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/plus.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/plus.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/plus.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/plus.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxhdpi/share.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/share.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxhdpi/share.png
rename to App_Resources/Android/src/main/res/drawable-xxhdpi/share.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/camera.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/camera.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/camera.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/camera.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/check.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/check.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/check.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/check.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/detail.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/detail.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/detail.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/detail.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/photo.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/photo.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/photo.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/photo.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/plus.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/plus.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/plus.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/plus.png
diff --git a/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/share.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/share.png
similarity index 100%
rename from app/App_Resources/Android/src/main/res/drawable-xxxhdpi/share.png
rename to App_Resources/Android/src/main/res/drawable-xxxhdpi/share.png
diff --git a/app/App_Resources/Android/src/main/res/values-v21/colors.xml b/App_Resources/Android/src/main/res/values-v21/colors.xml
similarity index 95%
rename from app/App_Resources/Android/src/main/res/values-v21/colors.xml
rename to App_Resources/Android/src/main/res/values-v21/colors.xml
index 809add28..1099326c 100644
--- a/app/App_Resources/Android/src/main/res/values-v21/colors.xml
+++ b/App_Resources/Android/src/main/res/values-v21/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="ns_primary">
-		#fafafa
+		#ff5200
 	</color>
 	<color name="ns_primaryDark">
 		#ff5200
diff --git a/app/App_Resources/Android/src/main/res/values-v21/styles.xml b/App_Resources/Android/src/main/res/values-v21/styles.xml
similarity index 100%
rename from app/App_Resources/Android/src/main/res/values-v21/styles.xml
rename to App_Resources/Android/src/main/res/values-v21/styles.xml
diff --git a/app/App_Resources/Android/src/main/res/values-v29/styles.xml b/App_Resources/Android/src/main/res/values-v29/styles.xml
similarity index 100%
rename from app/App_Resources/Android/src/main/res/values-v29/styles.xml
rename to App_Resources/Android/src/main/res/values-v29/styles.xml
diff --git a/app/App_Resources/Android/src/main/res/values/colors.xml b/App_Resources/Android/src/main/res/values/colors.xml
similarity index 95%
rename from app/App_Resources/Android/src/main/res/values/colors.xml
rename to App_Resources/Android/src/main/res/values/colors.xml
index 1067ac38..1099326c 100644
--- a/app/App_Resources/Android/src/main/res/values/colors.xml
+++ b/App_Resources/Android/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="ns_primary">
-		#f1f3f5
+		#ff5200
 	</color>
 	<color name="ns_primaryDark">
 		#ff5200
diff --git a/app/App_Resources/Android/src/main/res/values/strings.xml b/App_Resources/Android/src/main/res/values/strings.xml
similarity index 100%
rename from app/App_Resources/Android/src/main/res/values/strings.xml
rename to App_Resources/Android/src/main/res/values/strings.xml
diff --git a/app/App_Resources/Android/src/main/res/values/styles.xml b/App_Resources/Android/src/main/res/values/styles.xml
similarity index 95%
rename from app/App_Resources/Android/src/main/res/values/styles.xml
rename to App_Resources/Android/src/main/res/values/styles.xml
index c3a0a463..aa8c0094 100644
--- a/app/App_Resources/Android/src/main/res/values/styles.xml
+++ b/App_Resources/Android/src/main/res/values/styles.xml
@@ -57,9 +57,6 @@
 		<item name="contentInsetEnd">
 			0dp
 		</item>
-		<item name="android:divider">
-			#ff0000
-		</item>
 		<item name="android:background">
 			@color/ns_primary
 		</item>
@@ -77,8 +74,10 @@
 		<item name="searchHintIcon">
 			@null
 		</item>
-		<!-- <item name="closeIcon">
-			@null
-		</item> -->
+		<!--
+		<item name="closeIcon">
+		@null
+		</item>
+		-->
 	</style>
 </resources>
diff --git a/app/app.scss b/app/app.scss
index ed3edea0..a867c394 100644
--- a/app/app.scss
+++ b/app/app.scss
@@ -6,7 +6,7 @@ $gray1: #f1f3f5;
 $gray2: #e9ecef;
 $gray3: #dee2e6;
 $gray4: #ced4da;
-$gray5: #adb5bd; // rgb(173,181,189)
+$gray5: #adb5bd;
 $gray6: #868e96;
 $gray7: #495057;
 $gray8: #343a40;
@@ -255,7 +255,7 @@ ActionBar {
   }
   // prettier-ignore
   Label {
-    padding: 0 16 0 0;
+    padding: 2 16 0 0;
     font-size: 16;
     vertical-alignment: center;
     &.bx{
@@ -544,14 +544,13 @@ TextField.combinationToken {
 }
 // -----------------------------
 // MEAL PLANNER
-.mealPlanner {
-  padding: 16 16 128;
+.dayPlan {
+  padding: 0;
   width: 100%;
-  .dayContainer {
-    padding: 8 0;
+  .plansContainer {
+    padding: 8 4;
     color: $gray9;
     &.breakfast {
-      border-radius: 4 4 0 0;
       background: $breakfast;
     }
     &.lunch {
@@ -561,17 +560,16 @@ TextField.combinationToken {
       background: $dinner;
     }
     &.snacks {
-      border-radius: 0 0 4 4;
       background: $snacks;
     }
     .periodLabel {
       text-transform: uppercase;
       vertical-alignment: center;
-      font-size: 16;
+      font-size: 14;
       padding: 0 0 0 16;
     }
     .recipes {
-      margin: 8 8 0;
+      margin: 4 8 4;
       .recipeTitle {
         font-size: 14;
         padding: 6 8;
@@ -591,6 +589,7 @@ TextField.combinationToken {
 // -----------------------------
 // DIALOGS
 .dialogContainer {
+  max-width: 480;
   width: 100%;
   color: $gray9;
   background: $gray1;
@@ -600,6 +599,7 @@ TextField.combinationToken {
     background: $gray9;
   }
   .dialogTitle {
+    line-height: 6;
     padding: 24 24 16;
     font-size: 20;
   }
diff --git a/app/components/About.vue b/app/components/About.vue
index 751c93e8..8051846b 100644
--- a/app/components/About.vue
+++ b/app/components/About.vue
@@ -13,7 +13,7 @@
         <Label class="title orkm" text="About" col="1" />
       </GridLayout>
     </ActionBar>
-    <ScrollView scrollBarIndicatorVisible="false" @scroll="onScroll">
+    <ScrollView scrollBarIndicatorVisible="true" @scroll="onScroll">
       <StackLayout class="main-container">
         <StackLayout
           horizontalAlignment="center"
@@ -64,7 +64,7 @@
             @tap="openURL('https://www.vishnuraghav.com')"
           />
           <Label col="0" class="bx" :text="icon.user" />
-          <Label verticalAlignment="center" col="1" text="Vishnu Raghav" />
+          <Label verticalAlignment="center" col="1" text="Vishnu Raghav B" />
         </GridLayout>
         <GridLayout columns="auto, *" class="option">
           <MDRipple
@@ -90,8 +90,10 @@
 <script>
 import { Application, Utils } from "@nativescript/core"
 import { mapActions, mapState } from "vuex"
+
+import * as utils from "~/shared/utils"
+
 export default {
-  props: ["showDrawer", "title"],
   computed: {
     ...mapState(["icon", "currentComponent"]),
     getVersion() {
@@ -112,6 +114,9 @@ export default {
       this.setCurrentComponentAction("About")
     },
     // HELPERS
+    showDrawer() {
+      utils.showDrawer()
+    },
     onScroll(args) {
       args.scrollY
         ? (this.viewIsScrolled = true)
diff --git a/app/components/App.vue b/app/components/App.vue
index de0edc22..ad57d798 100644
--- a/app/components/App.vue
+++ b/app/components/App.vue
@@ -1,14 +1,16 @@
 <template>
   <Page
     @loaded="onPageLoad"
+    @unloaded="onPageUnload"
     actionBarHidden="true"
     :androidStatusBarBackground="appTheme == 'Light' ? '#f1f3f5' : '#212529'"
   >
     <RadSideDrawer
-      ref="drawer"
       allowEdgeSwipe="true"
-      drawerContentSize="270"
       showOverNavigation="true"
+      ref="drawer"
+      id="sideDrawer"
+      drawerContentSize="270"
       gesturesEnabled="true"
       drawerTransition="SlideInOnTopTransition"
     >
@@ -44,8 +46,9 @@
             <MDRipple
               row="0"
               colSpan="3"
-              @tap="navigateTo(mealPlanner, true, false)"
+              @tap="navigateTo(MealPlanner, true, false)"
             />
+
             <Label col="0" row="0" class="bx" :text="icon.calendar" />
             <Label col="2" row="0" text="Meal Planner" />
           </GridLayout>
@@ -120,21 +123,18 @@
           </GridLayout>
         </StackLayout>
       </GridLayout>
-      <GridLayout ~mainContent rows="*" columns="*">
-        <Frame row="0" col="0" ref="mainFrame" id="main-frame">
-          <!-- Home  -->
-          <EnRecipes
-            ref="enrecipes"
-            :filterFavorites="filterFavorites"
-            :filterTrylater="filterTrylater"
-            :selectedCategory="selectedCategory"
-            :showDrawer="showDrawer"
-            :hijackGlobalBackEvent="hijackGlobalBackEvent"
-            :releaseGlobalBackEvent="releaseGlobalBackEvent"
-            :openAppSettingsPage="openAppSettingsPage"
-          />
-        </Frame>
-      </GridLayout>
+      <Frame ~mainContent id="main-frame">
+        <!-- Home  -->
+        <EnRecipes
+          ref="enrecipes"
+          :filterFavorites="filterFavorites"
+          :filterTrylater="filterTrylater"
+          :selectedCategory="selectedCategory"
+          :closeDrawer="closeDrawer"
+          :hijackGlobalBackEvent="hijackGlobalBackEvent"
+          :releaseGlobalBackEvent="releaseGlobalBackEvent"
+        />
+      </Frame>
     </RadSideDrawer>
   </Page>
 </template>
@@ -153,22 +153,20 @@ import * as Toast from "nativescript-toast"
 import * as application from "tns-core-modules/application"
 import { mapActions, mapState } from "vuex"
 
-import EnRecipes from "./EnRecipes.vue"
-import MealPlanner from "./MealPlanner.vue"
-import Settings from "./Settings.vue"
-import About from "./About.vue"
+import EnRecipes from "./EnRecipes"
+import MealPlanner from "./MealPlanner"
+import Settings from "./Settings"
+import About from "./About"
 
-import PromptDialog from "./modal/PromptDialog.vue"
+import PromptDialog from "./modal/PromptDialog"
 
 export default {
-  components: {
-    EnRecipes,
-  },
   data() {
     return {
       selectedCategory: null,
       filterFavorites: false,
       filterTrylater: false,
+      MealPlanner: MealPlanner,
       topmenu: [
         {
           title: "Home",
@@ -200,15 +198,19 @@ export default {
       ],
       editCategory: false,
       appTheme: "Light",
-      mealPlanner: MealPlanner,
     }
   },
+  components: {
+    EnRecipes,
+    MealPlanner,
+  },
   computed: {
     ...mapState([
       "icon",
       "recipes",
       "categories",
       "yieldUnits",
+      "mealPlans",
       "currentComponent",
     ]),
     categoriesWithRecipes() {
@@ -224,6 +226,7 @@ export default {
       "initializeRecipes",
       "initializeCategories",
       "initializeYieldUnits",
+      "initializeMealPlans",
       "renameCategoryAction",
     ]),
     onPageLoad() {
@@ -235,6 +238,9 @@ export default {
         // window.setNavigationBarColor(new Color("#e0e0e0").android)
       }
     },
+    onPageUnload() {
+      // this.releaseGlobalBackEvent()
+    },
 
     // HELPERS
     toggleCatEdit() {
@@ -268,44 +274,7 @@ export default {
       this.selectedCategory = e.item
       this.closeDrawer()
     },
-    restartApp() {
-      // Code from nativescript-master-technology
-      const mStartActivity = new android.content.Intent(
-        application.android.context,
-        application.android.startActivity.getClass()
-      )
-      const mPendingIntentId = parseInt(Math.random() * 100000, 10)
-      const mPendingIntent = android.app.PendingIntent.getActivity(
-        application.android.context,
-        mPendingIntentId,
-        mStartActivity,
-        android.app.PendingIntent.FLAG_CANCEL_CURRENT
-      )
-      const mgr = application.android.context.getSystemService(
-        android.content.Context.ALARM_SERVICE
-      )
-      mgr.set(
-        android.app.AlarmManager.RTC,
-        java.lang.System.currentTimeMillis() + 100,
-        mPendingIntent
-      )
-      android.os.Process.killProcess(android.os.Process.myPid())
-    },
-    openAppSettingsPage() {
-      const intent = new android.content.Intent(
-        android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-      )
-      intent.addCategory(android.content.Intent.CATEGORY_DEFAULT)
-      intent.setData(
-        android.net.Uri.parse(
-          "package:" + Application.android.context.getPackageName()
-        )
-      )
-      Application.android.foregroundActivity.startActivity(intent)
-    },
-    showDrawer() {
-      this.$refs.drawer.nativeView.showDrawer()
-    },
+
     closeDrawer() {
       this.$refs.drawer.nativeView.closeDrawer()
     },
@@ -358,13 +327,6 @@ export default {
       if (isTrueComponent) {
         this.$navigateTo(to, {
           frame: "main-frame",
-          props: {
-            showDrawer: this.showDrawer,
-            restartApp: this.restartApp,
-            hijackGlobalBackEvent: this.hijackGlobalBackEvent,
-            releaseGlobalBackEvent: this.releaseGlobalBackEvent,
-            openAppSettingsPage: this.openAppSettingsPage,
-          },
           backstackVisible: false,
         })
         this.closeDrawer()
@@ -391,9 +353,10 @@ export default {
     setTimeout((e) => {
       Theme.setMode(Theme[this.appTheme])
     }, 10)
-    this.initializeRecipes()
-    this.initializeCategories()
-    this.initializeYieldUnits()
+    if (!this.recipes.length) this.initializeRecipes()
+    if (!this.categories.length) this.initializeCategories()
+    if (!this.yieldUnits.length) this.initializeYieldUnits()
+    if (!this.mealPlans.length) this.initializeMealPlans()
   },
 }
 </script>
diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue
index 5db988ff..f4c44f5a 100644
--- a/app/components/EditRecipe.vue
+++ b/app/components/EditRecipe.vue
@@ -13,20 +13,20 @@
         <Label class="title orkm" :text="title" col="1" />
         <MDButton
           variant="text"
-          v-if="hasChanges && !imageLoading"
+          v-if="hasChanges && !saving"
           class="bx"
           :text="icon.save"
           col="2"
           @tap="saveOperation"
         />
-        <MDActivityIndicator col="2" v-if="imageLoading" :busy="imageLoading" />
+        <MDActivityIndicator col="2" v-if="saving" :busy="saving" />
       </GridLayout>
     </ActionBar>
     <ScrollView
       width="100%"
       height="100%"
       @scroll="onScroll"
-      scrollBarIndicatorVisible="false"
+      scrollBarIndicatorVisible="true"
     >
       <StackLayout width="100%" padding="0 0 128">
         <AbsoluteLayout>
@@ -257,7 +257,7 @@
           <StackLayout class="hr" margin="24 16"></StackLayout>
         </StackLayout>
 
-        <StackLayout margin="0 16 24" v-if="recipes.length">
+        <StackLayout margin="0 16 24">
           <Label text="Combinations" class="sectionTitle" />
           <GridLayout
             columns="*,8,auto"
@@ -316,14 +316,10 @@ import ConfirmDialog from "./modal/ConfirmDialog.vue"
 import PromptDialog from "./modal/PromptDialog.vue"
 import ListPicker from "./modal/ListPicker.vue"
 
+import * as utils from "~/shared/utils"
+
 export default {
-  props: [
-    "recipeID",
-    "selectedCategory",
-    "openAppSettingsPage",
-    "filterFavorites",
-    "filterTrylater",
-  ],
+  props: ["recipeID", "selectedCategory", "filterFavorites", "filterTrylater"],
   data() {
     return {
       title: "New recipe",
@@ -343,7 +339,7 @@ export default {
         references: [],
         combinations: [],
         isFavorite: false,
-        tried: false,
+        tried: true,
         lastTried: null,
         lastModified: null,
       },
@@ -352,7 +348,7 @@ export default {
       modalOpen: false,
       newRecipeID: null,
       showFab: false,
-      imageLoading: false,
+      saving: false,
       cacheImagePath: null,
       unSyncCombinations: [],
     }
@@ -680,7 +676,7 @@ export default {
       } else {
         Permissions.check("photo").then((res) => {
           res[0] !== "authorized"
-            ? confirmation().then((e) => e && this.openAppSettingsPage())
+            ? confirmation().then((e) => e && utils.openAppSettingsPage())
             : action()
         })
       }
@@ -771,7 +767,6 @@ export default {
         ...this.recipeContent.combinations,
         this.recipeContent.id,
       ]
-      console.log(existingCombinations)
       let filteredRecipes = this.recipes.filter(
         (e) => !existingCombinations.includes(e.id)
       )
@@ -838,7 +833,7 @@ export default {
       clearEmpty("references")
     },
     saveOperation() {
-      this.imageLoading = true
+      this.saving = true
       this.clearEmptyFields()
       this.recipeContent.lastModified = new Date()
       if (this.cacheImagePath) {
@@ -884,7 +879,7 @@ export default {
         })
       }
       setTimeout(() => {
-        this.imageLoading = false
+        this.saving = false
       }, 100)
       this.$navigateBack()
     },
diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue
index 65ef3c79..015bc741 100644
--- a/app/components/EnRecipes.vue
+++ b/app/components/EnRecipes.vue
@@ -237,15 +237,16 @@ import ViewRecipe from "./ViewRecipe.vue"
 import ActionDialog from "./modal/ActionDialog.vue"
 import ConfirmDialog from "./modal/ConfirmDialog.vue"
 
+import * as utils from "~/shared/utils"
+
 export default {
   props: [
     "filterFavorites",
     "filterTrylater",
+    "closeDrawer",
     "selectedCategory",
-    "showDrawer",
     "hijackGlobalBackEvent",
     "releaseGlobalBackEvent",
-    "openAppSettingsPage",
   ],
   components: {
     EditRecipe,
@@ -301,6 +302,9 @@ export default {
     },
 
     // HELPERS
+    showDrawer() {
+      utils.showDrawer()
+    },
     openSearch() {
       this.showSearch = true
       this.showFAB = false
@@ -355,6 +359,7 @@ export default {
     },
     searchBackEvent(args) {
       args.cancel = true
+      this.closeDrawer()
       this.closeSearch()
     },
     addRecipe() {
@@ -363,7 +368,6 @@ export default {
       this.$navigateTo(EditRecipe, {
         props: {
           selectedCategory: this.selectedCategory,
-          openAppSettingsPage: this.openAppSettingsPage,
           filterFavorites: this.filterFavorites,
         },
       })
@@ -371,16 +375,9 @@ export default {
     viewRecipe(recipeID) {
       this.showFAB = false
       this.$navigateTo(ViewRecipe, {
-        // transition: {
-        //   name: "fade",
-        //   duration: 200,
-        //   curve: "easeOut",
-        // },
         props: {
           filterTrylater: this.filterTrylater,
           recipeID,
-          hijackGlobalBackEvent: this.hijackGlobalBackEvent,
-          releaseGlobalBackEvent: this.releaseGlobalBackEvent,
         },
       })
     },
diff --git a/app/components/MealPlanner.vue b/app/components/MealPlanner.vue
index 53f54446..e6cb5b87 100644
--- a/app/components/MealPlanner.vue
+++ b/app/components/MealPlanner.vue
@@ -1,7 +1,7 @@
 <template>
   <Page @loaded="onPageLoad">
     <ActionBar :flat="viewIsScrolled ? false : true">
-      <GridLayout rows="*" columns="auto, *">
+      <GridLayout rows="*" columns="auto, *, auto">
         <MDButton
           class="bx left"
           variant="text"
@@ -11,61 +11,97 @@
           col="0"
         />
         <Label class="title orkm" text="Meal Planner" col="1" />
+        <MDButton
+          class="bx left"
+          variant="text"
+          :text="icon.today"
+          automationText="today"
+          @tap="goToToday"
+          col="2"
+        />
       </GridLayout>
     </ActionBar>
-    <ScrollView
-      width="100%"
-      height="100%"
-      scrollBarIndicatorVisible="false"
-      @scroll="onScroll"
-    >
-      <StackLayout class="mealPlanner">
-        <RadCalendar ref="calendar" @dateSelected="onDateSelected">
-        </RadCalendar>
-        <StackLayout
-          v-for="(meal, indexB) in mealTimes"
-          :key="'meal' + indexB"
-          class="dayContainer"
-          :class="meal"
-        >
-          <GridLayout columns="*, auto" class="header">
-            <Label col="0" class="periodLabel orkm" :text="meal" />
-            <MDButton
-              col="1"
-              variant="text"
-              class="bx addMeal"
-              :text="icon.plus"
-            />
-          </GridLayout>
-          <GridLayout class="recipes" columns="*, auto">
-            <MDRipple />
-            <Label
-              verticalAlignment="center"
-              class="recipeTitle"
-              col="0"
-              text="getRecipeTitle(recipeID, indexA, meal)"
-              textWrap="true"
-            />
-            <MDButton
-              variant="text"
-              col="1"
-              class="bx closeBtn"
-              :text="icon.close"
-            />
-          </GridLayout>
+    <GridLayout rows="280, *">
+      <RadCalendar
+        class="orkm"
+        row="0"
+        ref="calendar"
+        locale="en-US"
+        @loaded="onCalendarLoad"
+        @dateSelected="onDateSelected"
+        :viewMode="viewMode"
+        :transitionMode="transitionMode"
+        :selectionMode="selectionMode"
+        :eventsViewMode="eventsViewMode"
+        :eventSource="getMealPlans"
+      ></RadCalendar>
+      <ScrollView
+        row="1"
+        width="100%"
+        height="100%"
+        scrollBarIndicatorVisible="true"
+      >
+        <StackLayout class="dayPlan">
+          <StackLayout
+            v-for="(mealType, index) in mealTimes"
+            :key="'mealType' + index"
+            class="plansContainer"
+            :class="mealType"
+          >
+            <GridLayout columns="*, auto" class="header">
+              <Label col="0" class="periodLabel orkm" :text="mealType" />
+              <MDButton
+                col="1"
+                variant="text"
+                class="bx addMeal"
+                :text="icon.plus"
+                @tap="addRecipe(mealType)"
+              />
+            </GridLayout>
+            <GridLayout
+              class="recipes"
+              columns="*, auto"
+              v-for="(recipeID, index) in getRecipes[mealType]"
+              :key="mealType + index"
+            >
+              <MDRipple @tap="viewRecipe(recipeID)" />
+              <Label
+                verticalAlignment="center"
+                class="recipeTitle"
+                col="0"
+                :text="getRecipeTitle(recipeID)"
+                textWrap="true"
+              />
+              <MDButton
+                variant="text"
+                col="1"
+                class="bx closeBtn"
+                :text="icon.close"
+                @tap="removeRecipe(mealType, recipeID)"
+              />
+            </GridLayout>
+          </StackLayout>
         </StackLayout>
-      </StackLayout>
-    </ScrollView>
-    <!-- <GridLayout rows="*, auto, *, 88" columns="*" class="emptyStateContainer">
-      <StackLayout row="1" class="emptyState">
-        <Label class="title orkm" text="Coming soon!" textWrap="true" />
-      </StackLayout>
-    </GridLayout> -->
+      </ScrollView>
+    </GridLayout>
   </Page>
 </template>
 
 <script>
-import { ApplicationSettings, Color } from "@nativescript/core"
+import { ApplicationSettings, Color, Page } from "@nativescript/core"
+import {
+  CalendarViewMode,
+  CalendarTransitionMode,
+  CalendarSelectionMode,
+  CalendarMonthViewStyle,
+  CalendarSelectionShape,
+  DayCellStyle,
+  CalendarFontStyle,
+  CalendarCellAlignment,
+  CellStyle,
+  CalendarEventsViewMode,
+  CalendarEvent,
+} from "nativescript-ui-calendar"
 import { mapState, mapActions } from "vuex"
 
 import ViewRecipe from "./ViewRecipe.vue"
@@ -73,26 +109,224 @@ import ViewRecipe from "./ViewRecipe.vue"
 import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue"
 import ConfirmDialog from "./modal/ConfirmDialog.vue"
 
+import * as utils from "~/shared/utils"
+
 export default {
-  props: ["showDrawer", "hijackGlobalBackEvent", "releaseGlobalBackEvent"],
   data() {
     return {
       viewIsScrolled: false,
       appTheme: "Light",
       mealTimes: ["breakfast", "lunch", "dinner", "snacks"],
+      eventList: [],
+      selectedDayMealPlans: [],
+      viewMode: CalendarViewMode.Month,
+      transitionMode: CalendarTransitionMode.Slide,
+      selectionMode: CalendarSelectionMode.Single,
+      eventsViewMode: CalendarEventsViewMode.None,
+      color: {
+        white: new Color("#ffffff"),
+        gray1: new Color("#f1f3f5"),
+        gray2: new Color("#e9ecef"),
+        gray3: new Color("#dee2e6"),
+        gray4: new Color("#ced4da"),
+        gray5: new Color("#adb5bd"),
+        gray6: new Color("#868e96"),
+        gray7: new Color("#495057"),
+        gray8: new Color("#343a40"),
+        gray9: new Color("#212529"),
+        black: new Color("#111111"),
+        orange: new Color("#ff5200"),
+        breakfast: "#ffb180",
+        lunch: "#ceff80",
+        dinner: "#80ceff",
+        snacks: "#b180ff",
+      },
+      appFontRegular: "Orkney-Regular",
+      appFontMedium: "Orkney-Medium",
+      selectedDate: null,
     }
   },
   computed: {
-    ...mapState(["icon", "recipes"]),
+    ...mapState(["icon", "recipes", "mealPlans"]),
+    isLightMode() {
+      return this.appTheme === "Light"
+    },
+    monthViewStyle() {
+      const monthViewStyle = new CalendarMonthViewStyle()
+      monthViewStyle.backgroundColor = this.isLightMode
+        ? this.color.gray1
+        : this.color.gray9
+      monthViewStyle.showTitle = true
+      monthViewStyle.showWeekNumbers = false
+      monthViewStyle.showDayNames = true
+
+      const titleCellStyle = new DayCellStyle()
+      titleCellStyle.cellBackgroundColor = this.isLightMode
+        ? this.color.gray2
+        : this.color.black
+      titleCellStyle.cellBorderWidth = 1
+      titleCellStyle.cellBorderColor = this.isLightMode
+        ? this.color.gray2
+        : this.color.black
+      titleCellStyle.cellTextSize = 16
+      titleCellStyle.cellTextColor = this.isLightMode
+        ? this.color.gray9
+        : this.color.gray1
+      titleCellStyle.cellTextFontName = this.appFontMedium
+      monthViewStyle.titleCellStyle = titleCellStyle
+
+      const dayNameCellStyle = new CellStyle()
+      dayNameCellStyle.cellBackgroundColor = this.isLightMode
+        ? this.color.gray2
+        : this.color.black
+      dayNameCellStyle.cellTextColor = this.isLightMode
+        ? this.color.gray9
+        : this.color.gray1
+      dayNameCellStyle.cellBorderWidth = 1
+      dayNameCellStyle.cellBorderColor = this.isLightMode
+        ? this.color.gray2
+        : this.color.black
+      dayNameCellStyle.cellTextSize = 12
+      dayNameCellStyle.cellAlignment = CalendarCellAlignment.Center
+      dayNameCellStyle.cellTextFontName = this.appFontMedium
+      monthViewStyle.dayNameCellStyle = dayNameCellStyle
+
+      const dayCellStyle = new DayCellStyle()
+      dayCellStyle.showEventsText = false
+      dayCellStyle.eventTextColor = this.color.orange
+      dayCellStyle.eventFontName = this.appFontRegular
+      dayCellStyle.eventFontStyle = CalendarFontStyle.Bold
+      dayCellStyle.eventTextSize = 8
+      dayCellStyle.cellTextSize = 16
+      dayCellStyle.cellTextColor = this.isLightMode
+        ? this.color.gray9
+        : this.color.gray2
+      dayCellStyle.cellAlignment = CalendarCellAlignment.Bottom
+      dayCellStyle.cellBackgroundColor = this.isLightMode
+        ? this.color.gray1
+        : this.color.gray9
+      dayCellStyle.cellTextFontName = this.appFontRegular
+      dayCellStyle.cellBorderWidth = 1
+      dayCellStyle.cellBorderColor = this.isLightMode
+        ? this.color.gray2
+        : this.color.black
+      monthViewStyle.dayCellStyle = dayCellStyle
+
+      const todayCellStyle = new DayCellStyle()
+      todayCellStyle.cellBackgroundColor = this.isLightMode
+        ? this.color.gray1
+        : this.color.gray9
+      todayCellStyle.cellTextColor = this.color.orange
+      todayCellStyle.cellBorderWidth = 1
+      todayCellStyle.cellTextFontName = this.appFontMedium
+      todayCellStyle.cellTextFontStyle = CalendarFontStyle.Bold
+      todayCellStyle.cellTextSize = 16
+      todayCellStyle.cellAlignment = CalendarCellAlignment.Bottom
+      todayCellStyle.cellBorderColor = this.isLightMode
+        ? this.color.gray2
+        : this.color.black
+      monthViewStyle.todayCellStyle = todayCellStyle
+
+      const selectedCellStyle = new DayCellStyle()
+      selectedCellStyle.eventTextSize = 1
+      selectedCellStyle.cellAlignment = CalendarCellAlignment.Bottom
+      selectedCellStyle.cellBackgroundColor = this.isLightMode
+        ? this.color.white
+        : this.color.gray8
+      selectedCellStyle.cellBorderWidth = 1
+      selectedCellStyle.cellBorderColor = this.color.orange
+      selectedCellStyle.cellTextColor = this.isLightMode
+        ? this.color.gray9
+        : this.color.gray1
+      selectedCellStyle.cellTextFontName = this.appFontMedium
+      selectedCellStyle.cellTextFontStyle = CalendarFontStyle.Bold
+      selectedCellStyle.cellTextSize = 16
+      monthViewStyle.selectedDayCellStyle = selectedCellStyle
+
+      return monthViewStyle
+    },
+    getRecipes() {
+      if (this.selectedDayMealPlans.length) {
+        return this.selectedDayMealPlans.reduce((acc, e) => {
+          switch (e.startDate.getHours()) {
+            case 0: //breakfast
+              acc["breakfast"] = [...(acc["breakfast"] || []), e.title]
+              break
+            case 5: //lunch
+              acc["lunch"] = [...(acc["lunch"] || []), e.title]
+              break
+            case 10: //dinner
+              acc["dinner"] = [...(acc["dinner"] || []), e.title]
+              break
+            case 15: //snacks
+              acc["snacks"] = [...(acc["snacks"] || []), e.title]
+              break
+            default:
+              break
+          }
+          return acc
+        }, {})
+      } else return 0
+    },
+    getMealPlans() {
+      const getDate = (date) => {
+        let d = new Date(date)
+        let result = new Date(
+          d.getFullYear(),
+          d.getMonth(),
+          d.getDate(),
+          d.getHours()
+        )
+        return result
+      }
+      let events = []
+      this.mealPlans.forEach((plan) => {
+        let e = new CalendarEvent(
+          plan.title,
+          getDate(plan.startDate),
+          getDate(plan.endDate),
+          false,
+          new Color(plan.eventColor)
+        )
+        events = [...events, e]
+      })
+      return events
+    },
   },
   methods: {
-    ...mapActions(["setCurrentComponentAction"]),
-    onPageLoad() {
+    ...mapActions([
+      "setCurrentComponentAction",
+      "initializeMealPlans",
+      "addMealPlanAction",
+      "deleteMealPlanAction",
+    ]),
+    onPageLoad(args) {
       this.setCurrentComponentAction("MealPlanner")
-      this.releaseGlobalBackEvent()
+    },
+    onCalendarLoad(args) {
+      args.object.monthViewStyle = this.monthViewStyle
+      args.object.android
+        .getGestureManager()
+        .setDoubleTapToChangeDisplayMode(false)
+      args.object.android
+        .getGestureManager()
+        .setPinchCloseToChangeDisplayMode(false)
+      if (args.object.selectedDate == null)
+        args.object.selectedDate = new Date()
+      if (args.object.nativeView.getEventAdapter()) {
+        args.object.nativeView
+          .getEventAdapter()
+          .getRenderer()
+          .setEventRenderMode(
+            com.telerik.widget.calendar.events.EventRenderMode.Shape
+          )
+      }
     },
 
     // HELPERS
+    showDrawer() {
+      utils.showDrawer()
+    },
     onScroll(args) {
       args.scrollY
         ? (this.viewIsScrolled = true)
@@ -109,58 +343,134 @@ export default {
       return date.toDateString().slice(0, -5)
     },
     getRecipeTitle(id) {
-      return this.recipes.filter((e) => e.id === id)[0].title
+      let recipe = this.recipes.filter((e) => e.id === id)[0]
+      return recipe ? recipe.title : "[Recipe not found]"
     },
 
     // NAVIGATION HANDLERS
     viewRecipe(recipeID) {
-      this.$navigateTo(ViewRecipe, {
-        props: {
-          filterTrylater: true,
-          recipeID,
-          hijackGlobalBackEvent: this.hijackGlobalBackEvent,
-          releaseGlobalBackEvent: this.releaseGlobalBackEvent,
-        },
-      })
+      let recipe = this.recipes.filter((e) => e.id === recipeID)[0]
+      if (recipe) {
+        this.$navigateTo(ViewRecipe, {
+          props: {
+            filterTrylater: true,
+            recipeID,
+          },
+        })
+      }
     },
 
     // DATA HANDLERS
-    addRecipe(indexA, meal) {
-      let existingRecipes = [...this.meals[indexA][meal]]
-      let filteredRecipes = this.recipes.filter(
-        (e) => !existingRecipes.includes(e.id)
+    addRecipe(mealType) {
+      let filteredRecipes = this.recipes.filter((e) =>
+        this.getRecipes[mealType]
+          ? !this.getRecipes[mealType].includes(e.id)
+          : true
       )
       this.$showModal(ActionDialogWithSearch, {
         props: {
           title: "Select a recipe",
           recipes: filteredRecipes,
         },
-      }).then((res) => {
-        res && this.meals[indexA][meal].push(res)
+      }).then((recipeID) => {
+        recipeID && this.newEvent(recipeID, mealType)
       })
     },
-    removeRecipeConfirm() {
+    removeRecipeConfirm(mealType) {
       return this.$showModal(ConfirmDialog, {
         props: {
-          title: `Remove recipe`,
+          title: `Remove recipe from ${mealType}`,
           cancelButtonText: "CANCEL",
           okButtonText: "REMOVE",
         },
       })
     },
-    removeRecipe(indexA, meal, indexC) {
-      this.removeRecipeConfirm().then((res) => {
-        res && this.meals[indexA][meal].splice(indexC, 1)
+    removeRecipe(mealType, recipeID) {
+      let startHour = {
+        breakfast: 0,
+        lunch: 5,
+        dinner: 10,
+        snacks: 15,
+      }
+      this.removeRecipeConfirm(mealType).then((res) => {
+        if (res) {
+          let actualMealPlan = this.selectedDayMealPlans.filter(
+            (e) =>
+              e.startDate.getHours() === startHour[mealType] &&
+              e.title === recipeID
+          )[0]
+          let mealPlan = {
+            title: actualMealPlan.title,
+            startDate: actualMealPlan.startDate,
+          }
+          this.deleteMealPlanAction(mealPlan)
+          this.updateSelectedDatePlans()
+        }
       })
     },
 
     // CALENDAR
-    onDateSelected() {
-      console.log("hello")
+    updateSelectedDatePlans() {
+      let date = new Date(this.selectedDate)
+      setTimeout(() => {
+        this.selectedDayMealPlans = this.$refs.calendar.nativeView.getEventsForDate(
+          date
+        )
+      }, 100)
+    },
+    onDateSelected(args) {
+      this.selectedDate = args.date
+      this.selectedDayMealPlans = args.object.getEventsForDate(args.date)
+    },
+    newEvent(recipeID, mealType) {
+      let date = new Date(this.selectedDate)
+      const selectedDate = () => {
+        return {
+          y: date.getFullYear(),
+          m: date.getMonth(),
+          d: date.getDate(),
+        }
+      }
+      let { y, m, d } = selectedDate()
+      let mealTime = {
+        breakfast: {
+          start: new Date(y, m, d, 0),
+          end: new Date(y, m, d, 4),
+        },
+        lunch: {
+          start: new Date(y, m, d, 5),
+          end: new Date(y, m, d, 9),
+        },
+        dinner: {
+          start: new Date(y, m, d, 10),
+          end: new Date(y, m, d, 14),
+        },
+        snacks: {
+          start: new Date(y, m, d, 15),
+          end: new Date(y, m, d, 19),
+        },
+      }
+      let event = new CalendarEvent(
+        recipeID,
+        mealTime[mealType].start,
+        mealTime[mealType].end,
+        false,
+        new Color(this.color[mealType])
+      )
+      this.addMealPlanAction({ event, eventColor: this.color[mealType] })
+      this.updateSelectedDatePlans()
+    },
+    goToToday() {
+      const date = new Date()
+      this.$refs.calendar.goToDate(date)
+      this.$refs.calendar.nativeView.selectedDate = date
     },
   },
   created() {
     this.appTheme = ApplicationSettings.getString("appTheme", "Light")
+    let d = new Date()
+    d.setHours(0, 0, 0)
+    this.selectedDate = d
   },
 }
 </script>
diff --git a/app/components/Settings.vue b/app/components/Settings.vue
index 67c54f9a..c1105d4c 100644
--- a/app/components/Settings.vue
+++ b/app/components/Settings.vue
@@ -13,7 +13,7 @@
         <Label class="title orkm" text="Settings" col="1" />
       </GridLayout>
     </ActionBar>
-    <ScrollView scrollBarIndicatorVisible="false" @scroll="onScroll">
+    <ScrollView scrollBarIndicatorVisible="true" @scroll="onScroll">
       <StackLayout class="main-container">
         <Label text="Interface" class="group-header orkm" />
         <GridLayout columns="auto, *" class="option">
@@ -26,7 +26,7 @@
           />
           <StackLayout col="1">
             <Label text="Theme" />
-            <Label :text="appTheme" class="info" textWrap="true" />
+            <Label :text="appTheme" class="info" />
           </StackLayout>
         </GridLayout>
         <StackLayout class="hr m-10"></StackLayout>
@@ -37,11 +37,13 @@
           <Label col="0" class="bx" :text="icon.export" />
           <StackLayout col="1">
             <Label text="Export a full backup" />
-            <GridLayout
-              class="progressContainer"
-              v-if="backupInProgress"
-              columns="*, 64"
-            >
+            <Label
+              v-if="!backupInProgress"
+              text="Generates a zip file that contains all your data. This file can be imported back."
+              class="info"
+              textWrap="true"
+            />
+            <GridLayout class="progressContainer" v-else columns="*, 64">
               <MDProgress
                 col="0"
                 :value="backupProgress"
@@ -49,12 +51,6 @@
               ></MDProgress>
               <Label col="1" :text="`  ${backupProgress}%`" />
             </GridLayout>
-            <Label
-              v-else
-              text="Generates a zip file that contains all your data. This file can be imported back."
-              class="info"
-              textWrap="true"
-            />
           </StackLayout>
         </GridLayout>
         <GridLayout columns="auto, *" class="option"
@@ -95,13 +91,9 @@ import { mapState, mapActions } from "vuex"
 import ActionDialog from "./modal/ActionDialog.vue"
 import ConfirmDialog from "./modal/ConfirmDialog.vue"
 
+import * as utils from "~/shared/utils"
+
 export default {
-  props: [
-    "showDrawer",
-    "restartApp",
-    "releaseGlobalBackEvent",
-    "openAppSettingsPage",
-  ],
   data() {
     return {
       viewIsScrolled: false,
@@ -116,6 +108,7 @@ export default {
       "recipes",
       "userCategories",
       "userYieldUnits",
+      "mealPlans",
       "currentComponent",
     ]),
   },
@@ -125,13 +118,15 @@ export default {
       "importCategoriesAction",
       "importYieldUnitsAction",
       "importRecipesAction",
+      "importMealPlansAction",
     ]),
     onPageLoad() {
       this.setCurrentComponentAction("Settings")
-      this.releaseGlobalBackEvent()
     },
-
     // HELPERS
+    showDrawer() {
+      utils.showDrawer()
+    },
     onScroll(args) {
       args.scrollY
         ? (this.viewIsScrolled = true)
@@ -160,7 +155,7 @@ export default {
             if (result) {
               this.appTheme = action
               ApplicationSettings.setString("appTheme", action)
-              setTimeout((e) => this.restartApp(), 250)
+              setTimeout((e) => utils.restartApp(), 250)
             }
           })
         }
@@ -209,11 +204,6 @@ export default {
         archive: destPath,
         onProgress: (progress) => {
           this.backupProgress = progress
-          if (progress == 100) {
-            setTimeout((e) => {
-              this.backupInProgress = false
-            }, 2000)
-          }
         },
       }).then((success) => {
         Toast.makeText(
@@ -225,8 +215,8 @@ export default {
     },
     exportFiles(option) {
       const folder = path.join(knownFolders.documents().path, "EnRecipes")
-      const EnRecipesFile = File.fromPath(path.join(folder, "EnRecipes.json"))
-      let userCategoriesFile, userYieldUnitsFile
+      const EnRecipesFile = File.fromPath(path.join(folder, "recipes.json"))
+      let userCategoriesFile, userYieldUnitsFile, mealPlansFile
       if (this.userCategories.length) {
         userCategoriesFile = File.fromPath(
           path.join(folder, "userCategories.json")
@@ -237,6 +227,9 @@ export default {
           path.join(folder, "userYieldUnits.json")
         )
       }
+      if (this.mealPlans.length) {
+        mealPlansFile = File.fromPath(path.join(folder, "mealPlans.json"))
+      }
       switch (option) {
         case "create":
           this.writeDataToFile(EnRecipesFile, this.recipes)
@@ -244,11 +237,14 @@ export default {
             this.writeDataToFile(userCategoriesFile, this.userCategories)
           this.userYieldUnits.length &&
             this.writeDataToFile(userYieldUnitsFile, this.userYieldUnits)
+          this.mealPlans.length &&
+            this.writeDataToFile(mealPlansFile, this.mealPlans)
           break
         case "delete":
           EnRecipesFile.remove()
           this.userCategories.length && userCategoriesFile.remove()
           this.userYieldUnits.length && userYieldUnitsFile.remove()
+          this.mealPlans.length && mealPlansFile.remove()
           break
         default:
           break
@@ -290,6 +286,9 @@ export default {
         case "userYieldUnitsDB":
           this.importYieldUnitsAction(data)
           break
+        case "mealPlansDB":
+          this.importMealPlansAction(data)
+          break
         default:
           break
       }
@@ -312,9 +311,10 @@ export default {
         overwrite: true,
       }).then((extractedFolderPath) => {
         let cacheFolderPath = extractedFolderPath + "/EnRecipes"
-        const EnRecipesFilePath = cacheFolderPath + "/EnRecipes.json"
+        const EnRecipesFilePath = cacheFolderPath + "/recipes.json"
         const userCategoriesFilePath = cacheFolderPath + "/userCategories.json"
         const userYieldUnitsFilePath = cacheFolderPath + "/userYieldUnits.json"
+        const mealPlansFilePath = cacheFolderPath + "/mealPlans.json"
         if (Folder.exists(cacheFolderPath)) {
           this.isFileDataValid([
             {
@@ -324,6 +324,7 @@ export default {
             },
             { zipPath, path: userCategoriesFilePath, db: "userCategoriesDB" },
             { zipPath, path: userYieldUnitsFilePath, db: "userYieldUnitsDB" },
+            { zipPath, path: mealPlansFilePath, db: "mealPlansDB" },
           ])
         } else {
           Folder.fromPath(extractedFolderPath).remove()
@@ -368,7 +369,7 @@ export default {
           let status = res[Object.keys(res)[0]]
           if (status !== "authorized") {
             confirmation(description).then((e) => {
-              e && this.openAppSettingsPage()
+              e && utils.openAppSettingsPage()
             })
           } else action()
         })
@@ -385,7 +386,7 @@ export default {
       })
     },
   },
-  created() {
+  mounted() {
     this.appTheme = ApplicationSettings.getString("appTheme", "Light")
   },
 }
diff --git a/app/components/ViewRecipe.vue b/app/components/ViewRecipe.vue
index 96f1c3b0..07925de6 100644
--- a/app/components/ViewRecipe.vue
+++ b/app/components/ViewRecipe.vue
@@ -66,7 +66,7 @@
         class="viewRecipe"
       >
         <TabViewItem title="Overview">
-          <ScrollView scrollBarIndicatorVisible="false">
+          <ScrollView scrollBarIndicatorVisible="true">
             <StackLayout>
               <StackLayout
                 width="100%"
@@ -221,7 +221,7 @@
           </ScrollView>
         </TabViewItem>
         <TabViewItem title="Ingredients">
-          <ScrollView scrollBarIndicatorVisible="false">
+          <ScrollView scrollBarIndicatorVisible="true">
             <GridLayout
               v-if="!recipe.ingredients.length"
               rows="*, auto, *, 88"
@@ -265,7 +265,6 @@
                 :key="index"
               >
                 <check-box
-                  v-if="filterTrylater"
                   class="ingredient-check"
                   checkPadding="16"
                   fillColor="#ff5200"
@@ -279,26 +278,12 @@
                     }`
                   "
                 />
-                <Label
-                  v-else
-                  class="ingredient"
-                  textWrap="true"
-                  :text="
-                    `${
-                      roundedQuantity(item.quantity)
-                        ? roundedQuantity(item.quantity) + ' '
-                        : ''
-                    }${roundedQuantity(item.quantity) ? item.unit + ' ' : ''}${
-                      item.item
-                    }`
-                  "
-                />
               </StackLayout>
             </StackLayout>
           </ScrollView>
         </TabViewItem>
         <TabViewItem title="Instructions">
-          <ScrollView scrollBarIndicatorVisible="false">
+          <ScrollView scrollBarIndicatorVisible="true">
             <GridLayout
               v-if="!recipe.instructions.length"
               rows="*, auto, *, 88"
@@ -343,7 +328,7 @@
           </ScrollView>
         </TabViewItem>
         <TabViewItem title="Notes">
-          <ScrollView scrollBarIndicatorVisible="false">
+          <ScrollView scrollBarIndicatorVisible="true">
             <GridLayout
               v-if="!recipe.notes.length"
               rows="*, auto, *, 88"
@@ -385,7 +370,7 @@
           </ScrollView>
         </TabViewItem>
         <TabViewItem title="References">
-          <ScrollView scrollBarIndicatorVisible="false">
+          <ScrollView scrollBarIndicatorVisible="true">
             <GridLayout
               v-if="!recipe.references.length"
               rows="*, auto, *, 88"
@@ -438,7 +423,7 @@
           </ScrollView>
         </TabViewItem>
         <TabViewItem title="Combinations">
-          <ScrollView scrollBarIndicatorVisible="false">
+          <ScrollView scrollBarIndicatorVisible="true">
             <GridLayout
               v-if="!recipe.combinations.length"
               rows="*, auto, *, 88"
@@ -523,13 +508,7 @@ import ShareChooser from "./modal/ShareChooser.vue"
 let feedback = new Feedback()
 
 export default {
-  props: [
-    "filterTrylater",
-    "recipeID",
-    "recipeIndex",
-    "hijackGlobalBackEvent",
-    "releaseGlobalBackEvent",
-  ],
+  props: ["filterTrylater", "recipeID"],
   data() {
     return {
       busy: false,
@@ -560,7 +539,6 @@ export default {
       "setRecipeAsTriedAction",
     ]),
     onPageLoad() {
-      this.releaseGlobalBackEvent()
       this.busy = false
       setTimeout((e) => {
         this.setCurrentComponentAction("ViewRecipe")
diff --git a/app/components/modal/ActionDialogWithSearch.vue b/app/components/modal/ActionDialogWithSearch.vue
index 39a6042e..53c0f484 100644
--- a/app/components/modal/ActionDialogWithSearch.vue
+++ b/app/components/modal/ActionDialogWithSearch.vue
@@ -2,7 +2,10 @@
   <Page>
     <StackLayout class="dialogContainer" :class="appTheme">
       <Label class="dialogTitle orkm" :text="title" />
-      <StackLayout padding="0 24 24">
+      <StackLayout
+        v-if="filteredRecipes.length || searchTerm"
+        padding="0 24 24"
+      >
         <TextField hint="Search" v-model="searchTerm" />
       </StackLayout>
       <ScrollView width="100%" :height="height ? height : screenHeight - 320">
@@ -18,11 +21,11 @@
             @tap="tapAction(recipe)"
           />
           <Label
-            padding="0 24"
+            padding="24"
             lineHeight="6"
             v-if="!filteredRecipes.length"
-            text="Nothing here! Add some recipes that goes well with this and try again."
-            horizontalAlignment="center"
+            text="Nothing here! Add some recipes and try again."
+            textAlignment="center"
             textWrap="true"
           />
         </StackLayout>
diff --git a/app/components/modal/ConfirmDialog.vue b/app/components/modal/ConfirmDialog.vue
index bc02375e..f5180b16 100644
--- a/app/components/modal/ConfirmDialog.vue
+++ b/app/components/modal/ConfirmDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <Page>
     <StackLayout class="dialogContainer" :class="appTheme">
-      <Label class="dialogTitle orkm" :text="title" />
+      <Label class="dialogTitle orkm" :text="title" textWrap="true"/>
       <Label
         v-if="description"
         class="dialogDescription"
diff --git a/app/main.js b/app/main.js
index 5765e464..2088b94d 100644
--- a/app/main.js
+++ b/app/main.js
@@ -23,10 +23,9 @@ Vue.use(ProgressPlugin)
 import CalendarView from "nativescript-ui-calendar/vue"
 Vue.use(CalendarView)
 
-Vue.registerElement(
-  "RadSideDrawer",
-  () => require("nativescript-ui-sidedrawer").RadSideDrawer
-)
+import RadSideDrawer from "nativescript-ui-sidedrawer/vue"
+Vue.use(RadSideDrawer)
+
 import { CheckBox } from "@nstudio/nativescript-checkbox"
 Vue.registerElement("CheckBox", () => CheckBox, {
   model: {
@@ -35,11 +34,6 @@ Vue.registerElement("CheckBox", () => CheckBox, {
   },
 })
 
-if (TNS_ENV !== "production") {
-  // Vue.use(VueDevtools)
-}
-
-// Prints Vue logs when --env.production is *NOT* set while building
 Vue.config.silent = TNS_ENV === "production"
 
 new Vue({
diff --git a/app/shared/utils.js b/app/shared/utils.js
new file mode 100644
index 00000000..0d5ddbd6
--- /dev/null
+++ b/app/shared/utils.js
@@ -0,0 +1,42 @@
+import { Application } from "@nativescript/core"
+
+export const showDrawer = () => {
+  let sideDrawer = Application.getRootView().getViewById("sideDrawer")
+  sideDrawer && sideDrawer.showDrawer()
+}
+
+export const restartApp = () => {
+  const mStartActivity = new android.content.Intent(
+    Application.android.context,
+    Application.android.startActivity.getClass()
+  )
+  const mPendingIntentId = parseInt(Math.random() * 100000, 10)
+  const mPendingIntent = android.app.PendingIntent.getActivity(
+    Application.android.context,
+    mPendingIntentId,
+    mStartActivity,
+    android.app.PendingIntent.FLAG_CANCEL_CURRENT
+  )
+  const mgr = Application.android.context.getSystemService(
+    android.content.Context.ALARM_SERVICE
+  )
+  mgr.set(
+    android.app.AlarmManager.RTC,
+    java.lang.System.currentTimeMillis() + 100,
+    mPendingIntent
+  )
+  android.os.Process.killProcess(android.os.Process.myPid())
+}
+
+export const openAppSettingsPage = () => {
+  const intent = new android.content.Intent(
+    android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+  )
+  intent.addCategory(android.content.Intent.CATEGORY_DEFAULT)
+  intent.setData(
+    android.net.Uri.parse(
+      "package:" + Application.android.context.getPackageName()
+    )
+  )
+  Application.android.foregroundActivity.startActivity(intent)
+}
diff --git a/app/store.js b/app/store.js
index 552bd0b6..1000c300 100644
--- a/app/store.js
+++ b/app/store.js
@@ -1,10 +1,13 @@
 import Vue from "vue"
 import Vuex from "vuex"
 import { Couchbase } from "nativescript-couchbase-plugin"
-import { getFileAccess } from "@nativescript/core"
+import { Color, getFileAccess } from "@nativescript/core"
+import { CalendarEvent } from "nativescript-ui-calendar"
+import { stat } from "fs"
 const EnRecipesDB = new Couchbase("EnRecipes")
 const userCategoriesDB = new Couchbase("userCategories")
 const userYieldUnitsDB = new Couchbase("userYieldUnits")
+const mealPlansDB = new Couchbase("mealPlans")
 
 Vue.use(Vuex)
 
@@ -116,6 +119,7 @@ export default new Vuex.Store({
     units: [
       "unit",
       "tsp",
+      "dsp",
       "tbsp",
       "fl oz",
       "cup",
@@ -131,6 +135,7 @@ export default new Vuex.Store({
       "kg",
       "cm",
       "in",
+      "leaf",
       "clove",
       "pinch",
       "drop",
@@ -142,6 +147,7 @@ export default new Vuex.Store({
     ],
     yieldUnits: [],
     userYieldUnits: [],
+    mealPlans: [],
     icon: {
       home: "\ued3b",
       heart: "\ued36",
@@ -183,7 +189,8 @@ export default new Vuex.Store({
       export: "\ued07",
       import: "\ued0c",
       outline: "\ueb07",
-      calendar: "\uec57",
+      calendar: "\uec55",
+      today: "\ue97c",
     },
     currentComponent: "EnRecipes",
   },
@@ -230,12 +237,16 @@ export default new Vuex.Store({
       }
       state.yieldUnits = [...defaultYieldUnits, ...state.userYieldUnits]
     },
-    addRecipe(state, { id, recipe }) {
-      state.recipes.push(recipe)
-      EnRecipesDB.createDocument(recipe, id)
+    initializeMealPlans(state) {
+      let isMealPlansDBStored = mealPlansDB.query({ select: [] }).length
+      if (isMealPlansDBStored) {
+        state.mealPlans = mealPlansDB.getDocument("mealPlans").mealPlans
+      } else {
+        mealPlansDB.createDocument({ mealPlans: [] }, "mealPlans")
+      }
     },
+
     importRecipes(state, recipes) {
-      console.log("hello")
       let localRecipesIDs, partition
       if (state.recipes.length) {
         localRecipesIDs = state.recipes.map((e) => e.id)
@@ -254,24 +265,59 @@ export default new Vuex.Store({
         createDocuments(recipes)
       }
       function createDocuments(data) {
-        console.log("creating")
         state.recipes = [...state.recipes, ...data]
         data.forEach((recipe) => {
           EnRecipesDB.createDocument(recipe, recipe.id)
         })
       }
       function updateDocuments(data) {
-        console.log("updating")
         data.forEach((recipe) => {
           let recipeIndex = state.recipes
-            .map((e, i) => (e.id === recipe.id ? i : -1))
+            .map((e, i) => {
+              let d1 = new Date(e.lastModified).getTime()
+              let d2 = new Date(recipe.lastModified).getTime()
+              return e.id === recipe.id && d1 < d2 ? i : -1
+            })
             .filter((e) => e >= 0)[0]
-          console.log(recipeIndex)
-          Object.assign(state.recipes[recipeIndex], recipe)
-          EnRecipesDB.updateDocument(recipe.id, recipe)
+          if (recipeIndex >= 0) {
+            Object.assign(state.recipes[recipeIndex], recipe)
+            EnRecipesDB.updateDocument(recipe.id, recipe)
+          }
         })
       }
     },
+    importCategories(state, categories) {
+      state.userCategories = new Set([...state.userCategories, ...categories])
+      userCategoriesDB.updateDocument("userCategories", {
+        userCategories: [...state.userCategories],
+      })
+      state.categories = [...defaultCategories, ...state.userCategories]
+      state.categories.sort()
+    },
+    importYieldUnits(state, yieldUnits) {
+      state.userYieldUnits = new Set([...state.userYieldUnits, ...yieldUnits])
+      userYieldUnitsDB.updateDocument("userYieldUnits", {
+        userYieldUnits: [...state.userYieldUnits],
+      })
+      state.yieldUnits = [...defaultYieldUnits, ...state.userYieldUnits]
+    },
+    importMealPlans(state, mealPlans) {
+      let newMealPlans = mealPlans.filter(
+        (e) =>
+          !state.mealPlans.some(
+            (f) => f.title === e.title && f.startDate === e.startDate
+          )
+      )
+      state.mealPlans = [...state.mealPlans, ...newMealPlans]
+      mealPlansDB.updateDocument("mealPlans", {
+        mealPlans: [...state.mealPlans],
+      })
+    },
+
+    addRecipe(state, { id, recipe }) {
+      state.recipes.push(recipe)
+      EnRecipesDB.createDocument(recipe, id)
+    },
     addCategory(state, category) {
       let lowercase = state.categories.map((e) => e.toLowerCase())
       if (lowercase.indexOf(category.toLowerCase()) == -1) {
@@ -283,14 +329,6 @@ export default new Vuex.Store({
         state.categories.sort()
       }
     },
-    importCategories(state, categories) {
-      state.userCategories = new Set([...state.userCategories, ...categories])
-      userCategoriesDB.updateDocument("userCategories", {
-        userCategories: [...state.userCategories],
-      })
-      state.categories = [...defaultCategories, ...state.userCategories]
-      state.categories.sort()
-    },
     addYieldUnit(state, yieldUnit) {
       let lowercase = state.yieldUnits.map((e) => e.toLowerCase())
       if (lowercase.indexOf(yieldUnit.toLowerCase()) == -1) {
@@ -301,20 +339,18 @@ export default new Vuex.Store({
         state.yieldUnits = [...defaultYieldUnits, ...state.userYieldUnits]
       }
     },
-    importYieldUnits(state, yieldUnits) {
-      state.userYieldUnits = new Set([...state.userYieldUnits, ...yieldUnits])
-      userYieldUnitsDB.updateDocument("userYieldUnits", {
-        userYieldUnits: [...state.userYieldUnits],
+    addMealPlan(state, { event, eventColor }) {
+      state.mealPlans.push({
+        title: event.title,
+        startDate: event.startDate,
+        endDate: event.endDate,
+        eventColor,
+      })
+      mealPlansDB.updateDocument("mealPlans", {
+        mealPlans: [...state.mealPlans],
       })
-      state.yieldUnits = [...defaultYieldUnits, ...state.userYieldUnits]
-    },
-    overwriteRecipe(state, { id, recipe }) {
-      let index = state.recipes.indexOf(
-        state.recipes.filter((e) => e.id === id)[0]
-      )
-      Object.assign(state.recipes[index], recipe)
-      EnRecipesDB.updateDocument(id, recipe)
     },
+
     deleteRecipe(state, { index, id }) {
       getFileAccess().deleteFile(state.recipes[index].imageSrc)
       state.recipes.splice(index, 1)
@@ -326,6 +362,29 @@ export default new Vuex.Store({
         }
       })
     },
+    deleteMealPlan(state, { title, startDate }) {
+      let mealPlan = state.mealPlans.filter((e) => {
+        console.log(e.startDate, startDate)
+        let sd = new Date(e.startDate).getTime()
+        return e.title === title && sd === startDate.getTime()
+      })[0]
+      let index = state.mealPlans.indexOf(mealPlan)
+      state.mealPlans.splice(index, 1)
+      state.mealPlans = [...state.mealPlans]
+      let mealPlans = mealPlansDB.getDocument("mealPlans").mealPlans
+      mealPlans.splice(index, 1)
+      mealPlansDB.updateDocument("mealPlans", {
+        mealPlans: [...mealPlans],
+      })
+    },
+
+    overwriteRecipe(state, { id, recipe }) {
+      let index = state.recipes.indexOf(
+        state.recipes.filter((e) => e.id === id)[0]
+      )
+      Object.assign(state.recipes[index], recipe)
+      EnRecipesDB.updateDocument(id, recipe)
+    },
     toggleState(state, { id, recipe, key, setDate }) {
       let index = state.recipes.indexOf(
         state.recipes.filter((e) => e.id === id)[0]
@@ -346,9 +405,6 @@ export default new Vuex.Store({
       state.recipes[index].lastTried = new Date()
       EnRecipesDB.updateDocument(state.recipes[index].id, state.recipes[index])
     },
-    setCurrentComponent(state, comp) {
-      state.currentComponent = comp
-    },
     renameCategory(state, { current, updated }) {
       let lowercase = state.categories.map((e) => e.toLowerCase())
       if (lowercase.indexOf(updated.toLowerCase()) == -1) {
@@ -368,6 +424,9 @@ export default new Vuex.Store({
         }
       })
     },
+    setCurrentComponent(state, comp) {
+      state.currentComponent = comp
+    },
     unSyncCombinations(state, { id, combinations }) {
       state.recipes.forEach((e, i) => {
         if (combinations.includes(e.id)) {
@@ -387,30 +446,46 @@ export default new Vuex.Store({
     initializeYieldUnits({ commit }) {
       commit("initializeYieldUnits")
     },
-    addRecipeAction({ commit }, recipe) {
-      commit("addRecipe", recipe)
+    initializeMealPlans({ commit }) {
+      commit("initializeMealPlans")
     },
+
     importRecipesAction({ commit }, recipes) {
       commit("importRecipes", recipes)
     },
-    addCategoryAction({ commit }, category) {
-      commit("addCategory", category)
-    },
     importCategoriesAction({ commit }, categories) {
       commit("importCategories", categories)
     },
-    addYieldUnitAction({ commit }, yieldUnit) {
-      commit("addYieldUnit", yieldUnit)
-    },
     importYieldUnitsAction({ commit }, yieldUnits) {
       commit("importYieldUnits", yieldUnits)
     },
-    overwriteRecipeAction({ commit }, updatedRecipe) {
-      commit("overwriteRecipe", updatedRecipe)
+    importMealPlansAction({ commit }, mealPlans) {
+      commit("importMealPlans", mealPlans)
+    },
+
+    addRecipeAction({ commit }, recipe) {
+      commit("addRecipe", recipe)
+    },
+    addYieldUnitAction({ commit }, yieldUnit) {
+      commit("addYieldUnit", yieldUnit)
+    },
+    addCategoryAction({ commit }, category) {
+      commit("addCategory", category)
+    },
+    addMealPlanAction({ commit }, mealPlan) {
+      commit("addMealPlan", mealPlan)
+    },
+
+    deleteMealPlanAction({ commit }, mealPlan) {
+      commit("deleteMealPlan", mealPlan)
     },
     deleteRecipeAction({ commit }, recipe) {
       commit("deleteRecipe", recipe)
     },
+
+    overwriteRecipeAction({ commit }, updatedRecipe) {
+      commit("overwriteRecipe", updatedRecipe)
+    },
     toggleStateAction({ commit }, toggledRecipe) {
       commit("toggleState", toggledRecipe)
     },
@@ -420,12 +495,12 @@ export default new Vuex.Store({
     setLastTriedDateAction({ commit }, index) {
       commit("setLastTriedDate", index)
     },
-    setCurrentComponentAction({ commit }, comp) {
-      commit("setCurrentComponent", comp)
-    },
     renameCategoryAction({ commit }, category) {
       commit("renameCategory", category)
     },
+    setCurrentComponentAction({ commit }, comp) {
+      commit("setCurrentComponent", comp)
+    },
     unSyncCombinationsAction({ commit }, combinations) {
       commit("unSyncCombinations", combinations)
     },
diff --git a/nativescript.config.ts b/nativescript.config.ts
index c89189a0..fe405229 100644
--- a/nativescript.config.ts
+++ b/nativescript.config.ts
@@ -2,11 +2,11 @@ import { NativeScriptConfig } from "@nativescript/core"
 
 export default {
   id: "com.vishnuraghav.enrecipes",
-  appResourcesPath: "app/App_Resources",
+  appResourcesPath: "App_Resources",
   android: {
     v8Flags: "--expose_gc",
     markingMode: "none",
     codeCache: true,
-  },
-  appPath: "app",
+  }
+  // appPath: "app",
 } as NativeScriptConfig
diff --git a/package-lock.json b/package-lock.json
index 120f6c27..e8b52d39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,55 +25,6 @@
         }
       }
     },
-    "@ava/babel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@ava/babel/-/babel-1.0.1.tgz",
-      "integrity": "sha512-mGKpGeT6J4UjK2sxPjvwWl/GtsF9+eNyn2HHa7OknWWWYuw+rof/UaTAn1CA0z4sTw4Mruik/ihEasMw+JM6aQ==",
-      "dev": true,
-      "requires": {
-        "@ava/require-precompiled": "^1.0.0",
-        "@babel/core": "^7.8.4",
-        "@babel/generator": "^7.8.4",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-        "babel-plugin-espower": "^3.0.1",
-        "concordance": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "dot-prop": "^5.2.0",
-        "empower-core": "^1.2.0",
-        "escape-string-regexp": "^2.0.0",
-        "find-up": "^4.1.0",
-        "is-plain-object": "^3.0.0",
-        "md5-hex": "^3.0.1",
-        "package-hash": "^4.0.0",
-        "pkg-conf": "^3.1.0",
-        "source-map-support": "^0.5.16",
-        "strip-bom-buf": "^2.0.0",
-        "write-file-atomic": "^3.0.1"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
-        },
-        "is-plain-object": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz",
-          "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==",
-          "dev": true
-        }
-      }
-    },
-    "@ava/require-precompiled": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@ava/require-precompiled/-/require-precompiled-1.0.0.tgz",
-      "integrity": "sha512-N7w4g+P/SUL8SF+HC4Z4e/ctV6nQ5AERC90K90r4xZQ8WVrJux9albvfyYAzygyU47CSqMWh6yJwFs8DYaeWmg==",
-      "dev": true
-    },
     "@babel/code-frame": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
@@ -1315,9 +1266,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
-      "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==",
+      "version": "14.14.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz",
+      "integrity": "sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==",
       "dev": true
     },
     "@types/parse-json": {
@@ -1348,9 +1299,9 @@
       }
     },
     "@types/webpack": {
-      "version": "4.41.24",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.24.tgz",
-      "integrity": "sha512-1A0MXPwZiMOD3DPMuOKUKcpkdPo8Lq33UGggZ7xio6wJ/jV1dAu5cXDrOfGDnldUroPIRLsr/DT43/GqOA4RFQ==",
+      "version": "4.41.25",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz",
+      "integrity": "sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==",
       "dev": true,
       "requires": {
         "@types/anymatch": "*",
@@ -1902,12 +1853,11 @@
       "dev": true
     },
     "babel-loader": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.0.tgz",
-      "integrity": "sha512-xm8HSeshX4r143Vhi7b0LBjqAtOWPNGoIe7yvLUQjJcGU90+h5Odby13VejHo6zKAN+GuaOK/DwLa7wzMV5wSg==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz",
+      "integrity": "sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==",
       "dev": true,
       "requires": {
-        "@ava/babel": "^1.0.1",
         "find-cache-dir": "^2.1.0",
         "loader-utils": "^1.4.0",
         "make-dir": "^2.1.0",
@@ -2019,21 +1969,6 @@
         "object.assign": "^4.1.0"
       }
     },
-    "babel-plugin-espower": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-3.0.1.tgz",
-      "integrity": "sha512-Ms49U7VIAtQ/TtcqRbD6UBmJBUCSxiC3+zPc+eGqxKUIFO1lTshyEDRUjhoAbd2rWfwYf3cZ62oXozrd8W6J0A==",
-      "dev": true,
-      "requires": {
-        "@babel/generator": "^7.0.0",
-        "@babel/parser": "^7.0.0",
-        "call-matcher": "^1.0.0",
-        "core-js": "^2.0.0",
-        "espower-location-detector": "^1.0.0",
-        "espurify": "^1.6.0",
-        "estraverse": "^4.1.1"
-      }
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -2095,9 +2030,9 @@
       }
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
     "bcrypt-pbkdf": {
@@ -2134,6 +2069,16 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -2149,12 +2094,6 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "blueimp-md5": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz",
-      "integrity": "sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q==",
-      "dev": true
-    },
     "bn.js": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
@@ -2258,21 +2197,13 @@
       }
     },
     "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
       }
     },
     "browserify-sign": {
@@ -2439,24 +2370,6 @@
         "get-intrinsic": "^1.0.0"
       }
     },
-    "call-matcher": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.1.0.tgz",
-      "integrity": "sha512-IoQLeNwwf9KTNbtSA7aEBb1yfDbdnzwjCetjkC8io5oGeOmK2CBNdg0xr+tadRYKO0p7uQyZzvon0kXlZbvGrw==",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.0.0",
-        "deep-equal": "^1.0.0",
-        "espurify": "^1.6.0",
-        "estraverse": "^4.0.0"
-      }
-    },
-    "call-signature": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz",
-      "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=",
-      "dev": true
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -2488,9 +2401,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001157",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz",
-      "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==",
+      "version": "1.0.30001159",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz",
+      "integrity": "sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==",
       "dev": true
     },
     "caseless": {
@@ -2706,36 +2619,6 @@
         "typedarray": "^0.0.6"
       }
     },
-    "concordance": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/concordance/-/concordance-4.0.0.tgz",
-      "integrity": "sha512-l0RFuB8RLfCS0Pt2Id39/oCPykE01pyxgAFypWTlaGRgvLkZrtczZ8atEHpTeEIW+zYWXTBuA9cCSeEOScxReQ==",
-      "dev": true,
-      "requires": {
-        "date-time": "^2.1.0",
-        "esutils": "^2.0.2",
-        "fast-diff": "^1.1.2",
-        "js-string-escape": "^1.0.1",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.islength": "^4.0.1",
-        "lodash.merge": "^4.6.1",
-        "md5-hex": "^2.0.0",
-        "semver": "^5.5.1",
-        "well-known-symbols": "^2.0.0"
-      },
-      "dependencies": {
-        "md5-hex": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz",
-          "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=",
-          "dev": true,
-          "requires": {
-            "md5-o-matic": "^0.1.1"
-          }
-        }
-      }
-    },
     "console-browserify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
@@ -2871,12 +2754,6 @@
         }
       }
     },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-      "dev": true
-    },
     "core-js-compat": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz",
@@ -3090,15 +2967,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "date-time": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz",
-      "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==",
-      "dev": true,
-      "requires": {
-        "time-zone": "^1.0.0"
-      }
-    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -3126,20 +2994,6 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
-    "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "dev": true,
-      "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
-      }
-    },
     "deepmerge": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
@@ -3290,15 +3144,6 @@
       "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -3340,9 +3185,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.592",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.592.tgz",
-      "integrity": "sha512-kGNowksvqQiPb1pUSQKpd8JFoGPLxYOwduNRCqCxGh/2Q1qE2JdmwouCW41lUzDxOb/2RIV4lR0tVIfboWlO9A==",
+      "version": "1.3.598",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz",
+      "integrity": "sha512-G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A==",
       "dev": true
     },
     "elliptic": {
@@ -3380,16 +3225,6 @@
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
-    "empower-core": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-1.2.0.tgz",
-      "integrity": "sha512-g6+K6Geyc1o6FdXs9HwrXleCFan7d66G5xSCfSF7x1mJDCes6t0om9lFQG3zOrzh3Bkb/45N0cZ5Gqsf7YrzGQ==",
-      "dev": true,
-      "requires": {
-        "call-signature": "0.0.2",
-        "core-js": "^2.0.0"
-      }
-    },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -3434,37 +3269,6 @@
         "is-arrayish": "^0.2.1"
       }
     },
-    "es-abstract": {
-      "version": "1.18.0-next.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.2",
-        "is-negative-zero": "^2.0.0",
-        "is-regex": "^1.1.1",
-        "object-inspect": "^1.8.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.1",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
     "es5-ext": {
       "version": "0.10.53",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
@@ -3476,12 +3280,6 @@
         "next-tick": "~1.0.0"
       }
     },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
@@ -3531,35 +3329,6 @@
         "estraverse": "^4.1.1"
       }
     },
-    "espower-location-detector": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz",
-      "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=",
-      "dev": true,
-      "requires": {
-        "is-url": "^1.2.1",
-        "path-is-absolute": "^1.0.0",
-        "source-map": "^0.5.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "espurify": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.1.tgz",
-      "integrity": "sha512-ZDko6eY/o+D/gHCWyHTU85mKDgYcS4FJj7S+YD6WIInm7GQ6AnOjmcL4+buFV/JOztVLELi/7MmuGU5NHta0Mg==",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.0.0"
-      }
-    },
     "esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -3846,12 +3615,6 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
     "fast-glob": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
@@ -3887,6 +3650,13 @@
       "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -4684,16 +4454,6 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
-    "hasha": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dev": true,
-      "requires": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      }
-    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -4962,12 +4722,6 @@
         }
       }
     },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -4990,12 +4744,6 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "is-callable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
-      "dev": true
-    },
     "is-core-module": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
@@ -5025,12 +4773,6 @@
         }
       }
     },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -5083,24 +4825,12 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-negative-zero": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
-      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
-      "dev": true
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
     "is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -5134,42 +4864,12 @@
         "isobject": "^3.0.1"
       }
     },
-    "is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
       "dev": true
     },
-    "is-url": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
-    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -5246,12 +4946,6 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "dev": true
     },
-    "js-string-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
-      "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -5358,32 +5052,31 @@
       "dev": true
     },
     "load-json-file": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz",
-      "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.15",
-        "parse-json": "^4.0.0",
-        "pify": "^4.0.1",
-        "strip-bom": "^3.0.0",
-        "type-fest": "^0.3.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       },
       "dependencies": {
         "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "^1.2.0"
           }
         },
-        "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         }
       }
@@ -5420,30 +5113,6 @@
       "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "lodash.islength": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.islength/-/lodash.islength-4.0.1.tgz",
-      "integrity": "sha1-Tpho1FJXXXUK/9NYyXlUPcIO1Xc=",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -5515,21 +5184,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "md5-hex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz",
-      "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==",
-      "dev": true,
-      "requires": {
-        "blueimp-md5": "^2.10.0"
-      }
-    },
-    "md5-o-matic": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz",
-      "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=",
-      "dev": true
-    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -6065,9 +5719,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.66",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz",
-      "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==",
+      "version": "1.1.67",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz",
+      "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==",
       "dev": true
     },
     "node-sass": {
@@ -6260,22 +5914,6 @@
         }
       }
     },
-    "object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
-      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      }
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -6404,18 +6042,6 @@
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
-    "package-hash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "hasha": "^5.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "release-zalgo": "^1.0.0"
-      }
-    },
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -6585,61 +6211,6 @@
         "pinkie": "^2.0.0"
       }
     },
-    "pkg-conf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz",
-      "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "load-json-file": "^5.2.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
     "pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -6987,28 +6558,6 @@
         "path-type": "^1.0.0"
       },
       "dependencies": {
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
         "path-type": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -7025,15 +6574,6 @@
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
         }
       }
     },
@@ -7178,37 +6718,6 @@
       "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
       "dev": true
     },
-    "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
-      }
-    },
     "regexpu-core": {
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
@@ -7246,15 +6755,6 @@
         }
       }
     },
-    "release-zalgo": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-      "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
-      "dev": true,
-      "requires": {
-        "es6-error": "^4.0.1"
-      }
-    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -8181,26 +7681,6 @@
         "strip-ansi": "^5.1.0"
       }
     },
-    "string.prototype.trimend": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
-      "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
-      "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      }
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -8220,18 +7700,12 @@
       }
     },
     "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
-    "strip-bom-buf": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-2.0.0.tgz",
-      "integrity": "sha512-gLFNHucd6gzb8jMsl5QmZ3QgnUJmp7qn4uUSHNwEXumAp7YizoGYw19ZUVfuq4aBOQUtyn2k8X/CwzWB73W2lQ==",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-indent": {
@@ -8323,12 +7797,6 @@
         "xtend": "~4.0.1"
       }
     },
-    "time-zone": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz",
-      "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=",
-      "dev": true
-    },
     "timers-browserify": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
@@ -8513,12 +7981,6 @@
       "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
       "dev": true
     },
-    "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
-    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -8535,15 +7997,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -9000,6 +8453,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -9543,12 +8997,6 @@
         "source-map": "~0.6.1"
       }
     },
-    "well-known-symbols": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz",
-      "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==",
-      "dev": true
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -9625,18 +9073,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
     "ws": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
diff --git a/package.json b/package.json
index 9d767853..339d0374 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,6 @@
   "description": "A native application built with NativeScript-Vue",
   "author": "Vishnu Raghav <design@vishnuraghav.com>",
   "license": "GPL",
-  "scripts": {
-    "run": "ns run android"
-  },
   "dependencies": {
     "@nativescript-community/perms": "^2.1.1",
     "@nativescript-community/ui-material-activityindicator": "^5.0.30",
@@ -27,19 +24,19 @@
     "nativescript-ui-calendar": "^7.0.2",
     "nativescript-ui-listview": "^9.0.4",
     "nativescript-ui-sidedrawer": "^9.0.3",
-    "nativescript-vue": "^2.6.1",
-    "vuex": "^3.3.0"
+    "nativescript-vue": "^2.8.1",
+    "vuex": "^3.5.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
+    "@babel/core": "^7.12.3",
+    "@babel/preset-env": "^7.12.1",
     "@nativescript/android": "7.0.1",
-    "@types/node": "^14.0.27",
-    "babel-loader": "^8.1.0",
-    "nativescript-vue-template-compiler": "^2.6.0",
-    "node-sass": "^4.13.1",
-    "vue-loader": "^15.9.1",
-    "@nativescript/webpack": "~3.0.0"
+    "@nativescript/webpack": "^3.0.8",
+    "@types/node": "^14.14.8",
+    "babel-loader": "^8.2.1",
+    "nativescript-vue-template-compiler": "^2.8.1",
+    "node-sass": "^4.14.1",
+    "vue-loader": "^15.9.5"
   },
   "main": "main"
 }