From 12d1d9ba3d34588af5ba813b4f14b59732d4ae9e Mon Sep 17 00:00:00 2001
From: vishnuraghavb <design@vishnuraghav.com>
Date: Sat, 22 May 2021 14:26:31 +0530
Subject: [PATCH 1/4] cooking timer ongoing

---
 README.md                                     |    2 +-
 app/app.scss                                  |   75 +-
 app/components/CookingTimer.vue               |  377 +++
 app/components/EditRecipe.vue                 |  137 +-
 app/components/EnRecipes.vue                  |  130 +-
 app/components/MealPlanner.vue                |   64 +-
 app/components/Settings/CTSettings.vue        |    2 +-
 app/components/Settings/Database.vue          |  269 +-
 app/components/Settings/Interface.vue         |    4 +-
 app/components/Settings/MPSettings.vue        |   75 +
 app/components/Settings/Options.vue           |   14 +-
 app/components/Settings/Reset.vue             |   34 +-
 app/components/SingleTimer.vue                |  196 ++
 app/components/ViewRecipe.vue                 |  131 +-
 .../modal/ActionDialogWithSearch.vue          |    8 +-
 app/components/modal/CookingTimePicker.vue    |  122 +
 .../modal/{ListPicker.vue => TimePicker.vue}  |    7 +-
 app/fonts/enrecipes.ttf                       |  Bin 14520 -> 16124 bytes
 app/main.ts                                   |   10 +-
 app/resources/Android/app.gradle              |   25 +-
 .../Android/src/main/AndroidManifest.xml      |   16 +-
 .../res/drawable-hdpi/ic_stat_notify.webp     |  Bin 0 -> 954 bytes
 .../ic_stat_notify_silhouette.webp            |  Bin 0 -> 938 bytes
 .../main/res/drawable-ldpi/ic_launcher.webp   |  Bin 1612 -> 0 bytes
 .../src/main/res/drawable-ldpi/logo.webp      |  Bin 754 -> 0 bytes
 .../res/drawable-mdpi/ic_stat_notify.webp     |  Bin 0 -> 860 bytes
 .../ic_stat_notify_silhouette.webp            |  Bin 0 -> 852 bytes
 .../res/drawable-xhdpi/ic_stat_notify.webp    |  Bin 0 -> 1016 bytes
 .../ic_stat_notify_silhouette.webp            |  Bin 0 -> 1016 bytes
 .../res/drawable-xxhdpi/ic_stat_notify.webp   |  Bin 0 -> 1168 bytes
 .../ic_stat_notify_silhouette.webp            |  Bin 0 -> 1160 bytes
 .../res/drawable-xxxhdpi/ic_stat_notify.webp  |  Bin 0 -> 1350 bytes
 .../ic_stat_notify_silhouette.webp            |  Bin 0 -> 1336 bytes
 .../src/main/res/values-ar/strings.xml        |  316 ++
 .../src/main/res/values-ca/strings.xml        |  423 +--
 .../src/main/res/values-da/strings.xml        |   21 +
 .../src/main/res/values-de/strings.xml        |   21 +
 .../src/main/res/values-en-rIN/strings.xml    |  316 ++
 .../src/main/res/values-en-rUS/strings.xml    |  316 ++
 .../src/main/res/values-es-rAR/strings.xml    |  316 ++
 .../src/main/res/values-es/strings.xml        |   21 +
 .../src/main/res/values-fi/strings.xml        |  316 ++
 .../src/main/res/values-fr-rBE/strings.xml    |   35 +-
 .../src/main/res/values-fr-rCA/strings.xml    |   35 +-
 .../src/main/res/values-fr-rCH/strings.xml    |   35 +-
 .../src/main/res/values-fr/strings.xml        |  107 +-
 .../src/main/res/values-hi/strings.xml        |   21 +
 .../src/main/res/values-id/strings.xml        |   21 +
 .../src/main/res/values-it/strings.xml        |   25 +-
 .../src/main/res/values-ja/strings.xml        |  316 ++
 .../src/main/res/values-kn/strings.xml        |  316 ++
 .../src/main/res/values-ml/strings.xml        |   21 +
 .../src/main/res/values-nb-rNO/strings.xml    |   21 +
 .../src/main/res/values-night/styles.xml      |   49 +-
 .../src/main/res/values-nl/strings.xml        |   21 +
 .../src/main/res/values-pt-rBR/strings.xml    |   43 +-
 .../src/main/res/values-pt/strings.xml        |  247 +-
 .../src/main/res/values-ru/strings.xml        |   21 +
 .../src/main/res/values-ta/strings.xml        |   21 +
 .../src/main/res/values-te/strings.xml        |   21 +
 .../Android/src/main/res/values/colors.xml    |    3 +
 .../Android/src/main/res/values/strings.xml   |   21 +
 .../Android/src/main/res/values/styles.xml    |   49 +-
 app/shared/utils.js                           |  194 +-
 app/store.ts                                  |  802 +++--
 .../metadata/android/en-GB/changelogs/8.txt   |    3 -
 nativescript.config.ts                        |    2 +-
 package-lock.json                             | 2620 ++++++++++++-----
 package.json                                  |   17 +-
 types/references.d.ts                         |    2 +-
 70 files changed, 7013 insertions(+), 1840 deletions(-)
 create mode 100644 app/components/CookingTimer.vue
 create mode 100644 app/components/Settings/MPSettings.vue
 create mode 100644 app/components/SingleTimer.vue
 create mode 100644 app/components/modal/CookingTimePicker.vue
 rename app/components/modal/{ListPicker.vue => TimePicker.vue} (94%)
 create mode 100644 app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify_silhouette.webp
 delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/ic_launcher.webp
 delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/logo.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify_silhouette.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify_silhouette.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify_silhouette.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify.webp
 create mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify_silhouette.webp
 create mode 100644 app/resources/Android/src/main/res/values-ar/strings.xml
 create mode 100644 app/resources/Android/src/main/res/values-en-rIN/strings.xml
 create mode 100644 app/resources/Android/src/main/res/values-en-rUS/strings.xml
 create mode 100644 app/resources/Android/src/main/res/values-es-rAR/strings.xml
 create mode 100644 app/resources/Android/src/main/res/values-fi/strings.xml
 create mode 100644 app/resources/Android/src/main/res/values-ja/strings.xml
 create mode 100644 app/resources/Android/src/main/res/values-kn/strings.xml
 delete mode 100644 fastlane/metadata/android/en-GB/changelogs/8.txt

diff --git a/README.md b/README.md
index 5a0978cc..cc79e3a5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/license-GPL%20v3-blue"></a> <a href="https://github.com/vishnuraghavb/EnRecipes/releases" alt="Release version"><img src="https://img.shields.io/github/v/release/vishnuraghavb/EnRecipes?color=ff5200"/></a> <a href="https://hosted.weblate.org/engage/enrecipes/">
 <img src="https://hosted.weblate.org/widgets/enrecipes/-/app-translations/svg-badge.svg" alt="Translation status" /></a>
 <p align="center">
-<a href="https://play.google.com/store/apps/details?id=com.vishnuraghav.enrecipes"><img src="assets/Images/google-play-badge.png" height="80"/></a><a href="https://apt.izzysoft.de/fdroid/index/apk/com.vishnuraghav.enrecipes"><img src="assets/Images/IzzyOnDroid.png" height="80"/></a><br>You can also get the <a href="https://github.com/vishnuraghavb/EnRecipes/releases/latest">latest release on GitHub</a>
+<a href="https://play.google.com/store/apps/details?id=com.vishnuraghav.EnRecipes"><img src="assets/Images/google-play-badge.png" height="80"/></a><a href="https://apt.izzysoft.de/fdroid/index/apk/com.vishnuraghav.EnRecipes"><img src="assets/Images/IzzyOnDroid.png" height="80"/></a><br>You can also get the <a href="https://github.com/vishnuraghavb/EnRecipes/releases/latest">latest release on GitHub</a>
 </p>
 <h2 align="center">Enjoying EnRecipes?</h2>
 <p align="center">Please consider making a small donation to help fund the project. Developing an application, especially one that is open source and completely free, takes a lot of time and effort.
diff --git a/app/app.scss b/app/app.scss
index 6741df01..885ddbb7 100644
--- a/app/app.scss
+++ b/app/app.scss
@@ -12,11 +12,11 @@ $gray10: #000000;
 $orange: #ff5200;
 
 Page {
-  font-family: "Inter-Medium";
+  font-family: 'Inter-Medium';
   font-size: 14;
 }
 .ico {
-  font-family: "enrecipes";
+  font-family: 'enrecipes';
   font-size: 24;
   vertical-alignment: center;
   &.sm {
@@ -25,7 +25,7 @@ Page {
   }
 }
 .tb {
-  font-family: "Inter-Bold";
+  font-family: 'Inter-Bold';
 }
 .tac {
   text-align: center;
@@ -180,7 +180,7 @@ TextView {
 .progressContainer {
   width: 100%;
 }
-Progress {
+progress {
   margin: 16;
   background-color: $gray5;
 }
@@ -203,7 +203,7 @@ Switch {
     @extend .hl;
   }
 }
-Button {
+button {
   background-color: transparent;
   z-index: 0;
   padding: 8;
@@ -240,7 +240,7 @@ Button {
     width: 32;
     height: 32;
     min-width: 0;
-    margin: 0 0 0 8;
+    margin: 0 0 0 4;
     vertical-alignment: center;
   }
   &.rate {
@@ -253,7 +253,7 @@ Button {
 // HOME
 .emptyState {
   padding: 16 16 8;
-  Label {
+  label {
     @extend .tw;
   }
   .title {
@@ -312,6 +312,25 @@ Button {
   border-radius: 12;
 }
 // -----------------------------
+// COOKING TIMER
+
+.singleTimer {
+  padding: 8 16;
+  .info {
+    margin: 8;
+  }
+  .recipeTitle {
+    horizontal-alignment: left;
+    // font-size: 12;
+  }
+  progress {
+    color: $orange;
+    width: 100%;
+    height: 4;
+    margin: 8 0 0;
+  }
+}
+// -----------------------------
 // SETTINGS
 .group-info {
   padding: 16 16 16 72;
@@ -334,9 +353,9 @@ Button {
       font-size: 12;
     }
   }
-  .listSpace {
-    height: 72;
-  }
+}
+.listSpace {
+  height: 72;
 }
 
 // -----------------------------
@@ -376,9 +395,9 @@ Button {
     @extend .tb;
     @extend .tw;
   }
-  .clickable {
-    color: $orange;
-  }
+}
+.clickable {
+  color: $orange;
 }
 .ingredient {
   padding: 0 16;
@@ -452,7 +471,7 @@ Button {
   horizontal-alignment: left;
   .tool {
     padding: 0 12;
-    Label {
+    label {
       vertical-alignment: center;
     }
     .ico {
@@ -509,7 +528,7 @@ Button {
     color: $orange;
   }
   .activeDay {
-    background-color: rgba($orange, 0.2);
+    @extend .hl;
   }
 }
 .dayPlan {
@@ -549,7 +568,8 @@ Button {
   }
   ListPicker {
     width: 25%;
-    height: 160;
+    height: 128;
+    margin: 16 0;
   }
   .listItem {
     @extend .tw;
@@ -596,19 +616,34 @@ ActivityIndicator {
 }
 // -----------------------------
 // Transitions
+.blink {
+  animation-name: blink;
+  animation-duration: 1s;
+  animation-iteration-count: infinite;
+  animation-timing-function: ease;
+}
+@keyframes blink {
+  0% {
+    opacity: 0;
+  }
+  50% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
 .hl {
   animation-name: hl;
   animation-duration: 0.2s;
   animation-fill-mode: forwards;
-  animation-timing-function: ease-out;
+  animation-timing-function: ease;
 }
 @keyframes hl {
   0% {
-    opacity: 0.5;
     background-color: transparent;
   }
   100% {
-    opacity: 1;
     background-color: rgba($orange, 0.2);
   }
 }
@@ -616,7 +651,7 @@ ActivityIndicator {
   animation-name: fade;
   animation-duration: 0.2s;
   animation-fill-mode: forwards;
-  animation-timing-function: ease-out;
+  animation-timing-function: ease;
 }
 @keyframes fade {
   0% {
diff --git a/app/components/CookingTimer.vue b/app/components/CookingTimer.vue
new file mode 100644
index 00000000..af2d1054
--- /dev/null
+++ b/app/components/CookingTimer.vue
@@ -0,0 +1,377 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="*">
+      <ScrollView
+        @scroll="onScroll($event)"
+        rowSpan="2"
+        scrollBarIndicatorVisible="false"
+      >
+        <StackLayout>
+          <GridLayout rows="auto" columns="*, auto, 8">
+            <Label class="pageTitle" :text="'timer' | L" />
+            <Button
+              col="1"
+              class="ico"
+              :text="icon.cog"
+              @tap="$navigateTo(CTSettings)"
+            />
+          </GridLayout>
+          <SingleTimer
+            v-for="(timer, i) in activeTimers"
+            :key="timer.id"
+            ref="singleTimer"
+            :timer="timer"
+            :timerIndex="i"
+            :formattedTime="formattedTime"
+            :removeTimer="removeTimer"
+            :addToPreset="addToPreset"
+            :togglePause="togglePause"
+            :fireTimer="fireTimer"
+          />
+          <StackLayout class="listSpace"> </StackLayout>
+        </StackLayout>
+      </ScrollView>
+      <GridLayout
+        row="1"
+        @loaded="onAppBarLoad"
+        class="appbar"
+        :hidden="showUndo"
+        columns="auto, *, auto"
+      >
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+        <Button class="ico fab" :text="icon.plus" @tap="addTimer" col="2" />
+      </GridLayout>
+      <GridLayout
+        row="1"
+        class="appbar snackBar"
+        :hidden="!showUndo"
+        columns="auto, *, auto"
+        @swipe="hideUndoBar"
+      >
+        <Button :text="countdown" class="ico countdown tb" />
+        <Label class="title" col="1" :text="snackMsg | L" />
+        <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { localize } from "@nativescript/localize";
+import {
+  Observable,
+  CoreTypes,
+  Application,
+  ApplicationSettings,
+  AndroidApplication,
+} from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import CTSettings from "./Settings/CTSettings.vue";
+import ActionDialog from "./modal/ActionDialog.vue";
+import CookingTimePicker from "./modal/CookingTimePicker.vue";
+import CookingTimer from "./CookingTimer.vue";
+import SingleTimer from "./SingleTimer.vue";
+import * as utils from "~/shared/utils";
+
+import { EventBus } from "~/main";
+let undoTimer;
+
+export default {
+  components: { SingleTimer },
+  props: ["recipeID"],
+  data() {
+    return {
+      scrollPos: 1,
+      appbar: null,
+      countdown: 5,
+      snackMsg: null,
+      showUndo: false,
+      undo: false,
+      CTSettings: CTSettings,
+    };
+  },
+  computed: {
+    ...mapState([
+      "icon",
+      "recipes",
+      "currentComponent",
+      "timerSound",
+      "timerVibrate",
+      "timerDelay",
+      "timerPresets",
+      "activeTimers",
+    ]),
+  },
+  methods: {
+    ...mapActions([
+      "setComponent",
+      "addActiveTimer",
+      "removeActiveTimer",
+      "clearTimerInterval",
+      "addTimerPreset",
+      "updateActiveTimer",
+    ]),
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+      this.setComponent("CookingTimer");
+    },
+    onAppBarLoad({ object }) {
+      this.appbar = object;
+    },
+    onScroll(args) {
+      let scrollUp;
+      let y = args.scrollY;
+      if (y) {
+        scrollUp = y < this.scrollPos;
+        this.scrollPos = Math.abs(y);
+        let ab = this.appbar.translateY;
+        if (!scrollUp && ab == 0) {
+          this.appbar.animate({
+            translate: { x: 0, y: 64 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+        } else if (scrollUp && ab == 64) {
+          this.appbar.animate({
+            translate: { x: 0, y: 0 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+        }
+      }
+    },
+    // HELPERS
+    getRecipeTitle(id) {
+      let recipe = this.recipes.filter((e) => e.id === id)[0];
+      return recipe ? recipe.title : `[ ${localize("resNF")} ]`;
+    },
+    formattedTime(time) {
+      let hr = localize("hr");
+      let min = localize("min");
+      let sec = localize("sec");
+
+      let t = time.split(":");
+
+      let h = parseInt(t[0]);
+      let m = parseInt(t[1]);
+      let s = parseInt(t[2]);
+
+      let hasHrs = h ? `${h} ${hr}` : "";
+      let hasMins = m ? `${h ? " " : ""}${m} ${min}` : "";
+      let hasSecs = s ? `${h || m ? " " : ""}${s} ${sec}` : "";
+
+      return hasHrs + hasMins + hasSecs;
+    },
+
+    // NOTIFICATION HANDLERS
+    notifyTimers() {
+      let activeCount = this.activeTimers.length;
+      let pausedCount = this.activeTimers.filter((e) => e.isPaused).length;
+      let ongoingCount = activeCount - pausedCount;
+      console.log("notifying");
+      utils.TimerNotification.show({
+        bID: "bringToFront",
+        cID: "CookingTimer",
+        cName: "Cooking Timer",
+        description: `${ongoingCount} ongoing, ${pausedCount} paused`,
+        nID: 999,
+        priority: 0,
+        sound: null,
+        title: localize("timer"),
+      });
+      if (activeCount <= 0) utils.TimerNotification.clear(999);
+    },
+    intentListener({ intent, android }) {
+      let ct = "CookingTimer";
+      let action = (intent || android).getStringExtra("action");
+      console.log("calling: ", action);
+      let comp = this.currentComponent;
+      if (action == "open_timer" && this.currentComponent != ct) {
+        let openTimer = setInterval(() => {
+          if (comp == ct) clearInterval(openTimer);
+          else {
+            this.$navigateTo(CookingTimer);
+            comp = ct;
+          }
+          // Application.off(Application.launchEvent, this.intentListener);
+          Application.android.off(
+            AndroidApplication.activityNewIntentEvent,
+            this.intentListener
+          );
+        }, 250);
+      }
+    },
+    fireTimer(timer) {
+      console.log("firing");
+      let description = timer.recipeID
+        ? " - " + this.getRecipeTitle(timer.recipeID)
+        : "";
+      let title = timer.label;
+      let time = this.formattedTime(timer.time);
+      let bID = "timer" + timer.id;
+      utils.TimerNotification.show({
+        actions: true,
+        bID,
+        cID: "FiringTimers",
+        cName: "Firing timers",
+        description: time,
+        nID: timer.id,
+        priority: 1,
+        sound: this.timerSound.uri,
+        title: title + description,
+        vibrate: this.timerVibrate,
+      });
+      Application.android.registerBroadcastReceiver(bID, (ctx, intent) => {
+        let action = intent.getStringExtra("action");
+        console.log(action, "firing");
+        EventBus.$emit(bID, action);
+      });
+    },
+
+    // DATA HANDLERS
+    addTimer() {
+      this.$showModal(CookingTimePicker, {
+        props: {
+          title: "ntmr",
+          label: `${localize("tmr", this.activeTimers.length + 1)}`,
+          action: "strtBtn",
+          showPreset: this.timerPresets.length,
+        },
+      }).then((res) => {
+        if (res) {
+          if (res == "presets") {
+            let list = this.timerPresets.map(
+              (e) => `${e.label} - ${this.formattedTime(e.time)}`
+            );
+            this.$showModal(ActionDialog, {
+              props: {
+                title: "tmrPrsts",
+                list,
+              },
+            }).then((preset) => {
+              if (preset) {
+                let timer = JSON.parse(
+                  JSON.stringify(this.timerPresets[list.indexOf(preset)])
+                );
+                timer.id = this.getRandomID();
+                this.addActiveTimer({
+                  timer,
+                  index: this.activeTimers.length,
+                });
+                this.notifyTimers();
+              }
+            });
+          } else {
+            if (res.time != "00:00:00") {
+              this.addActiveTimer({
+                timer: {
+                  id: this.getRandomID(),
+                  label: res.label,
+                  recipeID: this.recipeID,
+                  time: res.time,
+                  timerInterval: null,
+                  isPaused: false,
+                  preset: 0,
+                },
+                index: this.activeTimers.length,
+              });
+              this.notifyTimers();
+            }
+          }
+        }
+      });
+    },
+    removeTimer(id, index, noUndo) {
+      let temp = this.activeTimers[index];
+      this.removeActiveTimer(index);
+      utils.TimerNotification.clear(id);
+      if (!noUndo) {
+        this.showUndoBar("tmrClr")
+          .then(() => {
+            this.addActiveTimer({
+              timer: temp,
+              index,
+            });
+            this.notifyTimers();
+          })
+          .catch(() => {
+            ApplicationSettings.remove(`${temp.id}progress`);
+          });
+      }
+      this.notifyTimers();
+    },
+    addToPreset(timer) {
+      timer = JSON.parse(JSON.stringify(timer));
+      timer.recipeID = timer.timerInterval = null;
+      timer.preset = 1;
+      this.addTimerPreset(timer);
+    },
+    togglePause(timer, bool) {
+      if (typeof bool === "boolean") timer.isPaused = bool;
+      else timer.isPaused = !timer.isPaused;
+      this.updateActiveTimer(timer);
+      this.notifyTimers();
+    },
+    showUndoBar(message) {
+      return new Promise((resolve, reject) => {
+        clearTimeout(undoTimer);
+        this.showUndo = true;
+        this.snackMsg = message;
+        this.countdown = 5;
+        let a = 5;
+        undoTimer = setInterval(() => {
+          if (this.undo) {
+            this.showUndo = this.undo = false;
+            clearTimeout(undoTimer);
+            resolve(true);
+          }
+          this.countdown = Math.round((a -= 0.1));
+          if (this.countdown < 1) {
+            this.showUndo = false;
+            clearTimeout(undoTimer);
+            reject(true);
+          }
+        }, 100);
+      });
+    },
+    hideUndoBar({ object }) {
+      object
+        .animate({
+          opacity: 0,
+          translate: { x: 0, y: 64 },
+          duration: 250,
+          curve: CoreTypes.AnimationCurve.ease,
+        })
+        .then(() => {
+          this.showUndo = false;
+          this.appbar.translateY = 64;
+          this.appbar.animate({
+            translate: { x: 0, y: 0 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+          object.opacity = 1;
+          object.translateY = 0;
+          clearTimeout(undoTimer);
+        });
+    },
+    undoDel() {
+      this.undo = true;
+    },
+
+    // HELPERS
+    getRandomID() {
+      return Math.floor(Math.random() * 9000000000) + 1000000000;
+    },
+  },
+  created() {
+    // Application.on(Application.launchEvent, this.intentListener);
+    Application.android.on(
+      AndroidApplication.activityNewIntentEvent,
+      this.intentListener
+    );
+    this.clearTimerInterval();
+  },
+};
+</script>
diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue
index 588de825..c6512332 100644
--- a/app/components/EditRecipe.vue
+++ b/app/components/EditRecipe.vue
@@ -10,8 +10,8 @@
           <Label class="pageTitle" padding="16 0" :text="`${title}` | L" />
           <Image
             margin="8 0 32"
-            v-if="recipe.imageSrc"
-            :src="recipe.imageSrc"
+            v-if="recipe.image"
+            :src="recipe.image"
             stretch="aspectFit"
             class="imgHolder"
             :width="screenWidth - 32"
@@ -95,7 +95,7 @@
               <Label class="fieldLabel" :text="'yieldQ' | L" />
               <TextField
                 ref="yieldQuantity"
-                v-model="recipe.yield.quantity"
+                v-model="recipe.yieldQuantity"
                 hint="1"
                 keyboardType="number"
                 returnKeyType="next"
@@ -104,7 +104,7 @@
             <StackLayout class="inputField" col="2">
               <Label class="fieldLabel" :text="'yieldU' | L" />
               <TextField
-                :text="`${recipe.yield.unit}` | L"
+                :text="`${recipe.yieldUnit}` | L"
                 editable="false"
                 @focus="!modalOpen && showYieldUnits(true)"
                 @tap="showYieldUnits(false)"
@@ -252,23 +252,33 @@
       <GridLayout
         row="1"
         @loaded="onAppBarLoad"
-        :colSpan="hasChanges || showUndo ? '2' : '1'"
+        :hidden="showUndo"
         class="appbar"
-        :class="{ snackBar: showUndo }"
+        :colSpan="hasChanges ? 2 : 1"
         columns="auto, *, auto"
       >
-        <Button v-if="showUndo" :text="countdown" class="countdown ico tb" />
-        <Button v-else class="ico" :text="icon.back" @tap="navigateBack" />
-        <Label class="title" col="1" :hidden="!showUndo" :text="snackMsg | L" />
+        <Button class="ico" :text="icon.back" @tap="navigateBack" />
         <Button
-          v-if="(hasChanges && !saving) || showUndo"
+          v-if="hasChanges && !saving"
           class="ico fab"
-          :text="showUndo ? icon.undo : icon.save"
+          :text="icon.save"
           col="2"
-          @tap="showUndo ? undoDel() : saveOperation()"
+          @tap="saveOperation()"
         />
         <ActivityIndicator col="2" v-if="saving" :busy="saving" />
       </GridLayout>
+      <GridLayout
+        row="1"
+        class="appbar snackBar"
+        :hidden="!showUndo"
+        colSpan="2"
+        columns="auto, *, auto"
+        @swipe="hideUndoBar"
+      >
+        <Button :text="countdown" class="ico countdown tb" />
+        <Label class="title" col="1" :text="snackMsg | L" />
+        <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
+      </GridLayout>
     </GridLayout>
   </Page>
 </template>
@@ -276,7 +286,6 @@
 <script>
 import {
   AndroidApplication,
-  Application,
   ApplicationSettings,
   File,
   getFileAccess,
@@ -295,7 +304,7 @@ import ActionDialog from "./modal/ActionDialog.vue";
 import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
 import ConfirmDialog from "./modal/ConfirmDialog.vue";
 import PromptDialog from "./modal/PromptDialog.vue";
-import ListPicker from "./modal/ListPicker.vue";
+import TimePicker from "./modal/TimePicker.vue";
 import * as utils from "~/shared/utils";
 let undoTimer;
 export default {
@@ -309,34 +318,32 @@ export default {
     return {
       title: "newRec",
       recipe: {
-        imageSrc: null,
-        title: undefined,
+        id: this.recipeID ? this.recipeID : this.getRandomID(),
+        image: null,
+        title: null,
         cuisine: "Undefined",
         category: "Undefined",
         tags: [],
         prepTime: "00:00",
         cookTime: "00:00",
-        yield: {
-          quantity: undefined,
-          unit: "Serving",
-        },
+        yieldQuantity: null,
+        yieldUnit: "Serving",
         difficulty: "Easy",
         rating: 0,
         ingredients: [],
         instructions: [],
         combinations: [],
         notes: [],
-        isFavorite: false,
-        tried: true,
+        favorite: 0,
+        tried: 1,
         lastTried: null,
         lastModified: null,
         created: null,
-        inBag: false,
       },
       tempRecipe: {},
       tags: undefined,
       modalOpen: false,
-      newRecipeID: null,
+      // newRecipeID: null,
       saving: false,
       cacheImagePath: null,
       unSyncCombinations: [],
@@ -374,7 +381,6 @@ export default {
     ...mapActions([
       "setComponent",
       "addRecipeAction",
-      "overwriteRecipeAction",
       "addListItemAction",
       "unSyncCombinationsAction",
     ]),
@@ -416,7 +422,7 @@ export default {
     // PHOTO HANDLERS
     imageHandler() {
       this.clearEmptyFields(true);
-      if (this.recipe.imageSrc) {
+      if (this.recipe.image) {
         this.modalOpen = true;
         this.$showModal(ActionDialog, {
           props: {
@@ -430,7 +436,7 @@ export default {
               this.imagePicker();
               break;
             case "rp":
-              this.recipe.imageSrc = null;
+              this.recipe.image = null;
               break;
           }
         });
@@ -470,7 +476,7 @@ export default {
                   )
                   .then((cropped) => {
                     cropped.image.saveToFile(this.cacheImagePath, "jpg", 75);
-                    this.recipe.imageSrc = this.cacheImagePath;
+                    this.recipe.image = this.cacheImagePath;
                   });
               });
             }
@@ -574,7 +580,7 @@ export default {
           }).then((item) => {
             this.modalOpen = false;
             if (item.length) {
-              this.recipe.yield.unit = item;
+              this.recipe.yieldUnit = item;
               this.addListItemAction({
                 item,
                 listName: "yieldUnits",
@@ -585,12 +591,12 @@ export default {
         } else {
           this.modalOpen = false;
           if (action) {
-            this.recipe.yield.unit = action;
+            this.recipe.yieldUnit = action;
             if (focus) this.autoFocusField("difficultyLevel", false);
           } else
-            this.yieldUnits.includes(this.recipe.yield.unit)
+            this.yieldUnits.includes(this.recipe.yieldUnit)
               ? mull
-              : (this.recipe.yield.unit = "Serving");
+              : (this.recipe.yieldUnit = "Serving");
         }
       });
     },
@@ -731,7 +737,7 @@ export default {
     // SAVE OPERATION
     clearEmptyFields(bool) {
       if (!this.recipe.title && !bool) this.recipe.title = localize("untRec");
-      if (!this.recipe.yield.quantity) this.recipe.yield.quantity = 1;
+      if (!this.recipe.yieldQuantity) this.recipe.yieldQuantity = 1;
       this.recipe.ingredients = this.recipe.ingredients.filter((e) => e.item);
       let vm = this;
 
@@ -744,13 +750,10 @@ export default {
     saveOperation() {
       this.saving = this.modalOpen = true;
       this.clearEmptyFields();
-      this.recipe.lastModified = new Date();
+      this.recipe.lastModified = new Date().getTime();
       ApplicationSettings.setString("previousCuisine", this.recipe.cuisine);
       ApplicationSettings.setString("previousCategory", this.recipe.category);
-      ApplicationSettings.setString(
-        "previousYieldUnit",
-        this.recipe.yield.unit
-      );
+      ApplicationSettings.setString("previousYieldUnit", this.recipe.yieldUnit);
       if (this.cacheImagePath) {
         let recipeImage = path.join(
           knownFolders.documents().getFolder("EnRecipes").getFolder("Images")
@@ -759,18 +762,18 @@ export default {
         );
         let binarySource = File.fromPath(this.cacheImagePath).readSync();
         File.fromPath(recipeImage).writeSync(binarySource);
-        this.recipe.imageSrc = recipeImage;
+        this.recipe.image = recipeImage;
         knownFolders.temp().clear();
       }
-      if (this.recipe.imageSrc) {
+      if (this.recipe.image) {
         if (
-          this.tempRecipe.imageSrc &&
-          this.tempRecipe.imageSrc !== this.recipe.imageSrc
+          this.tempRecipe.image &&
+          this.tempRecipe.image !== this.recipe.image
         ) {
-          getFileAccess().deleteFile(this.tempRecipe.imageSrc);
+          getFileAccess().deleteFile(this.tempRecipe.image);
         }
-      } else if (this.tempRecipe.imageSrc) {
-        getFileAccess().deleteFile(this.tempRecipe.imageSrc);
+      } else if (this.tempRecipe.image) {
+        getFileAccess().deleteFile(this.tempRecipe.image);
       }
       this.unSyncCombinationsAction({
         id: this.recipeID,
@@ -779,18 +782,7 @@ export default {
       this.saveRecipe();
     },
     saveRecipe() {
-      if (this.recipeID) {
-        this.overwriteRecipeAction({
-          id: this.recipeID,
-          recipe: this.recipe,
-        });
-      } else {
-        this.recipe.id = this.newRecipeID;
-        this.addRecipeAction({
-          id: this.newRecipeID,
-          recipe: this.recipe,
-        });
-      }
+      this.addRecipeAction(this.recipe);
       setTimeout(() => (this.saving = false), 100);
       this.$navigateBack();
     },
@@ -819,6 +811,27 @@ export default {
         }, 100);
       });
     },
+    hideUndoBar({ object }) {
+      object
+        .animate({
+          opacity: 0,
+          translate: { x: 0, y: 64 },
+          duration: 250,
+          curve: CoreTypes.AnimationCurve.ease,
+        })
+        .then(() => {
+          this.showUndo = false;
+          this.appbar.translateY = 64;
+          this.appbar.animate({
+            translate: { x: 0, y: 0 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+          object.opacity = 1;
+          object.translateY = 0;
+          clearTimeout(undoTimer);
+        });
+    },
     undoDel() {
       this.undo = true;
     },
@@ -910,7 +923,7 @@ export default {
       let t = this.recipe[time].split(":");
       let hr = t[0];
       let min = t[1];
-      this.$showModal(ListPicker, {
+      this.$showModal(TimePicker, {
         props: {
           title: `${time == "prepTime" ? "prepT" : "cookT"}`,
           action: "SET",
@@ -1001,15 +1014,15 @@ export default {
         this.tags = this.selectedTag;
         this.splitTags();
       }
-      this.recipe.yield.unit = ApplicationSettings.getString(
+      this.recipe.yieldUnit = ApplicationSettings.getString(
         "previousYieldUnit",
         "Serving"
       );
-      if (this.filterFavourites) this.recipe.isFavorite = true;
+      if (this.filterFavourites) this.recipe.favorite = true;
       if (this.filterTrylater) this.recipe.tried = false;
-      this.recipe.created = new Date();
+      this.recipe.created = new Date().getTime();
       Object.assign(this.tempRecipe, JSON.parse(JSON.stringify(this.recipe)));
-      this.newRecipeID = this.getRandomID();
+      // this.newRecipeID = this.getRandomID();
     }
   },
 };
diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue
index 3df6dcda..795e85e6 100644
--- a/app/components/EnRecipes.vue
+++ b/app/components/EnRecipes.vue
@@ -12,7 +12,7 @@
           @scroll="!selectMode && onScroll($event)"
         >
           <v-template name="header">
-            <GridLayout rows="auto" columns="*, auto, 12">
+            <GridLayout rows="auto" columns="*, auto, 8">
               <Label class="pageTitle" :text="`${currentComponent}` | L" />
               <Button
                 col="1"
@@ -78,8 +78,8 @@
               <Image
                 class="imgHolder"
                 verticalAlignment="center"
-                v-if="recipe.imageSrc"
-                :src="recipe.imageSrc"
+                v-if="recipe.image"
+                :src="recipe.image"
                 stretch="none"
                 decodeWidth="96"
                 decodeHeight="96"
@@ -143,8 +143,8 @@
             >
               <Image
                 class="imgHolder"
-                v-if="recipe.imageSrc"
-                :src="recipe.imageSrc"
+                v-if="recipe.image"
+                :src="recipe.image"
                 stretch="aspectFit"
                 :decodeWidth="imgWidth"
                 :decodeHeight="imgWidth"
@@ -198,8 +198,8 @@
             >
               <Image
                 class="imgHolder"
-                v-if="recipe.imageSrc"
-                :src="recipe.imageSrc"
+                v-if="recipe.image"
+                :src="recipe.image"
                 stretch="aspectFit"
                 :decodeWidth="imgWidth"
                 :decodeHeight="imgWidth"
@@ -311,11 +311,20 @@
         </GridLayout>
         <GridLayout
           row="1"
-          rows="auto"
+          rows="auto, auto"
           columns="auto"
           class="appbar toolbar"
           :hidden="!showTools"
         >
+          <GridLayout
+            rows="48"
+            class="tool"
+            columns="auto, *"
+            @touch="touchTool($event, CookingTimer, 'CookingTimer')"
+          >
+            <Label class="ico" :text="icon.timer" />
+            <Label col="1" :text="'timer' | L" />
+          </GridLayout>
           <GridLayout
             row="1"
             rows="48"
@@ -416,10 +425,12 @@ import {
   startAccelerometerUpdates,
   stopAccelerometerUpdates,
 } from "@triniwiz/nativescript-accelerometer";
+
 import { mapActions, mapState } from "vuex";
 import ViewRecipe from "./ViewRecipe";
 import EditRecipe from "./EditRecipe";
 import MealPlanner from "./MealPlanner";
+import CookingTimer from "./CookingTimer";
 import GroceryList from "./GroceryList";
 import Settings from "./Settings";
 import ActionDialog from "./modal/ActionDialog.vue";
@@ -445,9 +456,10 @@ export default {
       scrollPos: 1,
       filterFavourites: false,
       filterTrylater: false,
-      MealPlanner: MealPlanner,
-      GroceryList: GroceryList,
       Settings: Settings,
+      MealPlanner: MealPlanner,
+      CookingTimer: CookingTimer,
+      GroceryList: GroceryList,
       topmenu: [
         {
           title: "EnRecipes",
@@ -465,13 +477,6 @@ export default {
       showTools: false,
     };
   },
-  components: {
-    ViewRecipe,
-    EditRecipe,
-    MealPlanner,
-    GroceryList,
-    Settings,
-  },
   computed: {
     ...mapState([
       "icon",
@@ -488,6 +493,7 @@ export default {
       "selectedCategory",
       "selectedTag",
       "appTheme",
+      "timerSound",
     ]),
     filteredRecipes() {
       let vm = this;
@@ -501,7 +507,7 @@ export default {
         return this.recipes
           .filter(
             (e) =>
-              e.isFavorite &&
+              e.favorite &&
               (e.title.toLowerCase().includes(this.searchQuery) ||
                 getIngredients(e))
           )
@@ -557,16 +563,16 @@ export default {
       "setFirstDay",
       "setLayout",
       "setSortType",
-      "deleteRecipeAction",
-      "deleteRecipesAction",
+      "deleteRecipes",
       "clearFilter",
       "setTheme",
+      "setTimerSound",
     ]),
     onFrameLoad() {
       const View = android.view.View;
       const window = Application.android.startActivity.getWindow();
       const decorView = window.getDecorView();
-      let sdkv = Device.sdkVersion;
+      let sdkv = Device.sdkVersion * 1;
       function setColors(color) {
         window.setStatusBarColor(new Color(color).android);
         sdkv >= 27 && window.setNavigationBarColor(new Color(color).android);
@@ -694,7 +700,7 @@ export default {
           ],
         },
       }).then((action) => {
-        if (action && action !== "Cancel" && this.sortType !== action) {
+        if (action && this.sortType !== action) {
           this.setSortType(action);
           ApplicationSettings.setString("sortType", action);
           this.updateSort();
@@ -733,53 +739,35 @@ export default {
       this.listview.refresh();
     },
     deleteSelection() {
-      this.selection.length === 1
-        ? this.deleteRecipe(this.selection[0])
-        : this.deleteRecipes(this.selection);
+      this.deletionDialogActive = true;
+      let hasMany = this.selection.length > 1;
+      let what = hasMany
+        ? `${this.selection.length} ${localize("recs")}`
+        : `"${
+            this.recipes[
+              this.recipes.findIndex((e) => e.id === this.selection[0])
+            ].title
+          }"`;
+      this.$showModal(ConfirmDialog, {
+        props: {
+          title: localize("conf"),
+          description: `${localize(
+            hasMany ? "delRecsInfo" : "delRecInfo",
+            what
+          )}`,
+          cancelButtonText: "cBtn",
+          okButtonText: "dBtn",
+        },
+      }).then((action) => {
+        if (action) {
+          this.deleteRecipes(this.selection);
+          if (!this.filteredRecipes.length) this.goToHome();
+          this.clearSelection();
+        }
+        this.deletionDialogActive = false;
+      });
     },
     exportSelection() {},
-    deleteRecipe(id) {
-      this.deletionDialogActive = true;
-      let index = this.recipes.findIndex((e) => e.id === id);
-      let recipeTitle = `"${this.recipes[index].title}"`;
-      this.$showModal(ConfirmDialog, {
-        props: {
-          title: localize("conf"),
-          description: `${localize("delRecInfo", recipeTitle)}`,
-          cancelButtonText: "cBtn",
-          okButtonText: "dBtn",
-        },
-      }).then((action) => {
-        if (action) {
-          this.deleteRecipeAction({
-            index,
-            id,
-          });
-          if (!this.filteredRecipes.length) this.goToHome();
-          this.clearSelection();
-        }
-        this.deletionDialogActive = false;
-      });
-    },
-    deleteRecipes(idsArr) {
-      this.deletionDialogActive = true;
-      let selectionCount = `${this.selection.length} ${localize("recs")}`;
-      this.$showModal(ConfirmDialog, {
-        props: {
-          title: localize("conf"),
-          description: `${localize("delRecsInfo", selectionCount)}`,
-          cancelButtonText: "cBtn",
-          okButtonText: "dBtn",
-        },
-      }).then((action) => {
-        if (action) {
-          this.deleteRecipesAction(idsArr);
-          if (!this.filteredRecipes.length) this.goToHome();
-          this.clearSelection();
-        }
-        this.deletionDialogActive = false;
-      });
-    },
 
     // SHAKE DETECTOR
     onSensorData({ x, y, z }) {
@@ -836,7 +824,7 @@ export default {
           count = this.recipes.filter((e) => !e.tried).length;
           break;
         case "favourites":
-          count = this.recipes.filter((e) => e.isFavorite).length;
+          count = this.recipes.filter((e) => e.favorite).length;
           break;
         default:
           count = this.recipes.filter((e) => {
@@ -1089,12 +1077,10 @@ export default {
   },
   created() {
     this.setTheme(ApplicationSettings.getString("appTheme", "sysDef"));
-    this.setLayout(ApplicationSettings.getString("layout", "detailed"));
     if (!this.recipes.length) this.initRecipes();
+    this.initMealPlans();
     this.initListItems();
-    if (!this.mealPlans.length) this.initMealPlans();
-    this.setShake(ApplicationSettings.getBoolean("shakeEnabled", true));
-    this.setFirstDay(ApplicationSettings.getBoolean("mondayFirst", false));
+    if (!this.timerSound.title) this.setTimerSound(utils.getTones()[0]);
   },
 };
 </script>
diff --git a/app/components/MealPlanner.vue b/app/components/MealPlanner.vue
index c487e932..1a4d2aa5 100644
--- a/app/components/MealPlanner.vue
+++ b/app/components/MealPlanner.vue
@@ -7,7 +7,15 @@
         scrollBarIndicatorVisible="false"
       >
         <StackLayout>
-          <Label class="pageTitle" :text="'planner' | L" />
+          <GridLayout rows="auto" columns="*, auto, 8">
+            <Label class="pageTitle" :text="'planner' | L" />
+            <Button
+              col="1"
+              class="ico"
+              :text="icon.cog"
+              @tap="$navigateTo(MPSettings)"
+            />
+          </GridLayout>
           <GridLayout
             class="calendar"
             columns="*, *, *, *, *, *, *"
@@ -117,6 +125,7 @@
         class="appbar snackBar"
         :hidden="!showUndo"
         columns="auto, *, auto"
+        @swipe="hideUndoBar"
       >
         <Button :text="countdown" class="ico countdown tb" />
         <Label class="title" col="1" :text="snackMsg | L" />
@@ -127,16 +136,16 @@
 </template>
 
 <script>
-import { ApplicationSettings, Observable, CoreTypes } from "@nativescript/core";
+import { Observable, CoreTypes } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
 import ViewRecipe from "./ViewRecipe.vue";
+import MPSettings from "./Settings/MPSettings.vue";
 import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
 let undoTimer;
 
 export default {
   data() {
     return {
-      appTheme: "Light",
       mealTimes: ["breakfast", "lunch", "dinner", "snacks"],
       dNames: ["MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"],
       year: 2021,
@@ -163,6 +172,7 @@ export default {
       snackMsg: null,
       showUndo: false,
       undo: false,
+      MPSettings: MPSettings,
     };
   },
   computed: {
@@ -181,8 +191,9 @@ export default {
       } else return 0;
     },
     getDayNames() {
-      if (!this.mondayFirst) this.dNames.unshift(this.dNames.pop());
-      return this.dNames;
+      let dNames = [...this.dNames];
+      if (!this.mondayFirst) dNames.unshift(dNames.pop());
+      return dNames;
     },
     getCal() {
       let y = this.year;
@@ -316,12 +327,11 @@ export default {
     setToday(date) {
       if (date) this.today = date;
     },
-    newMealPlan(title, date, type, index) {
+    newMealPlan(date, type, title) {
       this.addMealPlanAction({
-        title,
         date: date ? date : this.todaysTime,
         type,
-        index,
+        title,
       });
     },
     toggleEditMode() {
@@ -337,25 +347,17 @@ export default {
           title: "selRec",
           recipes: filteredRecipes,
         },
-      }).then((title) => {
-        title && this.newMealPlan(title, null, type, null);
-      });
+      }).then((title) => title && this.newMealPlan(null, type, title));
     },
     removeRecipe(title, type) {
       let date = this.todaysTime;
-      let index = this.mealPlans.findIndex(
-        (e) => e.title === title && e.type === type && e.date === date
-      );
       let mealPlan = {
-        title,
         date,
         type,
-        index,
+        title,
       };
       this.deleteMealPlanAction(mealPlan);
-      this.showUndoBar("recRm").then((res) =>
-        this.newMealPlan(title, date, type, index)
-      );
+      this.showUndoBar("recRm").then(() => this.newMealPlan(date, type, title));
     },
     showUndoBar(message) {
       return new Promise((resolve, reject) => {
@@ -379,12 +381,30 @@ export default {
         }, 100);
       });
     },
+    hideUndoBar({ object }) {
+      object
+        .animate({
+          opacity: 0,
+          translate: { x: 0, y: 64 },
+          duration: 250,
+          curve: CoreTypes.AnimationCurve.ease,
+        })
+        .then(() => {
+          this.showUndo = false;
+          this.appbar.translateY = 64;
+          this.appbar.animate({
+            translate: { x: 0, y: 0 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+          object.opacity = 1;
+          object.translateY = 0;
+          clearTimeout(undoTimer);
+        });
+    },
     undoDel() {
       this.undo = true;
     },
   },
-  created() {
-    this.appTheme = ApplicationSettings.getString("appTheme", "Light");
-  },
 };
 </script>
diff --git a/app/components/Settings/CTSettings.vue b/app/components/Settings/CTSettings.vue
index 7c801bf5..0a78eb33 100644
--- a/app/components/Settings/CTSettings.vue
+++ b/app/components/Settings/CTSettings.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { Observable } from "@nativescript/core";
+import { Observable, Device } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
 import { localize } from "@nativescript/localize";
 import ActionDialog from "../modal/ActionDialog.vue";
diff --git a/app/components/Settings/Database.vue b/app/components/Settings/Database.vue
index 1496a165..75dd6938 100644
--- a/app/components/Settings/Database.vue
+++ b/app/components/Settings/Database.vue
@@ -67,15 +67,17 @@ import {
   ApplicationSettings,
   path,
   knownFolders,
+  AndroidApplication,
   File,
   Folder,
   Observable,
   Application,
+  getFileAccess,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import ConfirmDialog from "../modal/ConfirmDialog.vue";
 import { mapState, mapActions } from "vuex";
-
+import { openOrCreate } from "@akylas/nativescript-sqlite";
 import * as utils from "~/shared/utils";
 
 export default {
@@ -124,9 +126,11 @@ export default {
   },
   methods: {
     ...mapActions([
-      "importListItemsAction",
-      "importRecipesAction",
-      "importMealPlansAction",
+      "importListItems",
+      "importRecipesFromJSON",
+      "importRecipesFromDB",
+      "importMealPlansFromJSON",
+      "importMealPlansFromDB",
       "unlinkBrokenImages",
       "clearImportSummary",
     ]),
@@ -185,7 +189,7 @@ export default {
     },
     exportBackup() {
       this.progress = localize("expip");
-      this.exportFiles("create");
+      this.hijackBackEvent();
       let date = new Date();
       let formattedDate =
         date.getFullYear() +
@@ -198,6 +202,9 @@ export default {
         ("0" + date.getMinutes()).slice(-2) +
         ("0" + date.getSeconds()).slice(-2);
 
+      // Copy db file to EnRecipes folder
+      utils.copyDBToExport();
+
       let filename = `${localize("EnRecipes")}_${formattedDate}.zip`;
       let fromPath = path.join(knownFolders.documents().path, "EnRecipes");
       utils.Zip.zip(fromPath, this.backupFolder, filename)
@@ -205,61 +212,20 @@ export default {
         .catch((err) => {
           console.log("Backup error: ", err);
           this.progress = null;
+          this.releaseBackEvent();
           this.setBackupFolder(true);
         });
     },
-    exportFiles(option) {
-      const folder = path.join(knownFolders.documents().path, "EnRecipes");
-      const EnRecipesFile = File.fromPath(path.join(folder, "recipes.json"));
-      let userCuisinesFile,
-        userCategoriesFile,
-        userYieldUnitsFile,
-        userUnitsFile,
-        mealPlansFile;
-      if (this.cuisines.length)
-        userCuisinesFile = File.fromPath(
-          path.join(folder, "userCuisines.json")
-        );
-      if (this.categories.length)
-        userCategoriesFile = File.fromPath(
-          path.join(folder, "userCategories.json")
-        );
-      if (this.yieldUnits.length)
-        userYieldUnitsFile = File.fromPath(
-          path.join(folder, "userYieldUnits.json")
-        );
-      if (this.units.length)
-        userUnitsFile = File.fromPath(path.join(folder, "userUnits.json"));
-      if (this.mealPlans.length)
-        mealPlansFile = File.fromPath(path.join(folder, "mealPlans.json"));
-      switch (option) {
-        case "create":
-          this.writeDataToFile(EnRecipesFile, this.recipes);
-          this.cuisines.length &&
-            this.writeDataToFile(userCuisinesFile, this.cuisines);
-          this.categories.length &&
-            this.writeDataToFile(userCategoriesFile, this.categories);
-          this.yieldUnits.length &&
-            this.writeDataToFile(userYieldUnitsFile, this.yieldUnits);
-          this.units.length && this.writeDataToFile(userUnitsFile, this.units);
-          this.mealPlans.length &&
-            this.writeDataToFile(mealPlansFile, this.mealPlans);
-          break;
-        case "delete":
-          EnRecipesFile.remove();
-          this.cuisines.length && userCuisinesFile.remove();
-          this.categories.length && userCategoriesFile.remove();
-          this.yieldUnits.length && userYieldUnitsFile.remove();
-          this.units.length && userUnitsFile.remove();
-          this.mealPlans.length && mealPlansFile.remove();
-          break;
-      }
-    },
-    writeDataToFile(file, data) {
-      file.writeText(JSON.stringify(data));
-    },
     showExportSummary(filename) {
+      // delete copied db file
+      getFileAccess().deleteFile(
+        path.join(
+          knownFolders.documents().getFolder("EnRecipes").path,
+          "EnRecipes.db"
+        )
+      );
       this.progress = null;
+      this.releaseBackEvent();
       let description = localize("buto", `"${filename}"`);
       this.$showModal(ConfirmDialog, {
         props: {
@@ -281,63 +247,77 @@ export default {
         }
       });
     },
-    validateZipContent(extractedFolderPath, uri) {
+    validateZipContent(dest, uri) {
       this.progress = localize("impip");
-      let cacheFolderPath = extractedFolderPath + "/EnRecipes";
-      const EnRecipesFilePath = cacheFolderPath + "/recipes.json";
-      const ImagesFolderPath = cacheFolderPath + "/Images";
-      const userCuisinesFilePath = cacheFolderPath + "/userCuisines.json";
-      const userCategoriesFilePath = cacheFolderPath + "/userCategories.json";
-      const userYieldUnitsFilePath = cacheFolderPath + "/userYieldUnits.json";
-      const userUnitsFilePath = cacheFolderPath + "/userUnits.json";
-      const mealPlansFilePath = cacheFolderPath + "/mealPlans.json";
-      if (Folder.exists(cacheFolderPath)) {
-        this.isFileDataValid([
-          {
-            path: EnRecipesFilePath,
-            db: "EnRecipesDB",
-            file: "recipes.json",
-          },
-          {
-            path: userCuisinesFilePath,
-            db: "userCuisinesDB",
-            file: "userCuisines.json",
-          },
-          {
-            path: userCategoriesFilePath,
-            db: "userCategoriesDB",
-            file: "userCategories.json",
-          },
-          {
-            path: userYieldUnitsFilePath,
-            db: "userYieldUnitsDB",
-            file: "userYieldUnits.json",
-          },
-          {
-            path: userUnitsFilePath,
-            db: "userUnitsDB",
-            file: "userUnits.json",
-          },
-          {
-            path: mealPlansFilePath,
-            db: "mealPlansDB",
-            file: "mealPlans.json",
-          },
-        ]);
+      this.hijackBackEvent();
+      let cache = dest + "/EnRecipes";
+      const recipesDB = cache + "/EnRecipes.db";
+      const recipes = cache + "/recipes.json";
+      const images = cache + "/Images";
+      const userCuisines = cache + "/userCuisines.json";
+      const userCategories = cache + "/userCategories.json";
+      const userYieldUnits = cache + "/userYieldUnits.json";
+      const userUnits = cache + "/userUnits.json";
+      const mealPlans = cache + "/mealPlans.json";
+      let vm = this;
+      // IMPORT IMAGES FINALLY
+      function importImages() {
         const timer = setInterval(() => {
-          if (!this.progress) clearInterval(timer);
-          if (this.progress && this.importSummary.found) {
-            Folder.exists(ImagesFolderPath)
-              ? this.importImages(uri)
-              : this.showImportSummary();
+          if (!vm.progress) clearInterval(timer);
+          if (vm.progress && vm.importSummary.found) {
+            Folder.exists(images)
+              ? vm.importImages(uri)
+              : vm.showImportSummary();
           }
         }, 100);
+      }
+      if (Folder.exists(cache)) {
+        if (File.exists(recipesDB)) {
+          // IMPORT FROM DB FILE
+          this.extractData(recipesDB);
+          importImages();
+        } else if (File.exists(recipes)) {
+          // IMPORT FROM JSON FILES
+          this.isFileDataValid([
+            {
+              path: recipes,
+              db: "recipes",
+              file: "recipes.json",
+            },
+            {
+              path: userCuisines,
+              db: "userCuisines",
+              file: "userCuisines.json",
+            },
+            {
+              path: userCategories,
+              db: "userCategories",
+              file: "userCategories.json",
+            },
+            {
+              path: userYieldUnits,
+              db: "userYieldUnits",
+              file: "userYieldUnits.json",
+            },
+            {
+              path: userUnits,
+              db: "userUnits",
+              file: "userUnits.json",
+            },
+            {
+              path: mealPlans,
+              db: "mealPlans",
+              file: "mealPlans.json",
+            },
+          ]);
+          importImages();
+        } else this.failedImport(localize("buEmp"));
       } else this.failedImport(localize("buInc"));
     },
     isFileDataValid(file) {
       const files = file.filter((e) => File.exists(e.path));
       if (files.length) {
-        let isValid = files.map((e) => false);
+        let isValid = files.map(() => false);
         files.forEach((file, i) => {
           File.fromPath(file.path)
             .readText()
@@ -354,7 +334,7 @@ export default {
                   File.fromPath(file.path)
                     .readText()
                     .then((data) => {
-                      this.importDataToDB(JSON.parse(data), file.db);
+                      this.importData(JSON.parse(data), file.db);
                     });
                 });
               }
@@ -364,6 +344,7 @@ export default {
     },
     failedImport(description) {
       this.progress = null;
+      this.releaseBackEvent();
       knownFolders.temp().clear();
       this.$showModal(ConfirmDialog, {
         props: {
@@ -381,37 +362,62 @@ export default {
       }
       return true;
     },
-    importDataToDB(data, db) {
+    extractData(recipesDB) {
+      const db = openOrCreate(recipesDB);
+
+      // Import recipes
+      db.select(`SELECT * FROM recipes`).then((res) => {
+        this.importRecipesFromDB(res);
+      });
+
+      // Import listitems
+      db.select(
+        `SELECT cuisines, categories, yieldUnits, units FROM lists`
+      ).then((res) =>
+        Object.keys(res[0]).forEach((listName) =>
+          this.importListItems({
+            data: JSON.parse(res[0][listName]),
+            listName,
+          })
+        )
+      );
+
+      // Import mealPlans
+      db.select(`SELECT * FROM mealPlans`).then((res) =>
+        this.importMealPlansFromDB(res)
+      );
+    },
+    importData(data, db) {
       switch (db) {
-        case "EnRecipesDB":
-          this.importRecipesAction(data);
+        case "recipes":
+          this.importRecipesFromJSON(data);
           break;
-        case "userCuisinesDB":
-          this.importListItemsAction({
+        case "userCuisines":
+          this.importListItems({
             data,
             listName: "cuisines",
           });
           break;
-        case "userCategoriesDB":
-          this.importListItemsAction({
+        case "userCategories":
+          this.importListItems({
             data,
             listName: "categories",
           });
           break;
-        case "userYieldUnitsDB":
-          this.importListItemsAction({
+        case "userYieldUnits":
+          this.importListItems({
             data,
             listName: "yieldUnits",
           });
           break;
-        case "userUnitsDB":
-          this.importListItemsAction({
+        case "userUnits":
+          this.importListItems({
             data,
             listName: "units",
           });
           break;
-        case "mealPlansDB":
-          this.importMealPlansAction(data);
+        case "mealPlans":
+          this.importMealPlansFromJSON(data);
           break;
       }
     },
@@ -420,6 +426,16 @@ export default {
       Folder.fromPath(destPath);
       utils.Zip.unzip(uri, destPath).then((res) => {
         if (res) {
+          // delete unzipped json files
+          Folder.fromPath(path.join(destPath, "EnRecipes"))
+            .getEntities()
+            .then((entities) => {
+              entities.forEach((entity) => {
+                if (/.json|.db/.test(entity._extension))
+                  File.fromPath(entity._path).remove();
+              });
+            });
+
           this.showImportSummary();
           this.unlinkBrokenImages();
         }
@@ -427,8 +443,8 @@ export default {
     },
     showImportSummary() {
       this.progress = null;
+      this.releaseBackEvent();
       knownFolders.temp().clear();
-      this.exportFiles("delete");
       let { found, imported, updated } = this.importSummary;
       let exists = Math.abs(found - imported - updated) + updated;
       let importedNote = `\n${localize("recI")} ${imported}`;
@@ -445,6 +461,23 @@ export default {
       }).then(() => this.clearImportSummary());
     },
 
+    // NAVIGATION HANDLERS
+    hijackBackEvent() {
+      AndroidApplication.on(
+        AndroidApplication.activityBackPressedEvent,
+        this.backEvent
+      );
+    },
+    releaseBackEvent() {
+      AndroidApplication.off(
+        AndroidApplication.activityBackPressedEvent,
+        this.backEvent
+      );
+    },
+    backEvent(args) {
+      args.cancel = true;
+    },
+
     // HELPERS
     touch({ object, action }, method) {
       object.className = action.match(/down|move/) ? "option fade" : "option";
diff --git a/app/components/Settings/Interface.vue b/app/components/Settings/Interface.vue
index df2b6498..38caf114 100644
--- a/app/components/Settings/Interface.vue
+++ b/app/components/Settings/Interface.vue
@@ -97,7 +97,7 @@ export default {
           list: [...languages],
         },
       }).then((action) => {
-        if (action && action !== "Cancel" && this.appLanguage !== action) {
+        if (action && this.appLanguage !== action) {
           let currentLocale = Device.language.split("-")[0];
           let locale = this.language.filter((e) => e.title === action)[0]
             .locale;
@@ -148,7 +148,7 @@ export default {
           list: ["detailed", "grid", "photogrid", "simple", "minimal"],
         },
       }).then((action) => {
-        if (action && action !== "Cancel" && this.layoutMode !== action) {
+        if (action && this.layoutMode !== action) {
           let act = action.toLowerCase();
           ApplicationSettings.setString("layout", act);
           this.setLayout(act);
diff --git a/app/components/Settings/MPSettings.vue b/app/components/Settings/MPSettings.vue
new file mode 100644
index 00000000..44f39648
--- /dev/null
+++ b/app/components/Settings/MPSettings.vue
@@ -0,0 +1,75 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        for="item in items"
+      >
+        <v-template if="$index == 0">
+          <Label class="pageTitle" :text="'Settings' | L" />
+        </v-template>
+        <v-template if="item.type == 'switch'">
+          <GridLayout columns="auto, *, auto" class="option">
+            <Label class="ico" :text="icon[item.icon]" />
+            <StackLayout col="1" verticalAlignment="center">
+              <Label :text="item.title | L" class="info" />
+              <Label
+                v-if="item.subTitle"
+                :text="item.subTitle | L"
+                class="sub"
+              />
+            </StackLayout>
+            <Switch
+              :color="item.checked ? '#ff5200' : '#adb5bd'"
+              col="2"
+              :checked="item.checked"
+              @checkedChange="item.action"
+            />
+          </GridLayout>
+        </v-template>
+        <v-template>
+          <StackLayout class="listSpace"> </StackLayout>
+        </v-template>
+      </ListView>
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+
+export default {
+  computed: {
+    ...mapState(["icon", "mondayFirst"]),
+    items() {
+      return [
+        {},
+        {
+          type: "switch",
+          icon: "week",
+          title: "swm",
+          checked: this.mondayFirst,
+          action: this.toggleFirstDay,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setFirstDay"]),
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    toggleFirstDay({ object }) {
+      this.setFirstDay(object.checked);
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Options.vue b/app/components/Settings/Options.vue
index 892434c6..242540bb 100644
--- a/app/components/Settings/Options.vue
+++ b/app/components/Settings/Options.vue
@@ -71,7 +71,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["icon", "shakeEnabled", "mondayFirst"]),
+    ...mapState(["icon", "shakeEnabled"]),
     items() {
       return [
         {},
@@ -83,26 +83,16 @@ export default {
           checked: this.shakeEnabled,
           action: this.toggleShake,
         },
-        {
-          type: "switch",
-          icon: "week",
-          title: "swm",
-          checked: this.mondayFirst,
-          action: this.toggleFirstDay,
-        },
         {},
       ];
     },
   },
   methods: {
-    ...mapActions(["setShake", "setFirstDay"]),
+    ...mapActions(["setShake"]),
     onPageLoad(args) {
       const page = args.object;
       page.bindingContext = new Observable();
     },
-    toggleFirstDay({ object }) {
-      this.setFirstDay(object.checked);
-    },
     // SHAKE VIEW RANDOM RECIPE
     toggleShake({ object }) {
       let checked = object.checked;
diff --git a/app/components/Settings/Reset.vue b/app/components/Settings/Reset.vue
index a07468bf..5c6547b4 100644
--- a/app/components/Settings/Reset.vue
+++ b/app/components/Settings/Reset.vue
@@ -31,7 +31,7 @@
         v-show="!toast"
         row="1"
         class="appbar"
-        rows="*"
+        @loaded="onAppBarLoad"
         columns="auto, *"
       >
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
@@ -42,7 +42,7 @@
         colSpan="2"
         class="appbar snackBar"
         columns="*"
-        @tap="toast = null"
+        @swipe="hideToast"
       >
         <FlexboxLayout minHeight="48" alignItems="center">
           <Label class="title msg" :text="toast" />
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import { Observable } from "@nativescript/core";
+import { Observable, CoreTypes } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
 import * as utils from "~/shared/utils";
@@ -61,6 +61,7 @@ export default {
   data() {
     return {
       toast: null,
+      appbar: null,
     };
   },
   computed: {
@@ -95,14 +96,41 @@ export default {
       const page = args.object;
       page.bindingContext = new Observable();
     },
+    onAppBarLoad({ object }) {
+      this.appbar = object;
+    },
     // RESET
     resetListItems(listName) {
       this.resetListItemsAction(listName);
+      this.showToast();
+    },
+    showToast() {
       this.toast = localize("restDone");
       utils.timer(5, (val) => {
         if (!val) this.toast = val;
       });
     },
+    hideToast({ object }) {
+      object
+        .animate({
+          opacity: 0,
+          translate: { x: 0, y: 64 },
+          duration: 250,
+          curve: CoreTypes.AnimationCurve.ease,
+        })
+        .then(() => {
+          this.showUndo = false;
+          this.appbar.translateY = 64;
+          this.appbar.animate({
+            translate: { x: 0, y: 0 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+          object.opacity = 1;
+          object.translateY = 0;
+          this.toast = null;
+        });
+    },
     touch({ object, action }, type) {
       object.className = action.match(/down|move/) ? "option fade" : "option";
       if (action == "up") this.resetListItems(type);
diff --git a/app/components/SingleTimer.vue b/app/components/SingleTimer.vue
new file mode 100644
index 00000000..c238da96
--- /dev/null
+++ b/app/components/SingleTimer.vue
@@ -0,0 +1,196 @@
+<template>
+  <GridLayout
+    rows="auto, auto"
+    columns="auto, *, auto, auto, auto"
+    class="singleTimer"
+  >
+    <Button
+      class="ico"
+      :class="{ blink: done }"
+      :text="done ? icon.ring : timer.isPaused ? icon.start : icon.pause"
+      @tap="!done && toggleProgress()"
+    />
+    <StackLayout col="1" class="info" :colSpan="timer.isPaused ? 1 : 2">
+      <Label :text="timer.label" class="tb title tw" />
+      <Label
+        @touch="!timer.recipeID && touch($event)"
+        :text="getRecipeTitle"
+        class="recipeTitle"
+        :class="timer.recipeID ? 'sub' : 'clickable'"
+      />
+      <Label :text="formattedTime(timer.time)" />
+    </StackLayout>
+    <Button
+      col="2"
+      class="ico"
+      :hidden="(!timer.isPaused || progress == 0) && !done"
+      :text="icon.reset"
+      @tap="resetTimer"
+    />
+    <Button
+      col="3"
+      class="ico"
+      :hidden="timer.preset && !done"
+      @tap="done ? delay() : addPreset()"
+      :text="done ? icon.delay : icon.addTo"
+    />
+    <Button
+      col="4"
+      class="ico x"
+      :text="icon.x"
+      @tap="removeTimerItem(timerIndex, false)"
+    />
+    <Progress row="1" colSpan="5" :value="progress" />
+  </GridLayout>
+</template>
+
+<script>
+import { ApplicationSettings, Application } from "@nativescript/core";
+import { localize } from "@nativescript/localize";
+import { mapState, mapActions } from "vuex";
+import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
+import * as utils from "~/shared/utils";
+import { EventBus } from "~/main";
+
+export default {
+  props: [
+    "timer",
+    "timerIndex",
+    "formattedTime",
+    "removeTimer",
+    "addToPreset",
+    "togglePause",
+    "fireTimer",
+  ],
+  data() {
+    return {
+      progress: 0,
+      timerInt: this.timer.timerInterval,
+    };
+  },
+  computed: {
+    ...mapState(["icon", "recipes", "timerDelay"]),
+    getRecipeTitle() {
+      let { recipeID } = this.timer;
+      if (recipeID) {
+        let recipe = this.recipes.filter(
+          (e) => e.id === this.timer.recipeID
+        )[0];
+        return recipe
+          ? recipe.title
+          : `[ ${this.$options.filters.L("resNF")} ]`;
+      } else return localize("fwr");
+    },
+    done() {
+      return this.progress >= 100;
+    },
+    getTimeInSec() {
+      let t = this.timer.time.split(":");
+      return +t[0] * 60 * 60 + +t[1] * 60 + +t[2];
+    },
+  },
+  methods: {
+    ...mapActions(["removeActiveTimer", "updateActiveTimer", "addTimerPreset"]),
+    attachRecipe() {
+      this.$showModal(ActionDialogWithSearch, {
+        props: {
+          title: "selRec",
+          recipes: this.recipes,
+        },
+      }).then((recipeID) => {
+        let timer = this.timer;
+        timer.recipeID = recipeID;
+        this.updateActiveTimer(timer);
+      });
+    },
+    setProgress(progress, delay) {
+      this.progress = progress;
+      let timer = this.timer;
+      if (progress <= 100 && !timer.timerInterval) {
+        timer.timerInterval = setInterval(() => {
+          if (!this.timer.isPaused) {
+            this.progress += 100 / (delay + this.getTimeInSec);
+            ApplicationSettings.setNumber(
+              `${this.timer.id}progress`,
+              this.progress
+            );
+          }
+          if (this.progress >= 100) {
+            if (progress < 100) this.fireTimer(timer);
+            clearInterval(timer.timerInterval);
+            ApplicationSettings.remove(`${this.timer.id}delay`);
+          }
+        }, 1000);
+        this.updateActiveTimer(timer);
+      }
+    },
+    resetInterval() {
+      let timer = this.timer;
+      clearInterval(this.timer.timerInterval);
+      timer.timerInterval = null;
+      this.updateActiveTimer(timer);
+    },
+    resetTimer() {
+      this.resetInterval();
+      this.togglePause(this.timer, true);
+      ApplicationSettings.remove(`${this.timer.id}delay`);
+      this.setProgress(0, 0);
+      ApplicationSettings.setNumber(`${this.timer.id}progress`, 0);
+      this.clearNotification();
+    },
+    clearNotification() {
+      Application.android.unregisterBroadcastReceiver("timer" + this.timer.id);
+      utils.TimerNotification.clear(this.timer.id);
+    },
+    toggleProgress(bool) {
+      this.togglePause(this.timer, bool);
+      this.timer.isPaused
+        ? this.resetInterval()
+        : this.setProgress(
+            ApplicationSettings.getNumber(`${this.timer.id}progress`, 0),
+            ApplicationSettings.getNumber(`${this.timer.id}delay`, 0)
+          );
+    },
+    removeTimerItem(index, noUndo) {
+      this.resetInterval();
+      this.removeTimer(this.timer.id, index, noUndo);
+    },
+    addPreset() {
+      this.timer.preset = 1;
+      this.addToPreset(this.timer);
+    },
+    delay() {
+      let delayInS = this.timerDelay.split(" ")[0] * 60;
+      ApplicationSettings.setNumber(`${this.timer.id}delay`, delayInS);
+      let progress = (100 / delayInS) * this.getTimeInSec;
+      this.resetInterval();
+      this.setProgress(progress, delayInS);
+      this.clearNotification();
+    },
+
+    // HELPERS
+    touch({ object, action }) {
+      object.className = action.match(/down|move/)
+        ? "recipeTitle clickable fade"
+        : "recipeTitle clickable";
+      if (action == "up") this.attachRecipe();
+    },
+  },
+  mounted() {
+    this.setProgress(
+      ApplicationSettings.getNumber(`${this.timer.id}progress`, 0),
+      ApplicationSettings.getNumber(`${this.timer.id}delay`, 0)
+    );
+    EventBus.$on("timer" + this.timer.id, (e) => {
+      switch (e) {
+        case "stop":
+          this.resetTimer();
+          break;
+        case "delay":
+          this.delay();
+          break;
+      }
+    });
+  },
+};
+</script>
diff --git a/app/components/ViewRecipe.vue b/app/components/ViewRecipe.vue
index 49609b4c..39cdbdb5 100644
--- a/app/components/ViewRecipe.vue
+++ b/app/components/ViewRecipe.vue
@@ -26,8 +26,8 @@
           </StackLayout>
           <Image
             col="1"
-            v-if="recipe.imageSrc"
-            :src="recipe.imageSrc"
+            v-if="recipe.image"
+            :src="recipe.image"
             stretch="aspectFit"
             class="photo"
             decodeWidth="96"
@@ -81,8 +81,9 @@
                   <Label
                     @touch="touchYield"
                     class="value clickable"
+                    horizontalAlignment="left"
                     :text="`${tempYieldQuantity} ${$options.filters.L(
-                      recipe.yield.unit
+                      recipe.yieldUnit
                     )}`"
                   />
                 </StackLayout>
@@ -183,7 +184,7 @@
         @loaded="onAppBarLoad"
         class="appbar"
         v-show="!toast"
-        columns="auto, *, auto, auto, auto, auto"
+        columns="auto, *, auto, auto, auto, auto, auto"
       >
         <Button
           class="ico"
@@ -192,36 +193,42 @@
         />
         <Button
           col="2"
+          class="ico"
+          :text="icon.timer"
+          @tap="openCookingTimer"
+        />
+        <Button
+          col="3"
           v-if="!filterTrylater"
           class="ico"
           :text="recipe.tried ? icon.try : icon.tried"
           @tap="toggle('tried')"
         />
         <Button
-          col="2"
+          col="3"
           v-else
           class="ico"
           :text="icon.done"
-          @tap="recipeTried"
-        />
-        <Button
-          col="3"
-          class="ico"
-          :text="recipe.isFavorite ? icon.faved : icon.fav"
-          @tap="toggle('isFavorite')"
+          @tap="toggle('tried', true)"
         />
         <Button
           col="4"
+          class="ico"
+          :text="recipe.favorite ? icon.faved : icon.fav"
+          @tap="toggle('favorite')"
+        />
+        <Button
+          col="5"
           v-if="!busy"
           class="ico"
           :text="icon.edit"
           @tap="editRecipe"
         />
-        <ActivityIndicator col="4" v-else :busy="busy" />
+        <ActivityIndicator col="5" v-else :busy="busy" />
         <Button
+          col="6"
           class="ico fab"
           :text="icon.share"
-          col="5"
           @tap="shareHandler"
         />
       </GridLayout>
@@ -230,7 +237,7 @@
         row="1"
         class="appbar snackBar"
         columns="*"
-        @tap="toast = null"
+        @swipe="hideLastTried"
       >
         <FlexboxLayout minHeight="48" alignItems="center">
           <Label class="title msg" :text="toast" />
@@ -242,7 +249,7 @@
           backgroundColor="black"
           stretch="aspectFit"
           @loaded="onImgViewLoad"
-          :src="recipe.imageSrc"
+          :src="recipe.image"
           class="photoviewer"
         />
       </AbsoluteLayout>
@@ -262,10 +269,12 @@ import {
   Observable,
   Screen,
   CoreTypes,
+  Color,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 const intl = require("nativescript-intl");
 import { mapActions, mapState } from "vuex";
+import CookingTimer from "./CookingTimer.vue";
 import EditRecipe from "./EditRecipe.vue";
 import ActionDialog from "./modal/ActionDialog.vue";
 import PromptDialog from "./modal/PromptDialog.vue";
@@ -325,8 +334,6 @@ export default {
     ...mapActions([
       "toggleStateAction",
       "setComponent",
-      "overwriteRecipeAction",
-      "setRecipeAsTriedAction",
       "setRatingAction",
       "toggleCartAction",
     ]),
@@ -335,8 +342,8 @@ export default {
       page.bindingContext = new Observable();
       this.busy = this.photoOpen = false;
       this.setComponent("ViewRecipe");
-      if (this.yieldMultiplier == this.recipe.yield.quantity)
-        this.yieldMultiplier = this.recipe.yield.quantity;
+      if (this.yieldMultiplier == this.recipe.yieldQuantity)
+        this.yieldMultiplier = this.recipe.yieldQuantity;
       this.keepScreenOn(true);
       this.syncCombinations();
     },
@@ -374,7 +381,6 @@ export default {
     onStickyLoad({ object }) {
       this.sticky = object;
     },
-    // FIX: scroll not smooth
     fixTitle({ object }, swipeUp: boolean): void {
       let ingL = this.recipe.ingredients.length;
       let insL = this.recipe.instructions.length;
@@ -394,17 +400,6 @@ export default {
           { length: 4 },
           (v, i) => (v = arr[i] ? i < n : false)
         );
-        // this.sticky
-        //   .animate({
-        //     opacity: 0.5,
-        //     duration: 0,
-        //   })
-        //   .then(() => {
-        //     this.sticky.animate({
-        //       opacity: 1,
-        //       duration: 250,
-        //     });
-        //   });
       };
 
       if (swipeUp) {
@@ -469,7 +464,7 @@ export default {
     changeYield() {
       this.$showModal(PromptDialog, {
         props: {
-          title: `${localize("req", localize(this.recipe.yield.unit))}`,
+          title: `${localize("req", localize(this.recipe.yieldUnit))}`,
           placeholder: Math.abs(parseFloat(this.yieldMultiplier)),
           action: "SET",
         },
@@ -480,8 +475,7 @@ export default {
     hasTime(time) {
       return time != "00:00";
     },
-    niceDate(time) {
-      let lastTried = new Date(time).getTime();
+    niceDate(lastTried) {
       let now = new Date().getTime();
       let midnight = new Date().setHours(0, 0, 0, 0);
       let diff = (now - lastTried) / 1000;
@@ -506,19 +500,40 @@ export default {
         if (!val) this.toast = val;
       });
     },
+    hideLastTried({ object }) {
+      object
+        .animate({
+          opacity: 0,
+          translate: { x: 0, y: 64 },
+          duration: 250,
+          curve: CoreTypes.AnimationCurve.ease,
+        })
+        .then(() => {
+          this.showUndo = false;
+          this.appbar.translateY = 64;
+          this.appbar.animate({
+            translate: { x: 0, y: 0 },
+            duration: 250,
+            curve: CoreTypes.AnimationCurve.ease,
+          });
+          object.opacity = 1;
+          object.translateY = 0;
+          this.toast = null;
+        });
+    },
     // getMeasure(value: number, unit: string) {
     //   let vm = this;
     //   function roundedQ(val: number) {
     //     return Math.abs(
     //       Math.round(
-    //         (val / vm.recipe.yield.quantity) * vm.tempYieldQuantity * 100
+    //         (val / vm.recipe.yieldQuantity) * vm.tempYieldQuantity * 100
     //       ) / 100
     //     );
     //   }
     //   if (value) {
     //     let rounded = Math.abs(
     //       Math.round(
-    //         (value / this.recipe.yield.quantity) * this.tempYieldQuantity * 100
+    //         (value / this.recipe.yieldQuantity) * this.tempYieldQuantity * 100
     //       ) / 100
     //     );
     //     let lUnit = localize(unit);
@@ -551,7 +566,7 @@ export default {
     roundedQuantity(quantity: number) {
       return Math.abs(
         Math.round(
-          (quantity / this.recipe.yield.quantity) * this.tempYieldQuantity * 100
+          (quantity / this.recipe.yieldQuantity) * this.tempYieldQuantity * 100
         ) / 100
       );
     },
@@ -598,10 +613,10 @@ export default {
         )
         .map((e) => e.id);
       this.recipe.combinations = combinationForOtherRecipes;
-      this.overwriteRecipeAction({
-        id: this.currentRecipeID,
-        recipe: this.recipe,
-      });
+      // this.overwriteRecipeAction({
+      //   id: this.currentRecipeID,
+      //   recipe: this.recipe,
+      // });
     },
     touchIngredient({ object, action }, index) {
       object.className = action.match(/down|move/)
@@ -672,13 +687,13 @@ export default {
       this.currentRecipeID = combination;
       this.syncCombinations();
       this.createNotes();
-      this.yieldMultiplier = this.recipe.yield.quantity;
+      this.yieldMultiplier = this.recipe.yieldQuantity;
       this.recipe.tried && this.recipe.lastTried && this.showLastTried();
     },
 
     // SHARE ACTION
     shareHandler() {
-      if (this.recipe.imageSrc) {
+      if (this.recipe.image) {
         this.$showModal(ActionDialog, {
           props: {
             title: "shr",
@@ -690,7 +705,7 @@ export default {
               this.shareRecipe();
               break;
             case "pht":
-              ImageSource.fromFile(this.recipe.imageSrc).then((res) =>
+              ImageSource.fromFile(this.recipe.image).then((res) =>
                 utils.shareImage(res, localize("srpu"))
               );
               break;
@@ -718,7 +733,7 @@ export default {
           this.recipe.cookTime
         )}\n`;
       overview += `${localize("yld")}: ${this.tempYieldQuantity} ${localize(
-        this.recipe.yield.unit
+        this.recipe.yieldUnit
       )}\n${localize("Difficulty level")}: ${localize(
         this.recipe.difficulty
       )}\n`;
@@ -765,26 +780,18 @@ export default {
     },
 
     // DATA HANDLERS
-    toggle(key, setDate) {
+    toggle(key: string, setDate: boolean) {
       this.toggleStateAction({
         id: this.currentRecipeID,
-        recipe: this.recipe,
         key,
         setDate,
       });
-    },
-    recipeTried() {
-      this.setRecipeAsTriedAction({
-        id: this.currentRecipeID,
-        recipe: this.recipe,
-      });
-      this.$navigateBack();
+      if (setDate) this.$navigateBack();
     },
     setRating(rating) {
       if (rating !== this.recipe.rating || rating === 1) {
         this.setRatingAction({
           id: this.currentRecipeID,
-          recipe: this.recipe,
           rating,
         });
       }
@@ -797,7 +804,6 @@ export default {
       }
       this.toggleCartAction({
         id: this.currentRecipeID,
-        recipe: this.recipe,
       });
     },
 
@@ -855,7 +861,6 @@ export default {
       } else this.$navigateBack();
     },
     viewPhoto() {
-      // this.imgView.initNativeView();
       this.photoOpen = true;
       this.hijackBackEvent();
       let pv = this.imgView;
@@ -920,6 +925,14 @@ export default {
       this.photoOpen ? this.closePhoto() : this.$navigateBack();
     },
 
+    //TIMERS
+    openCookingTimer() {
+      this.$navigateTo(CookingTimer, {
+        props: {
+          recipeID: this.recipe.id,
+        },
+      });
+    },
     //HELPERS
     touchYield({ object, action }) {
       object.className = action.match(/down|move/)
@@ -933,7 +946,7 @@ export default {
     this.recipe.ingredients.forEach((e) => this.checks.push(false));
   },
   mounted() {
-    this.yieldMultiplier = this.recipe.yield.quantity;
+    this.yieldMultiplier = this.recipe.yieldQuantity;
     this.recipe.tried && this.recipe.lastTried && this.showLastTried();
   },
 };
diff --git a/app/components/modal/ActionDialogWithSearch.vue b/app/components/modal/ActionDialogWithSearch.vue
index 597851c1..7bff6e75 100644
--- a/app/components/modal/ActionDialogWithSearch.vue
+++ b/app/components/modal/ActionDialogWithSearch.vue
@@ -11,11 +11,7 @@
         v-if="filteredRecipes.length || searchQuery"
         class="input"
       >
-        <TextField
-          class="modalInput"
-          :hint="'ser' | L"
-          v-model="searchQuery"
-        />
+        <TextField class="modalInput" :hint="'ser' | L" v-model="searchQuery" />
       </StackLayout>
       <ListView row="2" for="recipe in filteredRecipes">
         <v-template>
@@ -48,7 +44,7 @@
         <Button
           col="2"
           class="text sm"
-          :text="'CANCEL' | L"
+          :text="'cBtn' | L"
           @tap="$modal.close(false)"
         />
       </GridLayout>
diff --git a/app/components/modal/CookingTimePicker.vue b/app/components/modal/CookingTimePicker.vue
new file mode 100644
index 00000000..8c231a96
--- /dev/null
+++ b/app/components/modal/CookingTimePicker.vue
@@ -0,0 +1,122 @@
+<template>
+  <Page
+    @loaded="transparentPage"
+    backgroundColor="transparent"
+    :class="appTheme"
+  >
+    <GridLayout rows="auto, auto, auto" class="modal">
+      <Label class="title" :text="title | L" />
+      <StackLayout row="1">
+        <StackLayout class="input">
+          <TextField
+            class="modalInput"
+            v-model="setLabel"
+            :hint="label"
+            autocapitalizationType="words"
+        /></StackLayout>
+        <!-- @loaded="focusField" -->
+        <StackLayout orientation="horizontal" horizontalAlignment="center">
+          <ListPicker
+            @loaded="onLPLoad"
+            :items="hrsList"
+            @selectedIndexChange="setHr"
+          ></ListPicker>
+          <ListPicker
+            @loaded="onLPLoad"
+            :items="minsList"
+            @selectedIndexChange="setMin"
+          ></ListPicker>
+          <ListPicker
+            @loaded="onLPLoad"
+            :items="secsList"
+            @selectedIndexChange="setSec"
+          ></ListPicker>
+        </StackLayout>
+      </StackLayout>
+
+      <GridLayout row="2" columns="auto, *, auto, auto" class="actions">
+        <Button
+          v-if="showPreset"
+          class="text sm"
+          :text="'prstBtn' | L"
+          @tap="$modal.close('presets')"
+        />
+        <Button
+          col="2"
+          class="text sm"
+          :text="'cBtn' | L"
+          @tap="$modal.close(false)"
+        />
+        <Button col="3" class="text sm" :text="action | L" @tap="sendRespose" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Utils } from "@nativescript/core";
+import { localize } from "@nativescript/localize";
+import { mapState } from "vuex";
+export default {
+  props: ["title", "label", "action", "showPreset"],
+  data() {
+    return {
+      hrs: [],
+      mins: [],
+      secs: [],
+      selectedHrs: "00",
+      selectedMins: "00",
+      selectedSecs: "00",
+      setLabel: null,
+    };
+  },
+  computed: {
+    ...mapState(["icon", "appTheme"]),
+    hrsList() {
+      let h = [...Array(24).keys()];
+      this.hrs = h;
+      return h.map((e) => `${e} ${localize("hr")}`);
+    },
+    minsList() {
+      let m = [...Array(60).keys()];
+      this.mins = m;
+      return m.map((e) => `${e} ${localize("min")}`);
+    },
+    secsList() {
+      let s = [...Array(60).keys()];
+      this.secs = s;
+      return s.map((e) => `${e} ${localize("sec")}`);
+    },
+    selectedTime() {
+      return `${this.selectedHrs}:${this.selectedMins}:${this.selectedSecs}`;
+    },
+  },
+  methods: {
+    onLPLoad({ object }) {
+      object.android.setWrapSelectorWheel(true);
+    },
+    setHr(args) {
+      let hr = "0" + this.hrs[args.object.selectedIndex];
+      this.selectedHrs = hr.slice(-2);
+    },
+    setMin(args) {
+      let min = "0" + this.mins[args.object.selectedIndex];
+      this.selectedMins = min.slice(-2);
+    },
+    setSec(args) {
+      let sec = "0" + this.secs[args.object.selectedIndex];
+      this.selectedSecs = sec.slice(-2);
+    },
+    focusField({ object }) {
+      object.focus();
+      setTimeout(() => Utils.ad.showSoftInput(object.android), 100);
+    },
+    sendRespose() {
+      this.$modal.close({
+        label: this.setLabel ? this.setLabel : this.label,
+        time: this.selectedTime,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/components/modal/ListPicker.vue b/app/components/modal/TimePicker.vue
similarity index 94%
rename from app/components/modal/ListPicker.vue
rename to app/components/modal/TimePicker.vue
index c089df28..48882d9c 100644
--- a/app/components/modal/ListPicker.vue
+++ b/app/components/modal/TimePicker.vue
@@ -66,12 +66,7 @@ export default {
       return h.map((e) => `${e} ${localize("hr")}`);
     },
     minsList() {
-      let m = [
-        ...new Set([
-          ...Array(11).keys(),
-          ...Array.from(Array(12), (_, x) => x * 5),
-        ]),
-      ];
+      let m = [...Array(60).keys()];
       this.mins = m;
       return m.map((e) => `${e} ${localize("min")}`);
     },
diff --git a/app/fonts/enrecipes.ttf b/app/fonts/enrecipes.ttf
index b2324228d590766f85ca1a0346875338f2611d1e..8aff549fd8cc676a43dd28a8bb13fac89f3ae158 100644
GIT binary patch
delta 4680
zcmaJ_dvF`Y8Q;CL?sU>g)}5ZGm-VnDM{@KyS&|bgj@>+*#KCz`J5I>M4o>sJiQA-*
zP!hSMrSt&|Y-u_}hr+-=jhQLnP}+ueGL$l924*@Gr;svf3QQ+6OdrrP?X*Pn+m&Q1
z2}Lt^`|a-ceY^X8-~PVu^wTeXe4>IdLdcA!5s$JPZqDefsxSs4FTgW)>*V;9d*t<B
zBZU3X|NP$ZBU8}Ypif)l-rJ6UVe7N0lh8kg(2}$J_KZ*XryhJ2p`K2dFYbc@@vfE@
z=ubeuec$BKV;l;;4*h#UM!xOvt^MO?$*(RVRQ@h7+&ejbYznPM|3PROT`+WLd~%Qb
zzt8tTzYGG8P8~jS6gCRK-nZ#I;`x6+cz!wVeFzWYUa}tVpFJ*ojUxfqZ=QHAhe<g1
zJ@bCFo<Gg^p$r-!epM%<N+24<xool2i<e*yMMu*4U9q?we(|pEB|C#{a=Y9XBtKAs
zlCEogk!YXCN?ul$s}?iInXycl$B3yV9<}88zZ&+ctH}q!qtO;LgPi;@e-L@mS~QGy
zBNU59;svD(wooeOyK#;Lq}3RcJ<>g5Dy3+elA7&nc?6R`rk*mdMnV4P`~kER9V3^M
z<K+ECr|<xIFy&FrCQh=ei|wjvU#!|C&SWO%QX%rQWXQlo$fe}7pT!y>o6_ei9Bk=f
zeuj6VJ?Ku@T3)B7DRdRe^wkwlq;WJ7P109H5UtqhaQf-X;c^FYKC9>SB5<W}gmTV{
zQ62fPPI=}9s5I~iAj*TT0Cu=~uvITE11oeT;t`QYDe{<{s&FGlo4|fHV@lPuxs}u=
zBZ_uZmMu~FVTY<_v_xLtuj>hK296IV$aoVv4CE6U3^+7Z)j)yGSm%;#22l`1gH5V)
zu>~j>PHE~etf8(v0;(+*@b0XQ`!=5aLx{uVPqCNCTOCi5$JJ@_<<JEA$T~`%!`sO-
zUHgU%aBH0WH25`wmY_9g3)%;f0SANg^<c%}g7X&(3fPm`r)DHLwLx(R(JZrQ4#FVI
z44os}&25!ZxX@M1XY)&O9_;E0V4Rw!drJ-$@JL}WN$Kgq!kNM#KBFnc!gQgiX!uNZ
zMpLPURP9F%V#_B;Q@y@EpI6nm^K`VDEDVC03zRKI$<%N)Nu}1UeR}P>X-ZW-L39O-
zXs1EX)dCW=K%6)sP7Wd$gz+|X5TO!_;-(Ed>CwXAae>CeGG>e{3zr<TNf!$XdO8*u
z%r*)Q9v<F_bQg|>YcZyT`7oGq-V_icb9B!;cU<1FlM+|YaEKXVgbc;pm60U4*Jk_#
zQNN0KB-M0$=U{;Y<58KyAdi?ClA6L)f%TFL5mW`^a1dr!M{sf>VyYLoGtBbI+SPv^
zuFEiY34D%lEy4q2U7l2UG>JO-Z}J1k4QSJgkc6$c6$|vJfKj-Fi(MHEVJ^C}a1%r!
z*Jv0H<gh!DE#`{4JL}519Icr9el^e{;ANa(G&;>68cZ$t-FUnlKM=d+cwWC#&udy)
z^NK<%9C*cZ$Cht{_+2K;x9|hiV2j!Cp~+=53Vaz0AQw9Tg7M!S*YhAMh^>Oagz<{<
zv0G%hY>8U7k<<JcqGaBvU|d3XaF6m5(&!lkha0<edP8xxw$a*U<#t!+WEm$xR+g*(
zOeQCiNs9%*lb2wkU8b|JBWy_~_au`t<pP7@-JtuGhVHrnU<p_O%##4~ltjAXZY(Dk
zQ900I!O$?B77O=U^&blgaS9fK7hP!fUDxf{TZ>R9%E4M)@%d{eI2E!y=pyIZO+5IF
zysw4HrL^CN5QV>nP#T0-1k<=CRl_DD4H+6fWQX9#X!gl?0at3=gTSkUXWcHRgLyL=
z0sKqE;R2VkY&=)D8hD%{p9r|X#`8KeW1)-j*YG0Gp@H7s9bTW$yQ8;vphm~T@z}Ol
z9FAzQR6hVa1l;bBRFNX#qeDZZqeDYS!;u<IZ!Pa^maWk}2UD^5)_9Eh1>0mf5Q(l&
zCOeyDYcz#I8r~e5Lto)<=1s^?L)hL7_N5rj3zc{x21kNKkjukaX}s2sOOaj>8!n~R
zC@6E0U|>}MpA1H$!Rp;W1|uV8lgVW&mmlaUn`GHk?s=eGh5?hAdnD7{eWcW#iIf!u
zD{m=1QJ~&b6r~)I?SSTy@TN#as5s2B!w`vViiBazF5{<R*Eoe9=H|Hfkrnn$o#>*l
z3!p;H8@{FsfDZ^r5fKkJ(2_e}Wyr^|cM}a3;hO>^hc+XD1y-08g6-LPq@IU;3R*Oy
zHK9IBb^Hv)AM(|pgV^$-t2)g9cbb}gfg;ZY1C_tAF^2S%s!*!JJaY;H^#tH=8I8gj
z>oJvuOf0kl(ts243^VESka<eQcp}SkavA4pv6g@w#CC(j;7K~nA~9c&W2(wkapSpS
zCcVnxu&Ys%!C-K~^`jeso9=?H$!S&X4#%o=rpQLaRfkQnDN7TH&dx+)DUdeqiqY%c
zpy#{CGLVehB~6yCG>xk%t1N4h%L>^$GuEBgH+a3qQ93bt^-XPQFf#@kDxjjKZY&dA
z%3_ix+CE6Mec;^yN&)Z=+~8yJ8XsTha>%$%@o;Sq&(UMh2Qn%U`>qL$DrC`GX60rY
zVZ%GGj!+5i41G^mSqHOD6TP>QKPgiaO)nWur3cA2?~9eER!>Z<9+;RIXxH`jsIKGl
z(Ov0qFu2%iu~-)egW>e9=#3+uzK~bbVzSvR$283w>hs(%a^J*2P4zI-8*SGSTCk%B
zB~TyQipU*p)!C0EKPHywS@L!5w{CGh+Wjbril`sz@hxZ%dCb?z<-_DP-#A~brb))X
zEPU`r9I9bSH8nV$atDLtK7YWsq9c(Sx<}XV8A>HOR``6ypgVPPaPTBB%&u81;n`RG
z8?gbyvNw^7iF5r&g8mTohRM|5Z!%FT<PRS4hf1tEn}$3x&EUS<ES)|rnY&qHnTE+}
z0J*58gviDG?@8GHxPGuOC<sxzeXsyt%qq0PSF#$OsSdLuffWoJH=f_PQPo5t3N@oL
zd!;pxXSaCLSfU$ZKu@anC;M6XP_I4OMAMRlFDi*^4u$d#W3hva38E;(xQ?RHkq;eO
zBN{ckXy}Y{g6fK_Qaw>oY$M<3d{J4bpnRx=R-hAPEbSpy=Q=Kc$#&;350`|Tb*}e9
z!AGNpRkg!30i^^%Y7tFPn!X**;U+~X*k%PiK{i`{Nd9HH8ym?9>!cvc7|Y`9yO~~G
zSy;3KEk!rcvhDi3MGMwXO-ejXXpp^Xd5a+mE%6zsvhp9`BVmWi=7xkv)1AxhDwg2$
zqB*hAV>Krq+Mltvx3VI_(W$jYBuV<QL7;v&iY;x5q8cKCMZ7K%+9Os;Y6a$NlOC07
z4oc`(w5z9NA7nmQp&|8_v(rr%4wSr#+G1!^FmJL;*CxuwUf^SQ!GdKp1RqIv&4Vv|
z!B7;=eFpee3fZntL*Hc>3Vq$>%sO&lN$Au+ff|(p!>brgsf?=Qcg-1iE|*F!R~47T
z=9U1Gofhn)N5?*k6S|Vy=5Q(M@?<IpnFEGx)uP>Tc*BOn4*S)Yb)DIw&FyJ38mSbw
zI#ZynB!%4W0CNQQ3!}%gHl5B-1`3W=&-DQAX>}9=llgRdt;b_LMJ;)%%KQ7HlS5Ne
zLzB^dsFXf;LT8#nE2Hf<bu3y$nLbG0H9*_WWO98Z8erQ1Fr<G#z%#n{J#klS`6Fb8
z{|n&v_N(z{8!agpN|hD0aW)BM3iS&*4$oG2X6ny=Xz4Ru?+@4M)zH$1_8ViAXQ<wP
z2ik_r^FYIcE%h<V4}BF))(3zQm*Ck=E*IQO=737U3}ri2=V&ZJx3#-IN5|-PY0Kt8
z+E=-?X@t$N<C%~H1@RbuiCf9t&kOtze}9Xq<$|Hp@TRa`ctIQ$&l~;5M<pa}mL8H`
zlKyTAnl_s*n0K3hBD>@R@*5V;lC@m1c37ucjjhL8U$-IKKHGcBdgagRA@yVXi2aw2
zosM^$-wL^8*X^#$?qeRC=U&eh?QXBv`&Zw0{GI-b%r7g*rQ%=QSu_G+|0Q$;{`EMF
S4xtcK*J+d`S4%#4&ixNb`anJa

delta 2967
zcmb7Gdu&tJ8UN0;eXk$auj}i_jUC6=H?fl#635R#$OFZs6$y})+7z}Vq=c0QLTHme
z=(J+5o7!pJG|CyQpp~`VJCRy8Q>fN0V%7G~geEkl?9mOOYSP-Vsef(jCNTTXb<AVx
z{@77I-}8OvobPqM^Zj!3={KJ!0|5XVRKNhq9Xq>IPKn=zlAj>$-8VOV#9#XLPXR~>
z`G+5yUO0kZ7xL_De(cawpFUOk(HQba0n#rY*griJ5??w8kPYB^?f?pe&l+wbKaPCs
zfw{$_??C|fW*3qF>!JC5o2Q@ra|Mm%_M+hE-1N~SP=J3U|6AlEho|TE`)^*{g#1Tn
z<m{38g++7}NAHVl9SnwlzHn)f<W7)LlA~kfak|_4scMJoON4$;`EK<qmNUd#1g~M)
za1d13h&qzq5b?@A^fT!o{jj;<n4GviF_|45&FT}{7Y<e5AYb4jMp(vkMLg$+5!eZP
z0ot@^EbGqX2S`4brf-@@IJb%3Ha~0r*RK+8MR6ypJ7ZzuF<~;jh6<i+gB)yuhv8A0
z^o2s1SiFm9QC@HmugNX*T2kvozK1EL2YoH&td_~4@^s4Q4-+q`ydx=!)H#|ZrR-=Y
zo4@1nxRZ*KbbCCcsJL_4N;c<K$Wm=tk(dLLvdn%MQxbUIWj4EbUf^yhlBCpt1<3)M
zE8UVL%aYWslxn~Za!`?!oFdh(veQI2)|g*qO4x9j0XQhaNzA4n_P{)5BpKD{--3~G
zS<k9hX2B&0MwH3*krayt6Q;+l)&qCTEI3^A;bx7cqnXG)wznU%nu*7v0zn_?F=v8)
z&@Jvr=ng3b=4HvPEQ+FC6Hn^Cx2MvNr&IAJ494TZV4C8(pk0rSg{k{Yp0PCix73bN
z(G_$XF^GCeByd)SAJCQTH~D0&C+SPmiQF^BmM~A~_1v7<ZWlyCM1j`iPnHd^3;c!!
zLk4^hgKhu|aS$irSwMpXi-Oes7yL=gg24AA@h{gy{PBD)<@d<~ck$L$lZopz@Mg2u
zw#-|NTxUEUn~&!Uh2d9+hxho%>y<*@8Fx4whV-qgMk~K;^P0`Pp_4P2Lb!Q87LT1P
z3>RJ*F8KD4*Ug1IZjCzus=eK5Vw;6A!;6L?^lcA4E~Mxx-~5SqlKF>@;9YDW9MMW$
z>AkHn4~|%-cf(}3Mbzx!mdOphnYyrTD&1Am5+pFBMTeABs&=h*EuB_|qS{a(+-&1$
zpD^eVMUmJz&PGIhQlQ(VUl#I#|D~S3D~!+%d6Dk#dS%mWZmYm+l02HN!QI=#GA>!1
zSg%;QPRscCrSWkoz_Wddgf{9|HcMaa`L?ylN_k@9`s4&1Px&%<&uv_L&Mc=RhaWTx
zibpW5i*dZ<SGPz3O%PfD?p}Ei@-Pf#I^+n@C(~PvShziOC0#Uhx`Wi08B>C;h?Nzc
zUQ)WH1kYQHf|X{Cm#e=EE|Th8avh;<?N>}p?JV`RzFl5^U}ok4Mp`PRA(2bkRF@hK
zuXot(j`iWN+BKzVQ{53J!GV%U_mrj#MuGt)X2TIv0>Q|j5*SpQlt4_h*~C~tX;KGI
z%#1L#BQr(Rn@*!{0HKi$2tfyAVF)avP=Xn}izxkBOOPfy>_np*JEqAhJ=@W*&Z^Oc
z?b{!DWc&6-H5yeH>+^-ET3a_-N%&h@=*^DiP$3>qY<n)1dTv`H9xnugxv)P`-nzA%
z@Q0zgF|m_`3~PoDLJ)dj8`{gn8f}bzRc#g3ln?t?E}MxZ2z?^pq0hHRx1Ko7@_9OM
zw~MV}#cr=)#ff5`yK$%O>aD4CYf0}#_{^2sY4(8gxSws;PvLK#%I42ix3swkeMz3F
z{?KhC)u%H_v=l#|z3ZEbSG@B+-=e&Ct?$dew2J;EvztgZqq*tJDLKTtke4+fftUTh
z6v9cSn_wg2<rcyM*#Gmj09f;}m+Kzc?f)Hs4j}i&@ZrbCz|iY%IjVSXb8rm3rSr`J
zdeC7h3-vatg9B@w{knhHIQxjZ4iFm~7~y8Q#s-@pM7_Vyu7yif3=H2t3mO|hKQSz?
zA>BQ>U)Euz_js?4Eaf_u-6yMyYDH3qmD`{L3n|r>beJJ^p1W~t=^nMCwxX_3*MxAz
zQiHwy4))vz1RlKXTc!GWe8z||?Q;9x_I7TmsGHE$7Xj#b=@-@A;S3>T^u)Tih8M%3
z2!lGCW%FjMjm;vV@Iok(#|sj%#x$%Nc3F9w<?E-cR#r&5n3W$ZB)kK9)bkw+huGd?
z__5(2{k`q|#Dnjej8>zO^SRurtx4%`Qrg;fx3ytIuyGcTv>sc6XT9XHa5gJ-IwI6=
zj|lo{n55Ti)AXc$$N#A#O51F&(dSbu)oiDk&>qJnx~*xoTFh@El<=ph!BmqO=GNiL
ziH}Zyaw^@|+{%iD{!vxwiX%k(0!#FT^{ey^?*WbdM@N)1-`e*1;VI{)zk|)lY7YKz
zrsX${FCFj8m;35+eG!qJl_gw6s@y|GoHKd~X?cy<dPC0k?^@$$@yqDmb+&K!+Ir*6
z+P8d1Ny8vBupMb1(xV@L2;M{a$Qm^aG3S`l2H$X$$<_iQc0Eih$Pk7xI8R)pJi{fq
zis5bJfbp{FA=97u75*<muW-dYX8xLa)iPkYV13AX!FE{W#lv>9{riq_#|6hfoX4E!
zTq)Nt-L3B9Qbs!E>GGVDIr%kj%KJs{`@TcI%l@2yH4qM*4O~-F$~TlN2wnhv@Dbqu
dPdHej^+7)vu+hQ(D~La?0Wbb;9ta}6^&hG+K#l+a

diff --git a/app/main.ts b/app/main.ts
index af11cc52..4476a03b 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -3,15 +3,17 @@ import {
   androidLaunchEventLocalizationHandler,
 } from '@nativescript/localize'
 import { on, launchEvent } from '@nativescript/core/application'
-on(launchEvent, (args) => {
-  if (args.android) {
-    androidLaunchEventLocalizationHandler()
-  }
+
+on(launchEvent, ({ android }) => {
+  if (android) androidLaunchEventLocalizationHandler()
 })
+
 import Vue from 'nativescript-vue'
 import EnRecipes from './components/EnRecipes.vue'
 import store from './store'
 
+export const EventBus = new Vue()
+
 import CollectionView from '@nativescript-community/ui-collectionview/vue'
 Vue.use(CollectionView)
 
diff --git a/app/resources/Android/app.gradle b/app/resources/Android/app.gradle
index f44686c4..5eb017de 100644
--- a/app/resources/Android/app.gradle
+++ b/app/resources/Android/app.gradle
@@ -15,29 +15,18 @@
 
 android {
   defaultConfig {
-    versionCode 8
-    versionName '1.3.3'
-    applicationId 'com.vishnuraghav.enrecipes'
-    minSdkVersion 23
+    versionCode 1
+    versionName '2.0.0'
+    minSdkVersion 21
     targetSdkVersion 30
     compileSdkVersion 30
     generatedDensities = []
-    ndk {
-      abiFilters.clear()
-      abiFilters.addAll(['arm64-v8a', 'armeabi-v7a', 'x86'])
-    }
+    // ndk {
+    //   abiFilters.clear()
+    //   abiFilters.addAll(['arm64-v8a'])
+    // }
   }
   aaptOptions {
     additionalParameters "--no-version-vectors"
   }
-  // buildTypes {
-  //   release {
-  //     minifyEnabled true
-  //     shrinkResources false
-  //     debuggable false
-  //     jniDebuggable false
-  //     renderscriptDebuggable false
-  //   }
-  // }
-
 }
diff --git a/app/resources/Android/src/main/AndroidManifest.xml b/app/resources/Android/src/main/AndroidManifest.xml
index ac8a9170..62af1b2c 100644
--- a/app/resources/Android/src/main/AndroidManifest.xml
+++ b/app/resources/Android/src/main/AndroidManifest.xml
@@ -4,14 +4,14 @@
 	<uses-permission android:name="android.permission.CAMERA" tools:node="remove" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
+	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove" />
 	<uses-permission android:name="android.permission.INTERNET" tools:node="remove" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
-	<application android:extractNativeLibs="true"
- 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">
-		<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">
+	<application android:extractNativeLibs="true" 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">
+		<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:launchMode="singleTop" 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" />
@@ -19,14 +19,8 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="com.tns.ErrorReportActivity" />
-		<provider
-			android:name="androidx.core.content.FileProvider"
-			android:exported="false"
-			android:authorities="${applicationId}.provider"
-			android:grantUriPermissions="true">
-			<meta-data
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/provider"/>
+		<provider android:name="androidx.core.content.FileProvider" android:exported="false" android:authorities="${applicationId}.provider" android:grantUriPermissions="true">
+			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider" />
 		</provider>
 	</application>
 </manifest>
diff --git a/app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify.webp b/app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify.webp
new file mode 100644
index 0000000000000000000000000000000000000000..ad765b781bb4976e1d5eb3357aa7b5c1c80dfad3
GIT binary patch
literal 954
zcmZ{iZAg<*6vzM5q+!`Cg-SA)x{7>DGiO0c8{3>%xViaKmdrUdnR9GPi6j|8K~Ywk
zsY#}hS!U_fL?rD^O)3q`6irAfdV$uPr8!&Y(GTl`-RHUI{_g*rbDw+9edJQHxX~Vn
z6A7YYqeJ5z0c@o1HTz11!f1sZO<||dsxyrX$d#$fHpnFcZhXQn?!vcNfR$K+4G2)F
zjrtuiVg(aDfBQKI7ULQ4W7e8K=D+Hq6pc|0u-Ft4rq&y>i6e-k_GjxEE+TeSr>jzk
zuM+zjXoJMh89jN9-!q&x#}<YS3b~NZ=1j~@`-hYNVRgD8lVX^ncxP&JXb-cEImu#;
zP8ma^C-qe@LJkQ8;6e%!ga|<(wvY{hAA;adGyEr?S$h?BB8zg>WcA2}0sD}KbY#Pq
z)Ert}Lt`rG8hW(IW$I6P)NFM%rfv$Fl~{`ffWw&8`ke<XJPXVeTCLNUtk#(-z<w0y
z)Y<a0DuK`m(hF^x_eFqn1ZcT$(~?Vo+ed*F!+MoLHTxZVvUaJdz_%K}DFJZl2OM|L
z)r@?MAJs1bMIK$%6QHyVSWEGoMEcvJ_$(m6tCQ`#Z0NN2mf~9tmS6AgKK@*57IbkB
zms<~AXQ5$zo@peb&b@p@%b(ahVgBHxH8y{8s$2K|vv`Eh%9qG%tE^Ybn!?`bA0+*W
zD>jc62*w8AL~h^YHYvMX@jJxZq<Ey+aihufuqLuYJJ29zUpZxdF*$mHd#?Ip&)2}N
z^qg&y_2Ws$eA*sOhnMu54t`0LiP<rGeB`Gh1)||K2jIp#|0-f>IHb~JzPyuTX|hJ4
zt4{&@rZV<gyfW8iO=YmCRWX&AQ)@gT=JD@+z-3GQc*#~tk4#X%_vMYC=f_z}&sOt&
z_tze0`ubK|+TCjmx^7NyMgG)qM)-+47OlynD=EKah+}GMu6z-!YJd8*@m-34cb!vd
dZ{XB&&%){shi5-FMqTgi{9e=+Ha$}1gTK&A5$gZ|

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify_silhouette.webp b/app/resources/Android/src/main/res/drawable-hdpi/ic_stat_notify_silhouette.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f759bdf8dedd362dc1aaaaa2d84b1c5fe5a4169c
GIT binary patch
literal 938
zcmZ{idq`7J9LK+#OV@0gXwjU-QhSN^urMnS*_t^l*>rB1gPPY()6K@6tL%Xmy(vjl
zB7@SI`5^3xmHv?#&MX{J;tb3PHG&>SQ3+P-cl8hZ!_K|ucRuI)`~A*6=XY+JDk;h7
z1L&1<wN4$sT?Ak?^@zz=rBJA~e42u<wJ=t@fLzwXA~tP{T(&)Phs<vj0!R>mD6BFv
zcH6e}BrO*`bNkT`9_M)(!>u)Q%zst?9Fv^^ctVOuU~Fs=aWe7NeML5oD~UsxJYx=V
zBXKlK8zk=I^z12q&vEV)|Kga{rYY!bbBSfS|8Vv{%;d3Fis6b9X|*_L50i~M$sAK*
zMmmk*)Wcv$8n!?V8B|b0fjF$e2C{L8K`d6%4FAdJ)(%4|_E0WE)`nuR*o|D|p$O5W
zI%sthjb_qK^jJ{L)t~aHP1n_KUK=|p@#e^ZSwmj$w<UmI1@Qa4*E><`_5OAOK7&9<
z;dK6<8X*2V>F1}l$SXkLF`)JFw3dAVxOWm*@XBUnjg#N;A<H+Lfv*jKI1>nd4v4a*
zYDPZJk2(*aJxEv83tX%QmQsA6f&R9w%Xq-5hz{XgM<OfjDPQOH-gTLEz14S~=I8}s
z{y1fNb?LQ^`7|(SZg2AR-D{8zyvz59zf1^1dj|#M!L`oLlG+pfegP4whUWbHn`9$Z
z&$^G-NPJrjN2Q0QPb#A}=<|&YUHba^bBq$h!w*Au797H}#*MK<W2bbU58`n5V%`0>
z=L$}^54^2)ZZ2(VIn$?EtgQ^#^(LULoPQ%(elsL&Xzjec!dv{!`*lrPO-Au)EWaj9
zsTyleSr~Lyw7ye2s_y#Z`$BT0E^+*G*H6vt@8LC~qn8p4J|#g3?TbE^jcMF_E#(uE
zCG9#(xm4NHBF-9dX>J!hn*Siv5_7ZK*JUs3uBtGUT^FlHlmDCqJDyeQQY`o&zAA99
La9kF*DfRdZPYC=V

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-ldpi/ic_launcher.webp b/app/resources/Android/src/main/res/drawable-ldpi/ic_launcher.webp
deleted file mode 100644
index 5eb47833fd1c3a387b4c59f7424784390ec40622..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1612
zcmZ{ieK^!v6vvO38lq-oiyrc_L}Fr%q*jec3=v~Q*n}C>n28w-@vxhD*4v6$QY$1a
zww4Gfnmnd7-cn&O_R-4@(c6+z7|q_%ANr&2?|0Ar-0wN({_Z{ZM<(stw|6CgkE6ZE
zK@S_>RRCaty3^82a&YjV$fGI9QzAkbY(?Z^Fr!&yCwo2LLw<UgF;D~zz`!~n1ck68
z-MscuWYJ%5vqF%QdHV3OwZ0znO;v?TV}}69DWQnnA(5<T#LkHKbD|?<{5#_BLc)Wn
zh$|7BvCsw)_sjI)&paXHu+J=!F^fWWKxe}t)(iWBgTLUAa25l_$ckdfh=@UZSZcD9
zsM46;UTFLtb!}h+8I{c*^ne78-~iU}1MEQ78t`BVThR=@kuO_Y8{FYI$_+s_65@dc
zM<EQtAsWn(8iQ7+p)nNcH1tG3ysZ8x54GjGvO@`$OOl+bJ-~`lsdQ!&045J$F-Iz0
zxFD4-mH{aI1JKG`&OcrXVDld7Im?=12>_N0(8yobg3kb4PX*8%jtpW2EqzA;S^3aV
zfVUL@s}BLFKLA+e|G8$!C-cL_K>$hux~d+4v*!SeP&_sO{cZa@kl);?RSjo+x0GS%
zG=AXY!nju29A~KUv_Y+uWuBPS6{JPV5O)zhl0wZI7$X)Jz2Y(Ta><hEy-HXvj;W;I
zqQ<+8@l{JwGH6rRm*CnqK25<Lw8a@|tL;`Ia&_CZo@P%uPM#+@v*KLabxG}ktT`8V
zT|<&UlQrLYg?Uyyl^eior>?C_(67iAzsn~H#*8~`Z)R`%)K1OqQ6S|`=TX~p#8a_z
zbLoP@yXl4`qnW6+xm0WH<HL0}hQt>{n%(P0Mqhpd;UZltid+>y*gi-bX=F6NsEuGt
z``ALig;%zTSrbylO6ge2Fg1Z5LbLE49ugIIuUSXp)Qw^<+}0mv{FEHFP1T1pJ7Tp~
zxs`86y;D#dt*MhrSYbL|z;DYa;_x)hvKDMRxAR2>EylMRt~OQorc{#!8XI|12|xAu
z2P{7KLVcI-ag#e;Z$9;lvww7T-29qg<)<?FarD5s#i-sU#h7>lUa0dubNck9C}qDy
zqhMUgqm>6TaNBcIq9v8qC#V4@i^8wiTU=W#woc?M{8n0~M@nfPpGf&n#Mi}US3lJ=
z&|E_Zt)Z*b^jfwVv?xu))HLMR40@*3%`5ct0!5Dk7pk5>g}S&sP$UY}Qr>GbaHowU
zdUA$net7<6rrctZz9)ZTW&EBlqHdx5&s8ab)Op)qbhePpJ{m0~>=3L=?&9I~$dp~R
zq)ejON_Ge4^r*8HE+y$%Q-sD)Gwq&|G{=9vnDH<(>fSR#Sb<G@U>Z|RaC1|YPni~6
z9j_1)2jyGc9=dKB6T08h*vJYP@Ow!=#V_MfQvFTed(`(#i>5`jZts3R#-^9wPjB2g
zx^vW~G2=ejjhWx?J`(HU&D?XWfpNJqCtQMUPSVxzCJ!AMJn_JrnWY*~J84<y#{9cz
z^6{&9tDd85`tu{7)ctjO6|VE~9c>chSlePuY$v{pFEO@8m?UI8=tVrbs~E#e7Pt+l
zSV+@-vY+o6DixF~&XmN>#Oaiq{N>M`>urhKiG8Ny;+=W*?d2Qhrh3($-R>LS6gIDp
z=l1F5oVVt<tk-^0nf8i%<KMc<;B0PY1(jRz=x&~8TWv;gm6<c8+Lz^`V|uE|a)Q3~
z*YzdJ`8C&Sw$^md7O)x%N4ia3di~k#vLSD9_aAeKF(*BRm%2X)J*|cBP0VNTv-RTq
z>%1nsa>-j;pCAWE_hDZF_tvUjlg+M9Wpd^xAF9!&?aJFJZdAMB(Y#|*u9B=O9q%HC
WVTzN#m-lAMK)>*G=b9?%82k^h$6j6l

diff --git a/app/resources/Android/src/main/res/drawable-ldpi/logo.webp b/app/resources/Android/src/main/res/drawable-ldpi/logo.webp
deleted file mode 100644
index cabf24db81a619e369a43b2fa5ce7111ce75f027..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmV<O0uB9ANk&HM0ssJ4MM6+kP&iE80ssInU%(d-pX8uzBuR32&;AQyIUIjzr=lSs
zDDr=_aO6mmqtIPTFW&u*zay^Rdzz`Kpku>+@X~%euqq5j$z;s9L@BTYAOHiv2o#At
zO$du1WI_KAj6o4301aIX5cDy;6cUjnES~Q1inY-$0-2L!gQ$p#AQke1RD`GyA}XTt
zgM1KwM3N*#um}(|3^9TL7={CY0}RIiEso(B0dNceAd4HT@{Ikm1oY_>nIz<M@`;~>
zYyn^lNy^%`ZJWKeZQHiDvNnEskV@709wPcb0r3CSZ?Cket=5Ky)~)G6<6A$UDZ2tK
z6#dCgdigFnMXOJfY&24JhosAH+K4zs;*&^Cgf$|0Q@9q&E>YsSj|QqcP-^F!axNPv
zdDT&^kJ2ubeo*S9h>dsZ%-|)myxg2C^049dp3yCkwKynv=k$?(g9_f{eX#M}M@9Fd
znZ(zlvRCme(gi9k(itQORJx`_T6rBRULP&V=>X+k_6-mBUCO}&2RT_Nvwkx40|4M7
zV7^`kW=na#lCf-ng~qas3uhU*NMDm>3l=}*2s+G?V0R=TAFR%k(D_XliS!FVI6;Sg
zboq2GZxqkXboq4Sbh%*u>B$^q(T&sfl3iDs@xQID9rQO-Dad;1&d3J9bZjjmVr`%)
z*d;royC$14^>u<K+a68LkX_R?kY$;QM6*$*vdJ3hPRKG%g_sL5l}UC&H^e4T)*9Wc
zE@tTxbdgB+Qmco$XF6EX!w5(Wk`%}#M23Bj4z?d;K#UFoK<<osvmn`ZN40?uS@3eC
zR{JZ+uQ*bv%^f&a9IJC^0MCk6RoV>TT5+UCn>+BWI9B1%0L~Sy{MroQU2(*%%^kQ`
z9P>IffPY0Rr#1srtT^J+<_>CloO3zz1XT;U6oIl&^;98NG<~Q8n>^M*;ZYt-Dvj}2
k{C6boH^c;wdzDIg1giwaM?wf;CQz6)Cxj4fMev_f0H_^XMF0Q*

diff --git a/app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify.webp b/app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify.webp
new file mode 100644
index 0000000000000000000000000000000000000000..dd7cfcdf971e16f715ccd8b2b5bee4dd48f6cfe8
GIT binary patch
literal 860
zcmZ{iUr19?9LK-=BMY<C6qYq;h=nbuX{6SJ;il7-ncU6)zRbBzVgI<BndO6IFvA`s
zW1>D-St-E~th6vl(vq+sH8e}AmrSaMvMe$6_Pg_8KIpmkobx%~-=BNV?;b|0(db1$
zVWujtATPBj7{FobQva(}tMl|iT0*F|8f`8ynQV49%VeqKMa3m@$!CZWg`H3!!C-Vb
zPwO;#-h1=*X9@z|GO6TqZSJ$By1l~WG6I5a<dJ4{vTovR;+z_{ljm#1k;Y0x1#u5?
z97`J{e#7hK>pai1Wt~@eX7!Ak&K5>2w`}0@4Q#ArZREojCB|m0rakx@f07WBJzqz2
zG<6wVV2}kB<j^7$Y9u2O$7oE35=n@s6}E`ybIXtm2gMp`bfOk4s$fAS+=wH!nzEZ{
zHj{3m$BJ6M{uD<oP*<1vNRnR?gs6a^4;=SvKOkuVR+~BQ-wlpiy$OhBfgyV!-f<mB
zT_n9Zpv80op_hRE;eb}&3JiFF-7`)DYw&-EZVrTIGqBJN>?j5zUIW3U>op@AZ%5ZO
zpua%B>J`w|4jdr=&@#GhIq%4tARP({+vTyn&z_j-SsQ$0HHS{u+dsC=IM#-%fb52p
z9+|xGM?>;MLG+7#pF}lp&(@zRoA@qS^41Agj;AYLo||oB`Ws_KYwBf(AS(B3?5HyR
ziej+tXXoRYE=`>LS*>#J;{9d&(K*kz>L$gPUZywEa_cvj@!(K*_?Z|9(j`Mrbt9J-
z_9S}6DV7%PNE0g^zbfMvy#*t_zKHQ=#us@z+;`IZ<lxd^{&}7CZbnh7Z_G1R(ii`H
eti4n^y0<ebt+B&&VlwAmhvDzQym@}^j`%-$2HS}M

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify_silhouette.webp b/app/resources/Android/src/main/res/drawable-mdpi/ic_stat_notify_silhouette.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6ecb0244eb3a69a383b9ee169c5653212775bf97
GIT binary patch
literal 852
zcmZ{iZAep57{~v2I*es)(u)~>7@-z6H5K0ythSslnT$Ehr9s=>=E6;HcN38aKV%ev
zuyRz+NGl<O2%Tg|mf}EyP)wx~ErbdZ0>Lt{vfFd#hxtLzz2}_Y`9ClBoaY{Wkycw0
z2As}U>rUyiD`Wr;QI8J3MH-FHAfY8B1_$eOg_Fry>*n<ZYGsA-j56XY!V!b*NJNT>
zb#W)lv<A_8<M!(v7|}A7B<9-KXH#{n#p+@KW(#@bu^jIvE+j5#aC0JiiFdMglZCjO
zSjE!@iKj)~yvE-|u3qE6BJ&2lhR&uSR#vZL^Ezhjypw#yqQp5J^|Xgz6HgLptt~I3
zc^~yyxS&S?)KH=b`OqK}smP%*6G=!zGOe&lyqG%{rKqD=mPQVZ;Bg++u)_@%sr8iI
zO0$i0D?JW0iuI>BYN5KiZ0Tu1iHTGL(ocf$BOZuo1y((R@aMiDtUdt3=78baP<&k{
zkiAU0C#1!70P<#_KM>N)w}IzZfju*vi8lqmLpKK!n+;fc1Z*<`J0<{G<yy_iCff1v
zJz%&<ziJF<^8pFuFR!B8Rx(M}l;~lpqCDF%tGzkdG&Q)teI}4G-`2ua*39|_-zGP;
zGnVV$6<wEOI=hyne&%T}!yPCyJ(JJt7P6R?oKpRp1$*)Qt-{3a@^MKZ@~kf}%<p}b
zwRiNWZ*D?0;g5gm@u+l*HGP*}us75eT}sz3|CNu8ved=9kEK<z*@5&EbBCAD^~-m+
zjA!&NehH}eOIOB|qul<eBLz=-a*vJt913(83qLgUv^KvsepU?ma}LIue~-0YxHd34
Xm~hWKGR>Lq^!__840#iZ`*NB8O32qz

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify.webp b/app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify.webp
new file mode 100644
index 0000000000000000000000000000000000000000..14cef5f8edffc655a7c8507e6a3a3311ec85fb9f
GIT binary patch
literal 1016
zcmZ{iSxi$w6o&r-3L=V8aRaexH35MZP=bm`iWDnq5GspEk=B;2g{Cd3gaiq}CDB9#
zqi94chKLdYgG&r97~=9^K@lZbQX`8&R4N*Z0=1qC5BPv{@63GXKj+MyId@`&0>O8C
zAU=X09Ty#(;0%CAojdUg!^5LRc4Wd%q>w5#4&+j1Yt=E4e0D<OKDJ{Y9IzB~;SFx8
zRHNDzD-bc!(>KdIuo%x9UuLc8WB#koJ}A>j0hSX*gi2LvE%A2ZojR?G;WNYwrRk{$
ziK~fy)U-k3c1D*>azDdqlRVC_S`-sbXPZaNPWy)?|FAS&t)v*HC>*6Cm-aBxn3K53
zviHW)yo$O9G>AbY_+Ueb2!taD{@6%k5PT5;KeF(jd}eJA>_!gdN@-Lf4{Br}4e8Lr
zhtynJT}HE<bQwJg<T3T9JZe*Q)yM+_CM1>%ADCgX*?z789LoS}iOn{4#b&cs0`^@%
zQ}$GTjvfdeCcR`z<6H(@i-Eh%Q<~%)aPJtfq*IluPM!D;-5l7-<-m_?z??*2!7IQy
zX|iVIWBj<<0f_SHR~dlw7l5@C@4BCE+s<4TT{CXe?0Jh`oaT6yYPHropDV5p_N00K
zOg3Ngw`|orA&hrH+29{Az!G%LuNkp7h8SBc$+x*ii$gE(Xdh2z?0Nfb#n_0cuyknP
z@aq%ndp+5@_3@iI?t<=&MRms=KQ>;JEk3jwUiTV$EI}3ej58NoTh3j+&D)?|9cpzQ
zmMy#*X3m_eGt>_h3<^8lPHIk>eA)M_^LXp>hJK5TtCVelH3h{_%6f;awE-zX4-7XN
zJA5AfiT{+;oGdZyxZ75{r>>l(Xj-`}EYR)Fv$#Gl;kMAOkTtWip2~Zw_~pftmW?{$
zaqmm+jYqh8PNpG$zP_%gLZEw+Robr<m-bfbYd#vILgoyMD>DmkeqA1A-sSYb?3VMZ
z^X23CLk&)fjGP3Bor??)57>uhwThoxO)_iem+B9VA~MEJRRxw!-6MWm%$}nUO;z05
n=VDJ)TT(vP_p@JnRQ-w+uBpuZtoWt1$z^o#Rv_M+56r}0^e-~N

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify_silhouette.webp b/app/resources/Android/src/main/res/drawable-xhdpi/ic_stat_notify_silhouette.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f581f593c0bab0fb16ca8fafd57c51f92da1ea0f
GIT binary patch
literal 1016
zcmZ{iSxi$w6o&t{C|Gf;#$ZI#V8Mt&1q~?*rfIQKMT4bPP>X4=&}u0*ZK)E}h=O1g
zC4fQPD!71gkBQrZ6pagUjSvy*!h;H;)~ay{O0MU^13u`vcV@o%&pC5v&K-?frSc1a
zrE?XjOHyU&LIBgLN&8;4Qkkmd(-eGd4r6r$kjt9uv}@)m#OWE!#DQ-RfN>a(NJtHg
z!?rL@rRAdkZQq}O$9Y<!xV8Qr^Ivu7sw@Ws@Pa5}4r8-BiIa&_);Vn)R}qh4%!XCO
z4aC#zv_axlPB->*7ssZ4{>`ynt5MR~MiPrnf3fi|X3Tag#c)NDSab4d4}Hd+BseQq
zmque4wNN;q!8|A+h8lCBL>yuePkkJs5Q}J<;XnD@+M!s4wUo<HZ$m!pSPc`*aAF#%
zd9->KjoGAU(UXIGuKtuqHc(eb_Kes*i5IK@2EAn2ui-#oCD2>WvcGCswzm!tJO@0v
z1NmzY1F~<Vmk($XH!z|IxOihgGgbqaN`R1do561A`wrb4@UydlFZIB%3}EylK)AfW
zX5{1iIMN1a3+Pwf2Ws{K5fndS1>Lq37mu!))H8IXPG<M2D!N(s+uGx^Pqgp$bq6(E
zv`+9oFnQPP-1$@LDgES5?|oHh^}6ERojV#2TEC{q=fu>^bhr}quCP5H;!Ab;TT3!^
zqQt_@%=%}e*x1a6=eo9=MwOh@yPB`@7npCTs+aCdPO{i|`_C>9UR~ByB)!~vNquXJ
ztgYb6_|Ns)rh4s01%HEPNMLKUWnxrhqfhTp_uj#&9$j*|<kz)GuSal5pC_H(;diZU
zPpG^nikN(?%BQy6<UdK0%M2L}=9;9)y^_VRZ=J4_G-)3-TZ%36u%I6=x2P{q&5S4*
z^y;ZV6xDJtz`L%=ceJs?Di>|7ER<Xk_C&-#lvqUHQm&8QRn~caTVip`?F;KWL;UH!
z3wI{kN|}%Gr#eE5MH>ef89f>Eof8x>9SPxAg|#86$CBE_V+7q*UBV)xymRb3<&?*F
q-=4TT>HX&17y4O`&m3N`$$cQYogLq-ujuiY^}O>l0cSrY3jP4LUMYeA

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify.webp b/app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c6b575b95d705f9fbf68992ef0abc3d651f77ea5
GIT binary patch
literal 1168
zcmZ{ie@s(X6vt1o2&0v@LyRa1P3>H^m7k))IQOHBmKy4sQdj6epp_P+k2Zb94xG~|
znJlK3GB?GbmEy9p=@!&V9HAp>!a^ez>X5cTox(uWvLHgnukJqh1OL$b-aYqozvrC$
z?mh2{1w39289<uB6@4a3%ZUJhB-Hs!uOK~LBnd%N2$8527*0kmtX!`X^SR8NTp2TL
z1jrBrk?<}g7AbJ8Fq<bKqF>#n`+!7v-0{R(ua0@GO4(P8D*#C0DB=T!R;Ndti8#xk
z*AjdR@mfVm(LTgB#2g*kAmV$3E??#`f>p~rPq0oRPDf{>BW9{zV);v~DA8dkhA0Xf
zQ&*rpEH&aJ)Z+3z*=S^;9t${#QQ5e_1Oa3~I&6bv*pBQrh=&wNKr?tvKCyNz>;?_W
zRUoT{O3*<msGtP&z(HySTD=&JN~9N~M-7!k{ZSrjD|N+{TT+%J5|s-OIur~(e+wY&
zJAj4SU~sN67+kOdtQr95C|}9fTmVRWf%MuHjcoy-RRdhVwW7&S1GF9oSntsm>57)V
zvkKV|r4nHBCxA7%08w`VB0gWP8S)W+Xu1y|If#DM9f10?0Gm-fEf3wctVndX68Rkr
z`Z`Yw)`qzsjsMX=dGK)O=x@Kog4@L&i=B<rvVqy3r`}QDpud9ou48S7zQ%kFYQt4*
zW0Yv(u_$lku|4p&-qAHe^)Mjg$Mf^9DO>fI6-TW&r|+AAP>OUhDnIGjN7I=<^fc6%
z6Rx$m|D5S;Y<}DS9<|`9_v6}s@k_JWEI9?pH>sA+an+`R@UriZ-QXT<$_?9<!&Q>B
z`u8^&ZZ?bW8jX>{LN?uy`un_4&WK5Da=Y$_`V*Uc&Y9doCBKvQ0KaXF#>zaUhy9wx
z%SpFgM+~P&YxW9zgXd;~2X=L5N+YFP3O+4;G)KPRO#RAUd-&{$35LgfnO6A5k;O|b
z{FJK$ioS>LR!+UShcmSG+Y@2*XbWeP*~l3l8`o0#RMsiZ6Z4ac?c5Yc=lWZ&t+qC{
zv}e0Obx~8jnw2kbuvCIxt8c7qs%|*-N*$XuxnYnWtm9-<&9(8Yvr#dO>Em&v{=glj
zFk)QTvDVh^czQG|deo8jR~Ee3*&KQ%o4#%?nYQ<NOQ6b=T=q_Pe%y`&@%}(nzo}~=
z;Psih1_Lr=hXP)&smmXbc}+6BtxWad{=sJnPN#LjW^Z-AsS%ts$t=8$_kPZ>$J>70
we519)zNRj|w&Yk2<rB+4jsN9OthO6_+lOZMPl<*ryASEl;d{QgHhDh$e}e*o;Q#;t

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify_silhouette.webp b/app/resources/Android/src/main/res/drawable-xxhdpi/ic_stat_notify_silhouette.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1c68a3dffb766edb1fd26df117e02ea9c9b8c947
GIT binary patch
literal 1160
zcmWIYbaQK9VPFV%bqWXzu!!JdU|=u+Vs|j|baoC1VFGd)m_l-rbBkGkQn`60MM3UP
z3K5Y}3hYlASQsQ3_!zVp^b?bd3w(p!LO`mqgKyUu7(p_ZbwOrfSA$cOJ0-O^nSp_k
z1E|6-xuB>7$o2rTeacG;K<p_%wn%bDVhWJG0?5`W0y+@Lz5)_Yg0NqJ*y#}V9}v4J
zB*+=)Hvu49AsvaGgv3tHD9Qz@0R@UmZcZuC4PXHB2~TQXXfTjg0%944Vum1KusJa(
zFnBV!GB`7sF&Hvf0!cFlT?QitJs^((hklURG7NqU`9QtNK(c_LlA(wplOdfUgQ0{$
z2Pj$!G(8narvb%NfiQ=m5)}SGeL#Q+*Wxr|Bd`!7j}rp}>%IT~KdUk@uuo=S_&eeM
z|KAJ$|Npy)fr0rB1H*wlg#P>m3=9@uf#MSoVk+|)82DQl7`7coh$T&DVA$Tyz#wt6
zAh9SBY!5S#WJ*h8VEDA0fq^%YfkF5J0|QqyB+P(vAbEzx*BKZ>s)12;mVsgBECvQO
zpnCooU~2PW1Ewu~_XC0gr5>Ad&GQ!D`oHWw%Or&jzXb0zbTz0jBuJjzRw{LV&b4j1
zx3|5mZOpxGbMxNp^2z6JeM@8d#V>2Ff3)pQg^YEyAb$*Z;*w>jj7u&}_R^9NS6r2^
z_gZZeOZ4@CMc!fD8V!@4P7}6%xv1-7!>7N+x?evQAO7(yrhP%k|Kiumy#cH}Cl>ks
zXw18>=DIjx539IzYTv?5exaKVPi>tjozu0r`1lN`Ltk_<rll}R3PcIHeG_tBzxhRZ
zyh5kl>37dX%Dgv!kUlPXvUoA`+<3P0-=98cn^@G;@Y`lWp}bM!)1B%COA0PseeiyA
zylLiVnS`RLYCH6~Jd1z2Oj(d~SYrL2o)q4t9&yvygK8`1=~PZ!sl!;?(eR@yDq-5m
z6M142J2(xPje0xMZg$>LVU!K}Vr=|)deVjWD%U5@SE-%&kh9nA*W?=abCXlt-=9eR
z;#nki(?>|Uvisge?UPk08GB_r<Nae=HpvCGTs)Zd?N`8$ET{ermT{*AuPuJIQS7^2
zXW(hCSqAem=UltCv1#%7$!y__9$!N%3V0dTtv}qX&9K|};lZi{?_w%8NNuo|mRrO6
z=3G0wHskL1E$puucE4|B-@GS|sq8*)f8Eh)A)a^ahyRvjUwGFwODp5Wq#CUcs~p!c
p-IU4@4fuav`Q3ZF`XgCe8h?K&y}0(y>6ztQ&gY~Sg#Hs?1OQ)iaQ6TJ

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify.webp b/app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify.webp
new file mode 100644
index 0000000000000000000000000000000000000000..494cf34a0973184ec23b18997ca6013c49521f18
GIT binary patch
literal 1350
zcmZ{iYfw{16vt0U(1MBqnPR4t#E67fh#^YDXqW;akd&8@BGFJL1cCyAGy!>pI{3y?
z83YF!Y{N^00Y;f(K}U3GL!ls8dA5MSRC!yaqEaD*bORsogYLb1_P76Y&feW~H-yXK
zco+j5_VEf13ucC!0>EC>BiCN8w|6k#2u;C=pCFbhaL6T1OqPfEdXd5fM@X9|0S5#y
z14p2V#0ptJD2H!|et%mW1dPGcM>VYV{+JJ{TcTqWVgSrXD8fT5lP4qgL+qcLEHm&G
z#FpY?qG-g`h@ItVgNXYLdel147&vyFR}3uYhj^p2;SrN!-{GitSbR(_MKOk=*h&*p
z&>q&B;UrsQ62A;ZBN=sTP(TRyf)|j03qIftZa@cjWZi%YuHb@Z@PT~8+SU*VNhnv0
ztPIjY4#y!DjzKawBQ*uB9)m^+(qqt*0O^MMqde3$>Z*`1T-PMbRxbeKF}?oP9)QgS
z0J=QAUR$Qu>&gMJj{#Z|H}aE80hn))p0}admH=!&3(%<9(4vX}nl1qB9FmFTqP6c}
zku{P?02ZnMwg~`sJOVI1x?VHnGx(w6PXN9W{i<#NRWX1air+3ox6NOJ?iMYw#R_k6
z@$!UQ{)BjW-i(RMR#MZ7tF%NJ2}qBH3E~>*NaOzD!MN`l5lBbE@)vg9xisNdUK7}G
zU1zy$qMdf|oBH+I@rJp{C7);a#hZG}@B)GwGzWQ<QB(VIs}^=x+L>FY#$T(taQAJp
zmc&2IW-egjz(>!mv`Tm1$;gVfE3?A(rS#6eJ)-@jGsu${wrZ5uADTar^7N~h4!pm0
z<;04*XICl<I*%^R@0hmN7?<uV`iWV9bHe^Huy;_9Ppf!r?uZY|#f0y?&La!5i6<XE
zS>gHcMANJLe#dHCrFIsNY<rXzS8Dp~_LnIBQx*2vOOqI_KZac_X<6NuquE3Ds7*Ur
zd)o8$x4HQN16{_n{;`rKp_(4(nQB$7KIm*>uf*4|>k8(@neBvbM$W4_=J>s-d)P~l
z+>dvXD211alut*^5m%{kpF8%deXq`tb+e-riZ<ckmSDD{?%Zi*(BhodR+)1)mOIqP
z?Ox92$LMzr{~K5CH><$u=-ilS=H0lz%>QX9QLJ>H8=*&V&yz>E&70%<>%TcMPxjz8
zl4)G_Zq?Uc*pSPIVxuRVOz19!n}QD1X~9AH3p=nN-n=xcmB4l#tEagKk{jG#JRPK4
zi||d8toGz<l}_E4U*EXq<9s)Yemjz=%s4wlA7#xBV^=bsFpQ?}?@mqCP@3~{aS@q0
z2j<%etv2mH6J4}MdButRh@0$E>YFG`T;v6fl#*EgTvh#cMswgdmerdom*(*oEY`>0
zt1li(I&qzIr$c2uFeS;byjpBrG1%oysI-&xR420@aLOJCm~+DJ&QtDZ4q3E4zY!o~
zVJ4HPmku*RR;T0*wQU(inuu-fr&D{?@#(^siNgXaMY~<N7(W!@=}k>>%3BES_^jg|
Wna9a|c=Opz<ZXt(NZ))51OEfTn$N)i

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify_silhouette.webp b/app/resources/Android/src/main/res/drawable-xxxhdpi/ic_stat_notify_silhouette.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b05161d1d241392a438a76defbf6d7e7cdfc231c
GIT binary patch
literal 1336
zcmZ{idobKr6vxkcze&Y=lUWr>ykDhg9@`bmin7?KN5x~U-C$X}>k$%3S8AgnOj#yk
ziUuL6j+QPe20=RBuS8=c1|h?wLa4<c+q?WBe<b(!yXSuH_ndQo_nzPNB@v0%vH;(@
z63G5!#{eY&utq&}?<KjokSS7V3R09<Dw89FT+BEw+t-bN3kVFt$<Kof=z$uTf>k(`
z!}`XLNRdQ;yotsEBk_z`NY?sz%qLalNE(L<fKfmZXQ(VT7qL5H&txu3!Uc#AQyJlr
zh^rBsv(W|-Kb7ba`@A4w`abVSm`(9@L1)uIjH7?R5g#y>!DgZuNl}h5V-wLH_L}4*
zDzvx@erWt0bu4he7u<jVI3R&5xPSxLfD^I~U;(yZiDvMLe978a@Pc@hOGTCimw^qJ
zfDR1cf;mzX(dslbMj@Sso>;gnsXxj??VzrlC_CFd38O*)kew2X*Ng$=^8t4A#NzF8
zv3U0v0O=P1?QsYB@nryx>qyT#(2kV?sNVn(b{=REMF5R_0Nn{zI6HjrJJQHXMMVLu
z-Um<(1kfA?Pzv6!8S+W|aPJ=gN*elA0|0l50gj`1_3zMa^Aw`HWfj`4qmf9?V?L~5
zPKdp7i|`IBtLni8F*mRP$|R3LQ3!2P$Sf2-)30PAm`pJUj5&_GRysRv7}A_Te;-GG
z@>}<jZ7x35bT{+Db|r6+Qg@Rh7qdW7d3}joCmj=;zk{_V;hzu8bn`TEvElq;qc5;=
zEp=hRO>&*lsr<W-G9On^ldH9`3%<e@3R^Y9weKxu?DUhquK(VSA0BILyqk#=oO%40
zi1epMP(Vw^iGHQgqn}L_E9{&mk9-dXx;{G3PD*)@H>MfA3YjY#RPSML%o0AZj?~+%
zKl8NpevJ-Y)04PyE~m|6Zn?&kfeZ8YpEh~0(z>}O;^CLFdtMsy4wcWbj^Yw5%MHpi
zn5#1NM{+CjRxqYnCka1J_CLVKB#7MSd)5zaT(pl(Zc4(+JGM6PnMwB1o!sjaE2DZ<
z!r4`u-l^Uy$0fI|6aiy7EYfyjQ`(r(W~}GqQQ!PWbz{X>3Rw(QHDY$cxJDX}EBICB
zjx$~_H;D3_=*Mp?sLC)edLff#GLux_wiqYql54iyGB{UT5v{X4sx{}W=yVg0Q6?xZ
zT571IdQ3%VbVv<^kRC#MSBk~Nt#?MZN}?ULS95;%vvoEzGS;g1y*O)c_OtORcTOs+
zXtck?lU}*$lvUgD=I`t)q4p+;#GmT*`RZ%$Zns+gFyOX;@#3Y@?-`uRZ^90B8xBgB
zoLHRnykeYwz0h;!HO9snAFMrOUM8qrrmGG2iZ<+|8ML|GZ28*k*3ywO!N`W4c7yHv
zbRy4RlydeJ-fa6(sZW`pb!td=xHo;7F2kS=eHo!V__e|txO#rkJ0j_J4>8`~X1#DH
z?N$EE{KcHeYh`DzZpn&@rnXm$#qIOuR>?-X|DG2sH29<u%IyiZLZxdwKUKbFpHk;e
Gj^h8ina555

literal 0
HcmV?d00001

diff --git a/app/resources/Android/src/main/res/values-ar/strings.xml b/app/resources/Android/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..5ae6f254
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-ar/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"ثوان"</string>
+  <string name="hours">"ساعات"</string>
+  <string name="hour">"ساعة"</string>
+  <string name="minutes">"دقائق"</string>
+  <string name="minute">"دقيقة"</string>
+  <string name="dlyDur">"مدة التأخير"</string>
+  <string name="tmrvbrt">"اهتزاز المؤقت"</string>
+  <string name="tmrSnd">"صوت المؤقت"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"لأي وصفة؟"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"مؤقت %1$s"</string>
+  <string name="delay">"التأخير"</string>
+  <string name="stop">"قف"</string>
+  <string name="strtBtn">"ابدأ"</string>
+  <string name="ntmr">"مؤقت جديد"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sysDefB">"System default + Black"</string>
+  <string name="buto">"Backed up to %1$s"</string>
+  <string name="yld">"Yield"</string>
+  <string name="yieldU">"Yield unit"</string>
+  <string name="yieldQ">"Yield quantity"</string>
+  <string name="yesterday">"أمس"</string>
+  <string name="WED">"WED"</string>
+  <string name="wAgo">"قبل %1$s أسابيع"</string>
+  <string name="Vietnamese">"فيتنامية"</string>
+  <string name="Vegetarian">"نباتي"</string>
+  <string name="Vegan">"نباتي صرف"</string>
+  <string name="untRec">"Untitled Recipe"</string>
+  <string name="unsaved">"تغيرات غبر محفوظة"</string>
+  <string name="Unit">"وحدة"</string>
+  <string name="unit">"وحدة"</string>
+  <string name="Undefined">"Undefined"</string>
+  <string name="Turkish">"تركية"</string>
+  <string name="TUE">"TUE"</string>
+  <string name="tsp">"tsp"</string>
+  <string name="tsInfo">"separate with spaces"</string>
+  <string name="ts">"العلامات"</string>
+  <string name="trySer">"ابحث في كل الوصفات؟"</string>
+  <string name="trylater">"حاول لاحقاً"</string>
+  <string name="trnsl">"ترجم"</string>
+  <string name="triedInfo">"جربت هذه الوصفة %1$s"</string>
+  <string name="today">"اليوم"</string>
+  <string name="tLInfo">"الوصفات التي تريد تجربتها مسرودة هنا"</string>
+  <string name="title">"العنوان"</string>
+  <string name="THU">"THU"</string>
+  <string name="Theme">"السمة"</string>
+  <string name="Thai">"تايلندية"</string>
+  <string name="Teaspoon">"ملعقة شاي"</string>
+  <string name="tbsp">"tbsp"</string>
+  <string name="Tablespoon">"ملعقة"</string>
+  <string name="sysDef">"System default"</string>
+  <string name="swm">"ابدأ الاسبوع يوم الاثنين"</string>
+  <string name="Swedish">"سويدية"</string>
+  <string name="sVwInfo">"لمساعدتك على اختيار ما تطبخ عندما لا تستطيع الاختيار"</string>
+  <string name="sVw">"هز لرؤية وصفة عشوائية"</string>
+  <string name="SUN">"SUN"</string>
+  <string name="strAdd">"ابدأ إضافة وصفاتك!"</string>
+  <string name="stp">"خطوة"</string>
+  <string name="stick">"stick"</string>
+  <string name="stars">"التقييم النجمي"</string>
+  <string name="sru">"شارك وصفة باستعمال..."</string>
+  <string name="srt">"Sort"</string>
+  <string name="srpu">"شارك صورة الوصفة باستعمال..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"سري لانكية"</string>
+  <string name="Spanish">"اسبانية"</string>
+  <string name="Soups">"شوربات"</string>
+  <string name="snacks">"وجبات خفيفة"</string>
+  <string name="small">"صغير"</string>
+  <string name="sltd">"المختارة"</string>
+  <string name="_Slowest_first_hHjY6">"الأبطأ أولاً"</string>
+  <string name="simple">"بسيط"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"الأطباق الجانبية"</string>
+  <string name="shr">"شارك"</string>
+  <string name="Settings">"الإعدادات"</string>
+  <string name="SET">"SET"</string>
+  <string name="Serving">"Serving"</string>
+  <string name="ser">"ابحث"</string>
+  <string name="September">"سبتمبر"</string>
+  <string name="selRec">"اختر وصفة"</string>
+  <string name="Seafood">"بحرية"</string>
+  <string name="Scottish">"سكتلندية"</string>
+  <string name="Sauces">"صلصات"</string>
+  <string name="SAT">"SAT"</string>
+  <string name="Salads">"سلطات"</string>
+  <string name="Russian">"روسية"</string>
+  <string name="rst">"أعد التشغيل"</string>
+  <string name="rp">"Remove photo"</string>
+  <string name="Roll">"لفة"</string>
+  <string name="rmYUInfo">"You are about to remove %1$s from the yield unit list"</string>
+  <string name="rmUInfo">"You are about to remove %1$s from the unit list"</string>
+  <string name="rmN">"Note removed"</string>
+  <string name="rmIns">"Instruction removed"</string>
+  <string name="rmIng">"Ingredient removed"</string>
+  <string name="rmCuiInfo">"You are about to remove %1$s from the cuisine list"</string>
+  <string name="rmCmb">"Combination removed"</string>
+  <string name="rmCatInfo">"You are about to remove %1$s from the category list"</string>
+  <string name="Rice">"أرز"</string>
+  <string name="restYUL">"Reset yield unit list"</string>
+  <string name="restUL">"Reset unit list"</string>
+  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
+  <string name="restDone">"Reset done"</string>
+  <string name="restCuiL">"Reset cuisine list"</string>
+  <string name="restCatL">"Reset category list"</string>
+  <string name="rest">"Reset"</string>
+  <string name="resNF">"Recipe not found"</string>
+  <string name="req">"Required %1$s"</string>
+  <string name="recU">"Updated:"</string>
+  <string name="recTitle">"وصفتي الصحية"</string>
+  <string name="recs">"الوصفات"</string>
+  <string name="recRm">"Recipe removed"</string>
+  <string name="recPic">"صورة الوصفة"</string>
+  <string name="recListEmp">"لا شيء هنا! أضف بعض الوصفات ثم حاول مجدداً"</string>
+  <string name="recI">"المستورد:"</string>
+  <string name="recF">"recipes found"</string>
+  <string name="recE">"Already exist:"</string>
+  <string name="rec">"الوصفة"</string>
+  <string name="rBtn">"REMOVE"</string>
+  <string name="Rating">"التقييم"</string>
+  <string name="_Quickest_first_Z1CpP7N">"الاسرع أولاً"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="priv">"سياسة الخصوصية"</string>
+  <string name="prepT">"وقت التحضير"</string>
+  <string name="Pound">"رطل"</string>
+  <string name="Poultry">"دواجن"</string>
+  <string name="Portuguese">"برتغالية"</string>
+  <string name="plsAdd">"استعمل زر الزائد لإضافة واحدة"</string>
+  <string name="planner">"مخططة الوجبات"</string>
+  <string name="pinch">"رشة"</string>
+  <string name="Piece">"قطعة"</string>
+  <string name="piece">"قطعة"</string>
+  <string name="pht">"صورة الوصفة"</string>
+  <string name="photogrid">"Photo Grid"</string>
+  <string name="Patty">"فطيرة"</string>
+  <string name="Pasta">"باستا"</string>
+  <string name="oz">"oz"</string>
+  <string name="Ounce">"أونصة"</string>
+  <string name="opts">"الاعدادات"</string>
+  <string name="_Oldest_first_Z6cq4h">"الأقدم أولاً"</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"أكتوبر"</string>
+  <string name="nwYiU">"New yield unit"</string>
+  <string name="nwCat">"صنف جديد"</string>
+  <string name="November">"نوفمبر"</string>
+  <string name="nos">"ملاحظات"</string>
+  <string name="noRecsInL">"None of the recipes here matches your search"</string>
+  <string name="noRecs">"لا وصفات مطابقة لبحثك"</string>
+  <string name="Noodles">"نودلز"</string>
+  <string name="noFavs">"No favourites yet"</string>
+  <string name="noAccSensor">"مقياس التسارع إما معطل أو لا يعمل"</string>
+  <string name="no">"ملاحظة"</string>
+  <string name="nNBtn">"ليس الآن"</string>
+  <string name="nLangInfo">"أعد تشغيل EnRecipes لاستخدام اللغة الجديدة"</string>
+  <string name="Nigerian">"نيجيرية"</string>
+  <string name="newUnit">"وحدة جديدة"</string>
+  <string name="newRec">"وصفة جديدة"</string>
+  <string name="_Newest_first_2Sb3c">"الأجد أولاً"</string>
+  <string name="newCui">"مطبخ جديد"</string>
+  <string name="MON">"MON"</string>
+  <string name="Moderate">"متوسطة"</string>
+  <string name="ml">"مل"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="sec">"sec"</string>
+  <string name="min">"min"</string>
+  <string name="Millilitre">"مللتر"</string>
+  <string name="mg">"مغ"</string>
+  <string name="Mexican">"مكسيكية"</string>
+  <string name="medium">"medium"</string>
+  <string name="Meat">"لحم"</string>
+  <string name="May">"مايو"</string>
+  <string name="March">"مارس"</string>
+  <string name="_Main_dishes_u6RGQ">"الأطباق الرئيسة"</string>
+  <string name="mAgo">"منذ %1$s أشهر"</string>
+  <string name="lunch">"غداء"</string>
+  <string name="ltAgo">"منذ وقت طويل"</string>
+  <string name="Loaf">"رغيف"</string>
+  <string name="Litre">"لتر"</string>
+  <string name="listVM">"وضع عرض القائمة"</string>
+  <string name="Light">"فاتح"</string>
+  <string name="leaf">"leaf"</string>
+  <string name="lb">"lb"</string>
+  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
+  <string name="large">"كبير"</string>
+  <string name="lang">"اللغة"</string>
+  <string name="l">"ل"</string>
+  <string name="Korean">"كورية"</string>
+  <string name="Kilogram">"كيلوغرام"</string>
+  <string name="kg">"كغ"</string>
+  <string name="Kenyan">"كينية"</string>
+  <string name="kEdit">"KEEP EDITING"</string>
+  <string name="June">"يونيو"</string>
+  <string name="July">"يوليو"</string>
+  <string name="joinTG">"انضم لمجموعة التلغرام"</string>
+  <string name="Jewish">"يهودية"</string>
+  <string name="Japanese">"يابانية"</string>
+  <string name="January">"يناير"</string>
+  <string name="Jamaican">"جمايكية"</string>
+  <string name="Italian">"إيطالية"</string>
+  <string name="it">"Item"</string>
+  <string name="Irish">"إيرلندية"</string>
+  <string name="invFile">"ملف غير صحيح"</string>
+  <string name="intf">"الواجهة"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ings">"المكونات"</string>
+  <string name="Indian">"هندية"</string>
+  <string name="in">"إن"</string>
+  <string name="impSuc">"نجح الاستيراد"</string>
+  <string name="impip">"جار الاستيراد"</string>
+  <string name="impInfo">"يدعم النسخ الاحتياطية الكاملة المصدرة من هذا التطبيق"</string>
+  <string name="impFail">"فشل الاستيراد"</string>
+  <string name="impBu">"استورد البيانات"</string>
+  <string name="hr">"hr"</string>
+  <string name="Healthy">"صحية"</string>
+  <string name="guide">"دليل المستخدم"</string>
+  <string name="grocery">"قائمة التسوق"</string>
+  <string name="grid">"شبكة"</string>
+  <string name="Greek">"إغريقية"</string>
+  <string name="Gram">"غرام"</string>
+  <string name="gh">"اعرض على github"</string>
+  <string name="German">"ألمانية"</string>
+  <string name="Gallon">"جالون"</string>
+  <string name="gal">"جال"</string>
+  <string name="g">"غ"</string>
+  <string name="fsList">"وصفاتك المفضلة مسرودة هنا"</string>
+  <string name="FRI">"FRI"</string>
+  <string name="French">"فرنسية"</string>
+  <string name="_Fluid_Ounce_bd10L">"Fluid Ounce"</string>
+  <string name="fltr">"المصفاة"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"الوصفات المصفاة"</string>
+  <string name="Filipino">"فلبينية"</string>
+  <string name="February">"فبراير"</string>
+  <string name="favourites">"المفضلات"</string>
+  <string name="expSuc">"نجح التصدير"</string>
+  <string name="expip">"جار التصدير"</string>
+  <string name="expBu">"صدر نسخة احتياطية كاملة"</string>
+  <string name="EnRecipes">""</string>
+  <string name="English">"إنجليزية"</string>
+  <string name="Egyptian">"مصرية"</string>
+  <string name="editRec">"عدل الوصفة"</string>
+  <string name="Easy">"سهلة"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="drop">"قطرة"</string>
+  <string name="dozen">"درزن"</string>
+  <string name="donate">"تبرع"</string>
+  <string name="disc">"هذه الوصفة فيها تغييرات غير محفوظة. ما الذي تريد فعله؟"</string>
+  <string name="disBtn">"استبعد"</string>
+  <string name="dinner">"عشاء"</string>
+  <string name="_Difficulty_level_cSL5d">"مستوى الصعوبة"</string>
+  <string name="detailed">"مفصل"</string>
+  <string name="Desserts">"حلا"</string>
+  <string name="delRecsInfo">"You are about to permanently delete %1$s"</string>
+  <string name="delRecInfo">"You are about to permanently delete the recipe %1$s"</string>
+  <string name="December">"ديسمبر"</string>
+  <string name="dBtn">"DELETE"</string>
+  <string name="db">"قاعدة البيانات"</string>
+  <string name="Dark">"داكن"</string>
+  <string name="Danish">"دنماركي"</string>
+  <string name="dAgo">"قبل %1$s أيام"</string>
+  <string name="Cup">"كأس"</string>
+  <string name="cup">"كأس"</string>
+  <string name="cui">"المطبخ"</string>
+  <string name="Created">"Created"</string>
+  <string name="cPic">"قص الصورة"</string>
+  <string name="cookT">"Cooking time"</string>
+  <string name="conf">"Confirm"</string>
+  <string name="conBtn">"أكمل"</string>
+  <string name="cmbs">"Combinations"</string>
+  <string name="cm">"سم"</string>
+  <string name="clove">"فص"</string>
+  <string name="Chinese">"صينية"</string>
+  <string name="Challenging">"صعبة"</string>
+  <string name="cBtn">"ألغ"</string>
+  <string name="cat">"الصنف"</string>
+  <string name="buMod">"لف النسخة الاحتياطة عدل في مكان آخر"</string>
+  <string name="buInfo">"يولد ملف ZIP يحتوي على جميع بياناتك يمكن استيراده مجدداً"</string>
+  <string name="buInc">"ملف نسخة احتياطي مشوه أو فاسد"</string>
+  <string name="buFol">"مجلد النسخ الاحتياطية"</string>
+  <string name="buEmp">"مجلد النسخ الاحتيطية فارغ"</string>
+  <string name="British">"بريطانية"</string>
+  <string name="breakfast">"فطور"</string>
+  <string name="Breads">"أخباز"</string>
+  <string name="Brazilian">"برازيلية"</string>
+  <string name="Black">"أسود"</string>
+  <string name="Beverages">"مشروبات"</string>
+  <string name="Barbecue">"شواء"</string>
+  <string name="August">"أغسطس"</string>
+  <string name="aStpBtn">"أضف خطوة"</string>
+  <string name="April">"أبريل"</string>
+  <string name="appRst">"إعادة تشغيل التطبيق متطلبة"</string>
+  <string name="apply">"طبق"</string>
+  <string name="appInfo">"EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes"</string>
+  <string name="Appetizers">"مقبلات"</string>
+  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
+  <string name="_app_name_1k3Sbz">""</string>
+  <string name="app_name">""</string>
+  <string name="title_activity_kimera">""</string>
+  <string name="aNoBtn">"أضف ملاحظة"</string>
+  <string name="aNBtn">"أضف جديدة"</string>
+  <string name="American">"أمريكية"</string>
+  <string name="allTs">"كل العلامات"</string>
+  <string name="allCuis">"كل المطابخ"</string>
+  <string name="allCats">"كل الأصناف"</string>
+  <string name="aIngBtn">"أضف مكون"</string>
+  <string name="aFBu">"أضف وصفة لتقوم بالنسخ الاحتياطي"</string>
+  <string name="addCmbBtn">"ADD COMBINATION"</string>
+  <string name="aD">"انتهى!"</string>
+  <string name="aBtn">"أضف"</string>
+  <string name="About">"حول"</string>
+  <string name="aap">"ألحق صورة"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-ca/strings.xml b/app/resources/Android/src/main/res/values-ca/strings.xml
index 1eee7fcb..fcae9396 100644
--- a/app/resources/Android/src/main/res/values-ca/strings.xml
+++ b/app/resources/Android/src/main/res/values-ca/strings.xml
@@ -1,58 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="yld">""</string>
-  <string name="yieldU">""</string>
-  <string name="yieldQ">""</string>
-  <string name="yesterday">""</string>
+  <string name="sec">"s"</string>
   <string name="WED">"DC."</string>
-  <string name="wAgo">""</string>
-  <string name="Vietnamese">""</string>
   <string name="Vegetarian">"Vegetarianes"</string>
   <string name="Vegan">"Veganes"</string>
   <string name="untRec">"Recepta sense títol"</string>
   <string name="unsaved">"Canvis no desats"</string>
-  <string name="Unit">""</string>
-  <string name="unit">""</string>
   <string name="Undefined">"Sense definir"</string>
-  <string name="Turkish">""</string>
   <string name="TUE">"DT."</string>
-  <string name="tsp">""</string>
-  <string name="tsInfo">""</string>
   <string name="ts">"Etiquetes"</string>
-  <string name="trySer">""</string>
   <string name="trylater">"Per a provar més tard"</string>
   <string name="trnsl">"Tradueix"</string>
-  <string name="triedInfo">""</string>
-  <string name="today">""</string>
-  <string name="tLInfo">""</string>
-  <string name="title">""</string>
   <string name="THU">"DJ."</string>
-  <string name="Theme">""</string>
-  <string name="Thai">""</string>
   <string name="Teaspoon">"Culleradeta"</string>
-  <string name="tbsp">""</string>
   <string name="Tablespoon">"Cullerada"</string>
-  <string name="sysDef">""</string>
-  <string name="swm">""</string>
-  <string name="Swedish">""</string>
-  <string name="sVwInfo">""</string>
-  <string name="sVw">""</string>
   <string name="SUN">"DG."</string>
-  <string name="strAdd">""</string>
-  <string name="stp">""</string>
-  <string name="stick">""</string>
-  <string name="stars">""</string>
-  <string name="sru">""</string>
-  <string name="srt">""</string>
-  <string name="srpu">""</string>
-  <string name="_Sri_Lankan_Z7GfBa">""</string>
   <string name="Spanish">"Espanyola"</string>
   <string name="Soups">"Brous"</string>
   <string name="snacks">"piscolabis"</string>
-  <string name="small">""</string>
-  <string name="sltd">""</string>
-  <string name="_Slowest_first_hHjY6">""</string>
-  <string name="simple">""</string>
   <string name="_Side_dishes_Z1Et4Vg">"Guarnicions"</string>
   <string name="shr">"Comparteix"</string>
   <string name="Settings">"Paràmetres"</string>
@@ -60,236 +25,292 @@
   <string name="Serving">"Ració"</string>
   <string name="ser">"Cerca"</string>
   <string name="September">"setembre"</string>
-  <string name="selRec">""</string>
   <string name="Seafood">"Peix i marisc"</string>
-  <string name="Scottish">""</string>
   <string name="Sauces">"Salses"</string>
   <string name="SAT">"DS."</string>
   <string name="Salads">"Amanides"</string>
-  <string name="Russian">""</string>
   <string name="rst">"REINICIA"</string>
-  <string name="rp">""</string>
-  <string name="Roll">""</string>
-  <string name="rmYUInfo">""</string>
-  <string name="rmUInfo">""</string>
-  <string name="rmN">""</string>
-  <string name="rmIns">""</string>
-  <string name="rmIng">""</string>
-  <string name="rmCuiInfo">""</string>
-  <string name="rmCmb">""</string>
-  <string name="rmCatInfo">""</string>
   <string name="Rice">"Arròs"</string>
-  <string name="restYUL">""</string>
-  <string name="restUL">""</string>
-  <string name="restInfo">""</string>
-  <string name="restDone">""</string>
-  <string name="restCuiL">""</string>
-  <string name="restCatL">""</string>
-  <string name="rest">""</string>
-  <string name="resNF">""</string>
-  <string name="req">""</string>
-  <string name="recU">""</string>
-  <string name="recTitle">""</string>
-  <string name="recs">""</string>
-  <string name="recRm">""</string>
-  <string name="recPic">""</string>
-  <string name="recListEmp">""</string>
-  <string name="recI">""</string>
-  <string name="recF">""</string>
-  <string name="recE">""</string>
   <string name="rec">"Recepta com a text"</string>
-  <string name="rBtn">""</string>
-  <string name="Rating">""</string>
-  <string name="_Quickest_first_Z1CpP7N">""</string>
-  <string name="qt">""</string>
-  <string name="pt">""</string>
-  <string name="priv">""</string>
-  <string name="prepT">""</string>
   <string name="Pound">"Lliura"</string>
-  <string name="Poultry">""</string>
-  <string name="Portuguese">""</string>
-  <string name="plsAdd">""</string>
   <string name="planner">"Planificador d’àpats"</string>
-  <string name="pinch">""</string>
   <string name="Piece">"Peça"</string>
-  <string name="piece">""</string>
   <string name="pht">"Foto de la recepta"</string>
-  <string name="photogrid">""</string>
-  <string name="Patty">""</string>
   <string name="Pasta">"Pasta"</string>
-  <string name="oz">""</string>
   <string name="Ounce">"Unça"</string>
-  <string name="opts">""</string>
-  <string name="_Oldest_first_Z6cq4h">""</string>
   <string name="OK">"D’acord"</string>
   <string name="October">"octubre"</string>
-  <string name="nwYiU">""</string>
   <string name="nwCat">"Categoria nova"</string>
   <string name="November">"novembre"</string>
-  <string name="nos">""</string>
-  <string name="noRecs">""</string>
   <string name="Noodles">"Fideus"</string>
-  <string name="noFavs">""</string>
-  <string name="noAccSensor">""</string>
-  <string name="no">""</string>
   <string name="nNBtn">"ARA NO"</string>
-  <string name="nLangInfo">""</string>
-  <string name="Nigerian">""</string>
-  <string name="newUnit">""</string>
-  <string name="newRec">""</string>
-  <string name="_Newest_first_2Sb3c">""</string>
-  <string name="newCui">""</string>
   <string name="MON">"DL."</string>
-  <string name="Moderate">""</string>
-  <string name="ml">""</string>
-  <string name="minimal">""</string>
-  <string name="min">""</string>
   <string name="Millilitre">"Mil·lilitre"</string>
-  <string name="mg">""</string>
   <string name="Mexican">"Mexicana"</string>
-  <string name="medium">""</string>
   <string name="Meat">"Carn"</string>
   <string name="May">"maig"</string>
   <string name="March">"març"</string>
-  <string name="_Main_dishes_u6RGQ">""</string>
-  <string name="mAgo">""</string>
-  <string name="lunch">""</string>
-  <string name="ltAgo">""</string>
-  <string name="Loaf">""</string>
   <string name="Litre">"Litre"</string>
-  <string name="listVM">""</string>
-  <string name="Light">""</string>
-  <string name="leaf">""</string>
-  <string name="lb">""</string>
-  <string name="_Last_updated_Z2gEbLD">""</string>
-  <string name="large">""</string>
-  <string name="lang">""</string>
-  <string name="l">""</string>
-  <string name="Korean">""</string>
   <string name="Kilogram">"Quilogram"</string>
-  <string name="kg">""</string>
-  <string name="Kenyan">""</string>
-  <string name="kEdit">""</string>
   <string name="June">"juny"</string>
   <string name="July">"juliol"</string>
-  <string name="joinTG">""</string>
-  <string name="Jewish">""</string>
-  <string name="Japanese">""</string>
   <string name="January">"gener"</string>
-  <string name="Jamaican">""</string>
-  <string name="Italian">""</string>
-  <string name="it">""</string>
-  <string name="Irish">""</string>
   <string name="invFile">"El fitxer no és vàlid"</string>
-  <string name="intf">""</string>
-  <string name="inss">""</string>
-  <string name="ings">""</string>
-  <string name="Indian">""</string>
-  <string name="in">""</string>
-  <string name="impSuc">""</string>
-  <string name="impip">""</string>
-  <string name="impInfo">""</string>
   <string name="impFail">"Ha fallat la importació"</string>
-  <string name="impBu">""</string>
-  <string name="hr">""</string>
-  <string name="Healthy">""</string>
-  <string name="guide">""</string>
   <string name="grocery">"Llista de queviures"</string>
   <string name="grid">"Graella"</string>
-  <string name="Greek">""</string>
   <string name="Gram">"Gram"</string>
-  <string name="gh">""</string>
-  <string name="German">""</string>
   <string name="Gallon">"Galó"</string>
-  <string name="gal">""</string>
-  <string name="g">""</string>
-  <string name="fsList">""</string>
   <string name="FRI">"DV."</string>
-  <string name="French">""</string>
   <string name="_Fluid_Ounce_bd10L">"Unça líquida"</string>
-  <string name="fltr">""</string>
-  <string name="_fl_oz_72kqu">""</string>
-  <string name="_Filtered_recipes_Z1alhhu">""</string>
-  <string name="Filipino">""</string>
   <string name="February">"febrer"</string>
   <string name="favourites">"Preferits"</string>
-  <string name="expSuc">""</string>
-  <string name="expip">""</string>
-  <string name="expBu">""</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="English">""</string>
-  <string name="Egyptian">""</string>
-  <string name="editRec">""</string>
-  <string name="Easy">""</string>
-  <string name="dsp">""</string>
-  <string name="drop">""</string>
-  <string name="dozen">""</string>
-  <string name="donate">""</string>
   <string name="disc">"Aquesta recepta té canvis no desats. Què voleu fer?"</string>
   <string name="disBtn">"DESCARTA’LS"</string>
-  <string name="dinner">""</string>
-  <string name="_Difficulty_level_cSL5d">""</string>
-  <string name="detailed">""</string>
   <string name="Desserts">"Postres"</string>
-  <string name="delRecsInfo">""</string>
-  <string name="delRecInfo">""</string>
   <string name="December">"desembre"</string>
   <string name="dBtn">"SUPRIMEIX"</string>
-  <string name="db">""</string>
-  <string name="Dark">""</string>
-  <string name="Danish">""</string>
-  <string name="dAgo">""</string>
   <string name="Cup">"Tassa"</string>
-  <string name="cup">""</string>
-  <string name="cui">""</string>
-  <string name="Created">""</string>
   <string name="cPic">"Escapça la foto"</string>
-  <string name="cookT">""</string>
   <string name="conf">"Confirma"</string>
   <string name="conBtn">"CONTINUA"</string>
-  <string name="cmbs">""</string>
-  <string name="cm">""</string>
-  <string name="clove">""</string>
-  <string name="Chinese">""</string>
-  <string name="Challenging">""</string>
-  <string name="cBtn">""</string>
-  <string name="cat">""</string>
-  <string name="buMod">""</string>
-  <string name="buInfo">""</string>
-  <string name="buInc">""</string>
-  <string name="buFol">""</string>
-  <string name="buEmp">""</string>
-  <string name="British">""</string>
-  <string name="breakfast">""</string>
   <string name="Breads">"Pans"</string>
-  <string name="Brazilian">""</string>
-  <string name="Black">""</string>
   <string name="Beverages">"Begudes"</string>
   <string name="Barbecue">"Barbacoes"</string>
   <string name="August">"agost"</string>
-  <string name="aStpBtn">""</string>
   <string name="April">"abril"</string>
   <string name="appRst">"Cal reiniciar l’aplicació"</string>
-  <string name="apply">""</string>
   <string name="appInfo">"L’EnRecipes és un receptari digital, de codi obert i privat, que us permet crear, gestionar i compartir les vostres receptes"</string>
   <string name="Appetizers">"Aperitius"</string>
-  <string name="appCrd">""</string>
   <string name="_app_name_1k3Sbz">"EnRecipes"</string>
   <string name="app_name">"EnRecipes"</string>
   <string name="title_activity_kimera">"EnRecipes"</string>
-  <string name="aNoBtn">""</string>
   <string name="aNBtn">"AFEGEIX-NE UN DE NOU"</string>
-  <string name="American">""</string>
   <string name="allTs">"Totes les etiquetes"</string>
-  <string name="allCuis">""</string>
   <string name="allCats">"Totes les categories"</string>
-  <string name="aIngBtn">""</string>
-  <string name="aFBu">""</string>
-  <string name="addCmbBtn">""</string>
-  <string name="aD">""</string>
-  <string name="aBtn">""</string>
   <string name="About">"Quant a"</string>
-  <string name="aap">""</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sysDefB">"System default + Black"</string>
   <string name="buto">"Backed up to %1$s"</string>
+  <string name="yld">"Yield"</string>
+  <string name="yieldU">"Yield unit"</string>
+  <string name="yieldQ">"Yield quantity"</string>
+  <string name="yesterday">"yesterday"</string>
+  <string name="wAgo">"%1$s weeks ago"</string>
+  <string name="Vietnamese">"Vietnamese"</string>
+  <string name="Unit">"Unit"</string>
+  <string name="unit">"unit"</string>
+  <string name="Turkish">"Turkish"</string>
+  <string name="tsp">"tsp"</string>
+  <string name="tsInfo">"separate with spaces"</string>
+  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
+  <string name="triedInfo">"You tried this recipe %1$s"</string>
+  <string name="today">"today"</string>
+  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
+  <string name="title">"Title"</string>
+  <string name="Theme">"Theme"</string>
+  <string name="Thai">"Thai"</string>
+  <string name="tbsp">"tbsp"</string>
+  <string name="sysDef">"System default"</string>
+  <string name="swm">"Start week on Monday"</string>
+  <string name="Swedish">"Swedish"</string>
+  <string name="sVwInfo">"Helps you choose what to cook when you can\'t decide"</string>
+  <string name="sVw">"Shake to view random recipe"</string>
+  <string name="strAdd">"Start adding your recipes!"</string>
+  <string name="stp">"Step"</string>
+  <string name="stick">"stick"</string>
+  <string name="stars">"Star rating"</string>
+  <string name="sru">"Share recipe using..."</string>
+  <string name="srt">"Sort"</string>
+  <string name="srpu">"Share recipe photo using..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankan"</string>
+  <string name="small">"small"</string>
+  <string name="sltd">"selected"</string>
+  <string name="_Slowest_first_hHjY6">"Slowest first"</string>
+  <string name="simple">"Simple"</string>
+  <string name="selRec">"Select recipe"</string>
+  <string name="Scottish">"Scottish"</string>
+  <string name="Russian">"Russian"</string>
+  <string name="rp">"Remove photo"</string>
+  <string name="Roll">"Roll"</string>
+  <string name="rmYUInfo">"You are about to remove %1$s from the yield unit list"</string>
+  <string name="rmUInfo">"You are about to remove %1$s from the unit list"</string>
+  <string name="rmN">"Note removed"</string>
+  <string name="rmIns">"Instruction removed"</string>
+  <string name="rmIng">"Ingredient removed"</string>
+  <string name="rmCuiInfo">"You are about to remove %1$s from the cuisine list"</string>
+  <string name="rmCmb">"Combination removed"</string>
+  <string name="rmCatInfo">"You are about to remove %1$s from the category list"</string>
+  <string name="restYUL">"Reset yield unit list"</string>
+  <string name="restUL">"Reset unit list"</string>
+  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
+  <string name="restDone">"Reset done"</string>
+  <string name="restCuiL">"Reset cuisine list"</string>
+  <string name="restCatL">"Reset category list"</string>
+  <string name="rest">"Reset"</string>
+  <string name="resNF">"Recipe not found"</string>
+  <string name="req">"Required %1$s"</string>
+  <string name="recU">"Updated:"</string>
+  <string name="recTitle">"My Healthy Recipe"</string>
+  <string name="recs">"recipes"</string>
+  <string name="recRm">"Recipe removed"</string>
+  <string name="recPic">"Recipe photo"</string>
+  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
+  <string name="recI">"Imported:"</string>
+  <string name="recF">"recipes found"</string>
+  <string name="recE">"Already exist:"</string>
+  <string name="rBtn">"REMOVE"</string>
+  <string name="Rating">"Rating"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="priv">"Privacy policy"</string>
+  <string name="prepT">"Preparation time"</string>
+  <string name="Poultry">"Poultry"</string>
+  <string name="Portuguese">"Portuguese"</string>
+  <string name="plsAdd">"Use the plus button to add one"</string>
+  <string name="pinch">"pinch"</string>
+  <string name="piece">"piece"</string>
+  <string name="photogrid">"Photo Grid"</string>
+  <string name="Patty">"Patty"</string>
+  <string name="oz">"oz"</string>
+  <string name="opts">"Options"</string>
+  <string name="_Oldest_first_Z6cq4h">"Oldest first"</string>
+  <string name="nwYiU">"New yield unit"</string>
+  <string name="nos">"Notes"</string>
   <string name="noRecsInL">"None of the recipes here matches your search"</string>
+  <string name="noRecs">"No recipes match your search"</string>
+  <string name="noFavs">"No favourites yet"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
+  <string name="no">"Note"</string>
+  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
+  <string name="Nigerian">"Nigerian"</string>
+  <string name="newUnit">"New unit"</string>
+  <string name="newRec">"New recipe"</string>
+  <string name="_Newest_first_2Sb3c">"Newest first"</string>
+  <string name="newCui">"New cuisine"</string>
+  <string name="Moderate">"Moderate"</string>
+  <string name="ml">"ml"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="min">"min"</string>
+  <string name="mg">"mg"</string>
+  <string name="medium">"medium"</string>
+  <string name="_Main_dishes_u6RGQ">"Main dishes"</string>
+  <string name="mAgo">"%1$s months ago"</string>
+  <string name="lunch">"Lunch"</string>
+  <string name="ltAgo">"a long time ago"</string>
+  <string name="Loaf">"Loaf"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="Light">"Light"</string>
+  <string name="leaf">"leaf"</string>
+  <string name="lb">"lb"</string>
+  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
+  <string name="large">"large"</string>
+  <string name="lang">"Language"</string>
+  <string name="l">"l"</string>
+  <string name="Korean">"Korean"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">"Kenyan"</string>
+  <string name="kEdit">"KEEP EDITING"</string>
+  <string name="joinTG">"Join the Telegram group"</string>
+  <string name="Jewish">"Jewish"</string>
+  <string name="Japanese">"Japanese"</string>
+  <string name="Jamaican">"Jamaican"</string>
+  <string name="Italian">"Italian"</string>
+  <string name="it">"Item"</string>
+  <string name="Irish">"Irish"</string>
+  <string name="intf">"Interface"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ings">"Ingredients"</string>
+  <string name="Indian">"Indian"</string>
+  <string name="in">"in"</string>
+  <string name="impSuc">"Import success"</string>
+  <string name="impip">"Import in progress"</string>
+  <string name="impInfo">"Supports full backups exported by this app"</string>
+  <string name="impBu">"Import data"</string>
+  <string name="hr">"hr"</string>
+  <string name="Healthy">"Healthy"</string>
+  <string name="guide">"User guide"</string>
+  <string name="Greek">"Greek"</string>
+  <string name="gh">"View on GitHub"</string>
+  <string name="German">"German"</string>
+  <string name="gal">"gal"</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"Your favourite recipes are listed here"</string>
+  <string name="French">"French"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
+  <string name="Filipino">"Filipino"</string>
+  <string name="expSuc">"Export success"</string>
+  <string name="expip">"Export in progress"</string>
+  <string name="expBu">"Export full backup"</string>
+  <string name="English">"English"</string>
+  <string name="Egyptian">"Egyptian"</string>
+  <string name="editRec">"Edit recipe"</string>
+  <string name="Easy">"Easy"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="drop">"drop"</string>
+  <string name="dozen">"dozen"</string>
+  <string name="donate">"Donate"</string>
+  <string name="dinner">"Dinner"</string>
+  <string name="_Difficulty_level_cSL5d">"Difficulty level"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="delRecsInfo">"You are about to permanently delete %1$s"</string>
+  <string name="delRecInfo">"You are about to permanently delete the recipe %1$s"</string>
+  <string name="db">"Database"</string>
+  <string name="Dark">"Dark"</string>
+  <string name="Danish">"Danish"</string>
+  <string name="dAgo">"%1$s days ago"</string>
+  <string name="cup">"cup"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Created">"Created"</string>
+  <string name="cookT">"Cooking time"</string>
+  <string name="cmbs">"Combinations"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"clove"</string>
+  <string name="Chinese">"Chinese"</string>
+  <string name="Challenging">"Challenging"</string>
+  <string name="cBtn">"CANCEL"</string>
+  <string name="cat">"Category"</string>
+  <string name="buMod">"The backup file was modified elsewhere"</string>
+  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
+  <string name="buInc">"Malformed or corrupt backup file"</string>
+  <string name="buFol">"Backup folder"</string>
+  <string name="buEmp">"The backup file is empty"</string>
+  <string name="British">"British"</string>
+  <string name="breakfast">"Breakfast"</string>
+  <string name="Brazilian">"Brazilian"</string>
+  <string name="Black">"Black"</string>
+  <string name="aStpBtn">"ADD STEP"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
+  <string name="aNoBtn">"ADD NOTE"</string>
+  <string name="American">"American"</string>
+  <string name="allCuis">"All Cuisines"</string>
+  <string name="aIngBtn">"ADD INGREDIENT"</string>
+  <string name="aFBu">"Add a recipe to perform a backup"</string>
+  <string name="addCmbBtn">"ADD COMBINATION"</string>
+  <string name="aD">"All done!"</string>
+  <string name="aBtn">"ADD"</string>
+  <string name="aap">"Attach a photo"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-da/strings.xml b/app/resources/Android/src/main/res/values-da/strings.xml
index bafed1f2..f4017783 100644
--- a/app/resources/Android/src/main/res/values-da/strings.xml
+++ b/app/resources/Android/src/main/res/values-da/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="seconds">"sekunder"</string>
+  <string name="minutes">"minutter"</string>
+  <string name="minute">"minut"</string>
+  <string name="dlyDur">"Forsinkelsens varighed"</string>
+  <string name="tmrvbrt">"Timer vibrerer"</string>
+  <string name="tmr">"Timeren %1$s"</string>
+  <string name="tmrSnd">"Timeren lyd"</string>
+  <string name="prstBtn">"FORUDSÆTTER"</string>
+  <string name="tmrPrsts">"Timeren forindstillinger"</string>
+  <string name="fwr">"til hvilken opskrift?"</string>
+  <string name="aTPrst">"Tilføjet til forudindstillinger"</string>
+  <string name="hours">"timers"</string>
+  <string name="hour">"timer"</string>
+  <string name="tmrClr">"Timeren er slettet"</string>
+  <string name="timer">"Kogetid Timer"</string>
+  <string name="ntmr">"Ny timer"</string>
+  <string name="strtBtn">"STARTER"</string>
+  <string name="stop">"Stopper"</string>
+  <string name="delay">"Forsinkelse"</string>
+  <string name="sec">"s"</string>
+  <string name="sysDefB">"Systemstandard + sort"</string>
   <string name="November">"November"</string>
   <string name="nwCat">"Ny kategori"</string>
   <string name="nwYiU">"Ny udbytteenhed"</string>
diff --git a/app/resources/Android/src/main/res/values-de/strings.xml b/app/resources/Android/src/main/res/values-de/strings.xml
index c79e5dfe..26285ab6 100644
--- a/app/resources/Android/src/main/res/values-de/strings.xml
+++ b/app/resources/Android/src/main/res/values-de/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Timer gelöscht"</string>
+  <string name="delay">"Verzögerung"</string>
+  <string name="dlyDur">"Verzögerungsdauer"</string>
+  <string name="minute">"Minute"</string>
+  <string name="minutes">"Minuten"</string>
+  <string name="hour">"Stunde"</string>
+  <string name="hours">"Stunden"</string>
+  <string name="seconds">"Sekunden"</string>
+  <string name="stop">"Stopp"</string>
+  <string name="prstBtn">"Voreinstellungen"</string>
+  <string name="fwr">"für welches Rezept?"</string>
+  <string name="aTPrst">"Zu Voreinstellungen hinzugefügt"</string>
+  <string name="tmrPrsts">"Timer-Voreinstellungen"</string>
+  <string name="tmrSnd">"Timerton"</string>
+  <string name="tmrvbrt">"Timervibration"</string>
+  <string name="sec">"sec"</string>
+  <string name="timer">"Kochtimer"</string>
+  <string name="ntmr">"Neuer Timer"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="sysDefB">"Systemstandard + schwarz"</string>
   <string name="buto">"Gesichert in %1$s"</string>
   <string name="yld">"Ergebnis"</string>
   <string name="yieldU">"Ertragseinheit"</string>
diff --git a/app/resources/Android/src/main/res/values-en-rIN/strings.xml b/app/resources/Android/src/main/res/values-en-rIN/strings.xml
new file mode 100644
index 00000000..b583ec4c
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-en-rIN/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="delay">"Delay"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="minute">"minute"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="hour">"hour"</string>
+  <string name="hours">"hours"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="stop">"Stop"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="sysDefB">"System default + Black"</string>
+  <string name="buto">"Backed up to %1$s"</string>
+  <string name="yld">"Yield"</string>
+  <string name="yieldU">"Yield unit"</string>
+  <string name="yieldQ">"Yield quantity"</string>
+  <string name="yesterday">"yesterday"</string>
+  <string name="WED">"WED"</string>
+  <string name="wAgo">"%1$s weeks ago"</string>
+  <string name="Vietnamese">"Vietnamese"</string>
+  <string name="Vegetarian">"Vegetarian"</string>
+  <string name="Vegan">"Vegan"</string>
+  <string name="untRec">"Untitled Recipe"</string>
+  <string name="unsaved">"Unsaved changes"</string>
+  <string name="Unit">"Unit"</string>
+  <string name="unit">"unit"</string>
+  <string name="Undefined">"Undefined"</string>
+  <string name="Turkish">"Turkish"</string>
+  <string name="TUE">"TUE"</string>
+  <string name="tsp">"tsp"</string>
+  <string name="tsInfo">"separate with spaces"</string>
+  <string name="ts">"Tags"</string>
+  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
+  <string name="trylater">"Try Later"</string>
+  <string name="trnsl">"Translate"</string>
+  <string name="triedInfo">"You tried this recipe %1$s"</string>
+  <string name="today">"today"</string>
+  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
+  <string name="title">"Title"</string>
+  <string name="THU">"THU"</string>
+  <string name="Theme">"Theme"</string>
+  <string name="Thai">"Thai"</string>
+  <string name="Teaspoon">"Teaspoon"</string>
+  <string name="tbsp">"tbsp"</string>
+  <string name="Tablespoon">"Tablespoon"</string>
+  <string name="sysDef">"System default"</string>
+  <string name="swm">"Start week on Monday"</string>
+  <string name="Swedish">"Swedish"</string>
+  <string name="sVwInfo">"Helps you choose what to cook when you can\'t decide"</string>
+  <string name="sVw">"Shake to view random recipe"</string>
+  <string name="SUN">"SUN"</string>
+  <string name="strAdd">"Start adding your recipes!"</string>
+  <string name="stp">"Step"</string>
+  <string name="stick">"stick"</string>
+  <string name="stars">"Star rating"</string>
+  <string name="sru">"Share recipe using..."</string>
+  <string name="srt">"Sort"</string>
+  <string name="srpu">"Share recipe photo using..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankan"</string>
+  <string name="Spanish">"Spanish"</string>
+  <string name="Soups">"Soups"</string>
+  <string name="snacks">"Snacks"</string>
+  <string name="small">"small"</string>
+  <string name="sltd">"selected"</string>
+  <string name="_Slowest_first_hHjY6">"Slowest first"</string>
+  <string name="simple">"Simple"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"Side dishes"</string>
+  <string name="shr">"Share"</string>
+  <string name="Settings">"Settings"</string>
+  <string name="SET">"SET"</string>
+  <string name="Serving">"Serving"</string>
+  <string name="ser">"Search"</string>
+  <string name="September">"September"</string>
+  <string name="selRec">"Select recipe"</string>
+  <string name="Seafood">"Seafood"</string>
+  <string name="Scottish">"Scottish"</string>
+  <string name="Sauces">"Sauces"</string>
+  <string name="SAT">"SAT"</string>
+  <string name="Salads">"Salads"</string>
+  <string name="Russian">"Russian"</string>
+  <string name="rst">"RESTART"</string>
+  <string name="rp">"Remove photo"</string>
+  <string name="Roll">"Roll"</string>
+  <string name="rmYUInfo">"You are about to remove %1$s from the yield unit list"</string>
+  <string name="rmUInfo">"You are about to remove %1$s from the unit list"</string>
+  <string name="rmN">"Note removed"</string>
+  <string name="rmIns">"Instruction removed"</string>
+  <string name="rmIng">"Ingredient removed"</string>
+  <string name="rmCuiInfo">"You are about to remove %1$s from the cuisine list"</string>
+  <string name="rmCmb">"Combination removed"</string>
+  <string name="rmCatInfo">"You are about to remove %1$s from the category list"</string>
+  <string name="Rice">"Rice"</string>
+  <string name="restYUL">"Reset yield unit list"</string>
+  <string name="restUL">"Reset unit list"</string>
+  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
+  <string name="restDone">"Reset done"</string>
+  <string name="restCuiL">"Reset cuisine list"</string>
+  <string name="restCatL">"Reset category list"</string>
+  <string name="rest">"Reset"</string>
+  <string name="resNF">"Recipe not found"</string>
+  <string name="req">"Required %1$s"</string>
+  <string name="recU">"Updated:"</string>
+  <string name="recTitle">"My Healthy Recipe"</string>
+  <string name="recs">"recipes"</string>
+  <string name="recRm">"Recipe removed"</string>
+  <string name="recPic">"Recipe photo"</string>
+  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
+  <string name="recI">"Imported:"</string>
+  <string name="recF">"recipes found"</string>
+  <string name="recE">"Already exist:"</string>
+  <string name="rec">"Recipe"</string>
+  <string name="rBtn">"REMOVE"</string>
+  <string name="Rating">"Rating"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="priv">"Privacy policy"</string>
+  <string name="prepT">"Preparation time"</string>
+  <string name="Pound">"Pound"</string>
+  <string name="Poultry">"Poultry"</string>
+  <string name="Portuguese">"Portuguese"</string>
+  <string name="plsAdd">"Use the plus button to add one"</string>
+  <string name="planner">"Meal Planner"</string>
+  <string name="pinch">"pinch"</string>
+  <string name="Piece">"Piece"</string>
+  <string name="piece">"piece"</string>
+  <string name="pht">"Recipe photo"</string>
+  <string name="photogrid">"Photo Grid"</string>
+  <string name="Patty">"Patty"</string>
+  <string name="Pasta">"Pasta"</string>
+  <string name="oz">"oz"</string>
+  <string name="Ounce">"Ounce"</string>
+  <string name="opts">"Options"</string>
+  <string name="_Oldest_first_Z6cq4h">"Oldest first"</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"October"</string>
+  <string name="nwYiU">"New yield unit"</string>
+  <string name="nwCat">"New category"</string>
+  <string name="November">"November"</string>
+  <string name="nos">"Notes"</string>
+  <string name="noRecsInL">"None of the recipes here matches your search"</string>
+  <string name="noRecs">"No recipes match your search"</string>
+  <string name="Noodles">"Noodles"</string>
+  <string name="noFavs">"No favourites yet"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
+  <string name="no">"Note"</string>
+  <string name="nNBtn">"NOT NOW"</string>
+  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
+  <string name="Nigerian">"Nigerian"</string>
+  <string name="newUnit">"New unit"</string>
+  <string name="newRec">"New recipe"</string>
+  <string name="_Newest_first_2Sb3c">"Newest first"</string>
+  <string name="newCui">"New cuisine"</string>
+  <string name="MON">"MON"</string>
+  <string name="Moderate">"Moderate"</string>
+  <string name="ml">"ml"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="min">"min"</string>
+  <string name="Millilitre">"Millilitre"</string>
+  <string name="mg">"mg"</string>
+  <string name="Mexican">"Mexican"</string>
+  <string name="medium">"medium"</string>
+  <string name="Meat">"Meat"</string>
+  <string name="May">"May"</string>
+  <string name="March">"March"</string>
+  <string name="_Main_dishes_u6RGQ">"Main dishes"</string>
+  <string name="mAgo">"%1$s months ago"</string>
+  <string name="lunch">"Lunch"</string>
+  <string name="ltAgo">"a long time ago"</string>
+  <string name="Loaf">"Loaf"</string>
+  <string name="Litre">"Litre"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="Light">"Light"</string>
+  <string name="leaf">"leaf"</string>
+  <string name="lb">"lb"</string>
+  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
+  <string name="large">"large"</string>
+  <string name="lang">"Language"</string>
+  <string name="l">"l"</string>
+  <string name="Korean">"Korean"</string>
+  <string name="Kilogram">"Kilogram"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">"Kenyan"</string>
+  <string name="kEdit">"KEEP EDITING"</string>
+  <string name="June">"June"</string>
+  <string name="July">"July"</string>
+  <string name="joinTG">"Join the Telegram group"</string>
+  <string name="Jewish">"Jewish"</string>
+  <string name="Japanese">"Japanese"</string>
+  <string name="January">"January"</string>
+  <string name="Jamaican">"Jamaican"</string>
+  <string name="Italian">"Italian"</string>
+  <string name="it">"Item"</string>
+  <string name="Irish">"Irish"</string>
+  <string name="invFile">"Invalid file"</string>
+  <string name="intf">"Interface"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ings">"Ingredients"</string>
+  <string name="Indian">"Indian"</string>
+  <string name="in">"in"</string>
+  <string name="impSuc">"Import success"</string>
+  <string name="impip">"Import in progress"</string>
+  <string name="impInfo">"Supports full backups exported by this app"</string>
+  <string name="impFail">"Import failed"</string>
+  <string name="impBu">"Import data"</string>
+  <string name="hr">"h"</string>
+  <string name="Healthy">"Healthy"</string>
+  <string name="guide">"User guide"</string>
+  <string name="grocery">"Grocery List"</string>
+  <string name="grid">"Grid"</string>
+  <string name="Greek">"Greek"</string>
+  <string name="Gram">"Gram"</string>
+  <string name="gh">"View on GitHub"</string>
+  <string name="German">"German"</string>
+  <string name="Gallon">"Gallon"</string>
+  <string name="gal">"gal"</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"Your favourite recipes are listed here"</string>
+  <string name="FRI">"FRI"</string>
+  <string name="French">"French"</string>
+  <string name="_Fluid_Ounce_bd10L">"Fluid Ounce"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
+  <string name="Filipino">"Filipino"</string>
+  <string name="February">"February"</string>
+  <string name="favourites">"Favourites"</string>
+  <string name="expSuc">"Export success"</string>
+  <string name="expip">"Export in progress"</string>
+  <string name="expBu">"Export full backup"</string>
+  <string name="EnRecipes">"EnRecipes"</string>
+  <string name="English">"English"</string>
+  <string name="Egyptian">"Egyptian"</string>
+  <string name="editRec">"Edit recipe"</string>
+  <string name="Easy">"Easy"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="drop">"drop"</string>
+  <string name="dozen">"dozen"</string>
+  <string name="donate">"Donate"</string>
+  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
+  <string name="disBtn">"DISCARD"</string>
+  <string name="dinner">"Dinner"</string>
+  <string name="_Difficulty_level_cSL5d">"Difficulty level"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="Desserts">"Desserts"</string>
+  <string name="delRecsInfo">"You are about to permanently delete %1$s"</string>
+  <string name="delRecInfo">"You are about to permanently delete the recipe %1$s"</string>
+  <string name="December">"December"</string>
+  <string name="dBtn">"DELETE"</string>
+  <string name="db">"Database"</string>
+  <string name="Dark">"Dark"</string>
+  <string name="Danish">"Danish"</string>
+  <string name="dAgo">"%1$s days ago"</string>
+  <string name="Cup">"Cup"</string>
+  <string name="cup">"cup"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Created">"Created"</string>
+  <string name="cPic">"Crop photo"</string>
+  <string name="cookT">"Cooking time"</string>
+  <string name="conf">"Confirm"</string>
+  <string name="conBtn">"CONTINUE"</string>
+  <string name="cmbs">"Combinations"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"clove"</string>
+  <string name="Chinese">"Chinese"</string>
+  <string name="Challenging">"Challenging"</string>
+  <string name="cBtn">"CANCEL"</string>
+  <string name="cat">"Category"</string>
+  <string name="buMod">"The backup file was modified elsewhere"</string>
+  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
+  <string name="buInc">"Malformed or corrupt backup file"</string>
+  <string name="buFol">"Backup folder"</string>
+  <string name="buEmp">"The backup file is empty"</string>
+  <string name="British">"British"</string>
+  <string name="breakfast">"Breakfast"</string>
+  <string name="Breads">"Breads"</string>
+  <string name="Brazilian">"Brazilian"</string>
+  <string name="Black">"Black"</string>
+  <string name="Beverages">"Beverages"</string>
+  <string name="Barbecue">"Barbecue"</string>
+  <string name="August">"August"</string>
+  <string name="aStpBtn">"ADD STEP"</string>
+  <string name="April">"April"</string>
+  <string name="appRst">"App restart required"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="appInfo">"EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes"</string>
+  <string name="Appetizers">"Appetizers"</string>
+  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="aNoBtn">"ADD NOTE"</string>
+  <string name="aNBtn">"ADD NEW"</string>
+  <string name="American">"American"</string>
+  <string name="allTs">"All Tags"</string>
+  <string name="allCuis">"All Cuisines"</string>
+  <string name="allCats">"All Categories"</string>
+  <string name="aIngBtn">"ADD INGREDIENT"</string>
+  <string name="aFBu">"Add a recipe to perform a backup"</string>
+  <string name="addCmbBtn">"ADD COMBINATION"</string>
+  <string name="aD">"All done!"</string>
+  <string name="aBtn">"ADD"</string>
+  <string name="About">"About"</string>
+  <string name="aap">"Attach a photo"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-en-rUS/strings.xml b/app/resources/Android/src/main/res/values-en-rUS/strings.xml
new file mode 100644
index 00000000..10aa5e77
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-en-rUS/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="delay">"Delay"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="minute">"minute"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="hour">"hour"</string>
+  <string name="hours">"hours"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="stop">"Stop"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="sysDefB">"System default + Black"</string>
+  <string name="buto">"Backed up to %1$s"</string>
+  <string name="yld">"Yield"</string>
+  <string name="yieldU">"Yield unit"</string>
+  <string name="yieldQ">"Yield quantity"</string>
+  <string name="yesterday">"yesterday"</string>
+  <string name="WED">"WED"</string>
+  <string name="wAgo">"%1$s weeks ago"</string>
+  <string name="Vietnamese">"Vietnamese"</string>
+  <string name="Vegetarian">"Vegetarian"</string>
+  <string name="Vegan">"Vegan"</string>
+  <string name="untRec">"Untitled Recipe"</string>
+  <string name="unsaved">"Unsaved changes"</string>
+  <string name="Unit">"Unit"</string>
+  <string name="unit">"unit"</string>
+  <string name="Undefined">"Undefined"</string>
+  <string name="Turkish">"Turkish"</string>
+  <string name="TUE">"TUE"</string>
+  <string name="tsp">"tsp"</string>
+  <string name="tsInfo">"separate with spaces"</string>
+  <string name="ts">"Tags"</string>
+  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
+  <string name="trylater">"Try Later"</string>
+  <string name="trnsl">"Translate"</string>
+  <string name="triedInfo">"You tried this recipe %1$s"</string>
+  <string name="today">"today"</string>
+  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
+  <string name="title">"Title"</string>
+  <string name="THU">"THU"</string>
+  <string name="Theme">"Theme"</string>
+  <string name="Thai">"Thai"</string>
+  <string name="Teaspoon">"Teaspoon"</string>
+  <string name="tbsp">"tbsp"</string>
+  <string name="Tablespoon">"Tablespoon"</string>
+  <string name="sysDef">"System default"</string>
+  <string name="swm">"Start week on Monday"</string>
+  <string name="Swedish">"Swedish"</string>
+  <string name="sVwInfo">"Helps you choose what to cook when you can\'t decide"</string>
+  <string name="sVw">"Shake to view random recipe"</string>
+  <string name="SUN">"SUN"</string>
+  <string name="strAdd">"Start adding your recipes!"</string>
+  <string name="stp">"Step"</string>
+  <string name="stick">"stick"</string>
+  <string name="stars">"Star rating"</string>
+  <string name="sru">"Share recipe using..."</string>
+  <string name="srt">"Sort"</string>
+  <string name="srpu">"Share recipe photo using..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankan"</string>
+  <string name="Spanish">"Spanish"</string>
+  <string name="Soups">"Soups"</string>
+  <string name="snacks">"Snacks"</string>
+  <string name="small">"small"</string>
+  <string name="sltd">"selected"</string>
+  <string name="_Slowest_first_hHjY6">"Slowest first"</string>
+  <string name="simple">"Simple"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"Side dishes"</string>
+  <string name="shr">"Share"</string>
+  <string name="Settings">"Settings"</string>
+  <string name="SET">"SET"</string>
+  <string name="Serving">"Serving"</string>
+  <string name="ser">"Search"</string>
+  <string name="September">"September"</string>
+  <string name="selRec">"Select recipe"</string>
+  <string name="Seafood">"Seafood"</string>
+  <string name="Scottish">"Scottish"</string>
+  <string name="Sauces">"Sauces"</string>
+  <string name="SAT">"SAT"</string>
+  <string name="Salads">"Salads"</string>
+  <string name="Russian">"Russian"</string>
+  <string name="rst">"RESTART"</string>
+  <string name="rp">"Remove photo"</string>
+  <string name="Roll">"Roll"</string>
+  <string name="rmYUInfo">"You are about to remove %1$s from the yield unit list"</string>
+  <string name="rmUInfo">"You are about to remove %1$s from the unit list"</string>
+  <string name="rmN">"Note removed"</string>
+  <string name="rmIns">"Instruction removed"</string>
+  <string name="rmIng">"Ingredient removed"</string>
+  <string name="rmCuiInfo">"You are about to remove %1$s from the cuisine list"</string>
+  <string name="rmCmb">"Combination removed"</string>
+  <string name="rmCatInfo">"You are about to remove %1$s from the category list"</string>
+  <string name="Rice">"Rice"</string>
+  <string name="restYUL">"Reset yield unit list"</string>
+  <string name="restUL">"Reset unit list"</string>
+  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
+  <string name="restDone">"Reset done"</string>
+  <string name="restCuiL">"Reset cuisine list"</string>
+  <string name="restCatL">"Reset category list"</string>
+  <string name="rest">"Reset"</string>
+  <string name="resNF">"Recipe not found"</string>
+  <string name="req">"Required %1$s"</string>
+  <string name="recU">"Updated:"</string>
+  <string name="recTitle">"My Healthy Recipe"</string>
+  <string name="recs">"recipes"</string>
+  <string name="recRm">"Recipe removed"</string>
+  <string name="recPic">"Recipe photo"</string>
+  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
+  <string name="recI">"Imported:"</string>
+  <string name="recF">"recipes found"</string>
+  <string name="recE">"Already exist:"</string>
+  <string name="rec">"Recipe"</string>
+  <string name="rBtn">"REMOVE"</string>
+  <string name="Rating">"Rating"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="priv">"Privacy policy"</string>
+  <string name="prepT">"Preparation time"</string>
+  <string name="Pound">"Pound"</string>
+  <string name="Poultry">"Poultry"</string>
+  <string name="Portuguese">"Portuguese"</string>
+  <string name="plsAdd">"Use the plus button to add one"</string>
+  <string name="planner">"Meal Planner"</string>
+  <string name="pinch">"pinch"</string>
+  <string name="Piece">"Piece"</string>
+  <string name="piece">"piece"</string>
+  <string name="pht">"Recipe photo"</string>
+  <string name="photogrid">"Photo Grid"</string>
+  <string name="Patty">"Patty"</string>
+  <string name="Pasta">"Pasta"</string>
+  <string name="oz">"oz"</string>
+  <string name="Ounce">"Ounce"</string>
+  <string name="opts">"Options"</string>
+  <string name="_Oldest_first_Z6cq4h">"Oldest first"</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"October"</string>
+  <string name="nwYiU">"New yield unit"</string>
+  <string name="nwCat">"New category"</string>
+  <string name="November">"November"</string>
+  <string name="nos">"Notes"</string>
+  <string name="noRecsInL">"None of the recipes here matches your search"</string>
+  <string name="noRecs">"No recipes match your search"</string>
+  <string name="Noodles">"Noodles"</string>
+  <string name="noFavs">"No favorites yet"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
+  <string name="no">"Note"</string>
+  <string name="nNBtn">"NOT NOW"</string>
+  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
+  <string name="Nigerian">"Nigerian"</string>
+  <string name="newUnit">"New unit"</string>
+  <string name="newRec">"New recipe"</string>
+  <string name="_Newest_first_2Sb3c">"Newest first"</string>
+  <string name="newCui">"New cuisine"</string>
+  <string name="MON">"MON"</string>
+  <string name="Moderate">"Moderate"</string>
+  <string name="ml">"ml"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="min">"min"</string>
+  <string name="Millilitre">"Milliliter"</string>
+  <string name="mg">"mg"</string>
+  <string name="Mexican">"Mexican"</string>
+  <string name="medium">"medium"</string>
+  <string name="Meat">"Meat"</string>
+  <string name="May">"May"</string>
+  <string name="March">"March"</string>
+  <string name="_Main_dishes_u6RGQ">"Main dishes"</string>
+  <string name="mAgo">"%1$s months ago"</string>
+  <string name="lunch">"Lunch"</string>
+  <string name="ltAgo">"a long time ago"</string>
+  <string name="Loaf">"Loaf"</string>
+  <string name="Litre">"Liter"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="Light">"Light"</string>
+  <string name="leaf">"leaf"</string>
+  <string name="lb">"lb"</string>
+  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
+  <string name="large">"large"</string>
+  <string name="lang">"Language"</string>
+  <string name="l">"l"</string>
+  <string name="Korean">"Korean"</string>
+  <string name="Kilogram">"Kilogram"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">"Kenyan"</string>
+  <string name="kEdit">"KEEP EDITING"</string>
+  <string name="June">"June"</string>
+  <string name="July">"July"</string>
+  <string name="joinTG">"Join the Telegram group"</string>
+  <string name="Jewish">"Jewish"</string>
+  <string name="Japanese">"Japanese"</string>
+  <string name="January">"January"</string>
+  <string name="Jamaican">"Jamaican"</string>
+  <string name="Italian">"Italian"</string>
+  <string name="it">"Item"</string>
+  <string name="Irish">"Irish"</string>
+  <string name="invFile">"Invalid file"</string>
+  <string name="intf">"Interface"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ings">"Ingredients"</string>
+  <string name="Indian">"Indian"</string>
+  <string name="in">"in"</string>
+  <string name="impSuc">"Import success"</string>
+  <string name="impip">"Import in progress"</string>
+  <string name="impInfo">"Supports full backups exported by this app"</string>
+  <string name="impFail">"Import failed"</string>
+  <string name="impBu">"Import data"</string>
+  <string name="hr">"h"</string>
+  <string name="Healthy">"Healthy"</string>
+  <string name="guide">"User guide"</string>
+  <string name="grocery">"Grocery List"</string>
+  <string name="grid">"Grid"</string>
+  <string name="Greek">"Greek"</string>
+  <string name="Gram">"Gram"</string>
+  <string name="gh">"View on GitHub"</string>
+  <string name="German">"German"</string>
+  <string name="Gallon">"Gallon"</string>
+  <string name="gal">"gal"</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"Your favorite recipes are listed here"</string>
+  <string name="FRI">"FRI"</string>
+  <string name="French">"French"</string>
+  <string name="_Fluid_Ounce_bd10L">"Fluid Ounce"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
+  <string name="Filipino">"Filipino"</string>
+  <string name="February">"February"</string>
+  <string name="favourites">"Favorites"</string>
+  <string name="expSuc">"Export success"</string>
+  <string name="expip">"Export in progress"</string>
+  <string name="expBu">"Export full backup"</string>
+  <string name="EnRecipes">"EnRecipes"</string>
+  <string name="English">"English"</string>
+  <string name="Egyptian">"Egyptian"</string>
+  <string name="editRec">"Edit recipe"</string>
+  <string name="Easy">"Easy"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="drop">"drop"</string>
+  <string name="dozen">"dozen"</string>
+  <string name="donate">"Donate"</string>
+  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
+  <string name="disBtn">"DISCARD"</string>
+  <string name="dinner">"Dinner"</string>
+  <string name="_Difficulty_level_cSL5d">"Difficulty level"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="Desserts">"Desserts"</string>
+  <string name="delRecsInfo">"You are about to permanently delete %1$s"</string>
+  <string name="delRecInfo">"You are about to permanently delete the recipe %1$s"</string>
+  <string name="December">"December"</string>
+  <string name="dBtn">"DELETE"</string>
+  <string name="db">"Database"</string>
+  <string name="Dark">"Dark"</string>
+  <string name="Danish">"Danish"</string>
+  <string name="dAgo">"%1$s days ago"</string>
+  <string name="Cup">"Cup"</string>
+  <string name="cup">"cup"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Created">"Created"</string>
+  <string name="cPic">"Crop photo"</string>
+  <string name="cookT">"Cooking time"</string>
+  <string name="conf">"Confirm"</string>
+  <string name="conBtn">"CONTINUE"</string>
+  <string name="cmbs">"Combinations"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"clove"</string>
+  <string name="Chinese">"Chinese"</string>
+  <string name="Challenging">"Challenging"</string>
+  <string name="cBtn">"CANCEL"</string>
+  <string name="cat">"Category"</string>
+  <string name="buMod">"The backup file was modified elsewhere"</string>
+  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
+  <string name="buInc">"Malformed or corrupt backup file"</string>
+  <string name="buFol">"Backup folder"</string>
+  <string name="buEmp">"The backup file is empty"</string>
+  <string name="British">"British"</string>
+  <string name="breakfast">"Breakfast"</string>
+  <string name="Breads">"Breads"</string>
+  <string name="Brazilian">"Brazilian"</string>
+  <string name="Black">"Black"</string>
+  <string name="Beverages">"Beverages"</string>
+  <string name="Barbecue">"Barbecue"</string>
+  <string name="August">"August"</string>
+  <string name="aStpBtn">"ADD STEP"</string>
+  <string name="April">"April"</string>
+  <string name="appRst">"App restart required"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="appInfo">"EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes"</string>
+  <string name="Appetizers">"Appetizers"</string>
+  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="aNoBtn">"ADD NOTE"</string>
+  <string name="aNBtn">"ADD NEW"</string>
+  <string name="American">"American"</string>
+  <string name="allTs">"All Tags"</string>
+  <string name="allCuis">"All Cuisines"</string>
+  <string name="allCats">"All Categories"</string>
+  <string name="aIngBtn">"ADD INGREDIENT"</string>
+  <string name="aFBu">"Add a recipe to perform a backup"</string>
+  <string name="addCmbBtn">"ADD COMBINATION"</string>
+  <string name="aD">"All done!"</string>
+  <string name="aBtn">"ADD"</string>
+  <string name="About">"About"</string>
+  <string name="aap">"Attach a photo"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-es-rAR/strings.xml b/app/resources/Android/src/main/res/values-es-rAR/strings.xml
new file mode 100644
index 00000000..2b3f6afb
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="aap">"Adjuntá una foto"</string>
+  <string name="About">"Acerca de"</string>
+  <string name="aBtn">"AGREGAR"</string>
+  <string name="aD">"¡Todo listo!"</string>
+  <string name="addCmbBtn">"AGREGAR COMBINACIÓN"</string>
+  <string name="aFBu">"Agregá recetas para hacer un backup"</string>
+  <string name="aIngBtn">"AGREGAR INGREDIENTE"</string>
+  <string name="allCats">"Todas las categorías"</string>
+  <string name="American">"Americana"</string>
+  <string name="aNBtn">"AGREGAR NUEVA"</string>
+  <string name="aNoBtn">"AGREGAR NOTA"</string>
+  <string name="appCrd">"Compartido vía EnRecipes. Conseguilo en F-Droid, IzzyOnDroid o en la Play Store."</string>
+  <string name="Appetizers">"Aperitivos"</string>
+  <string name="appInfo">"EnRecipes es un libro de cocina digital, privado y de código abierto, que te permite crear, administrar y compartir tus recetas"</string>
+  <string name="apply">"APLICAR"</string>
+  <string name="appRst">"Se requiere reiniciar la app"</string>
+  <string name="April">"Abril"</string>
+  <string name="aStpBtn">"AGREGAR PASO"</string>
+  <string name="August">"Agosto"</string>
+  <string name="sec">"s"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sysDefB">"System default + Black"</string>
+  <string name="buto">"Backed up to %1$s"</string>
+  <string name="yld">"Yield"</string>
+  <string name="yieldU">"Yield unit"</string>
+  <string name="yieldQ">"Yield quantity"</string>
+  <string name="yesterday">"yesterday"</string>
+  <string name="WED">"WED"</string>
+  <string name="wAgo">"%1$s weeks ago"</string>
+  <string name="Vietnamese">"Vietnamese"</string>
+  <string name="Vegetarian">"Vegetarian"</string>
+  <string name="Vegan">"Vegan"</string>
+  <string name="untRec">"Untitled Recipe"</string>
+  <string name="unsaved">"Unsaved changes"</string>
+  <string name="Unit">"Unit"</string>
+  <string name="unit">"unit"</string>
+  <string name="Undefined">"Undefined"</string>
+  <string name="Turkish">"Turkish"</string>
+  <string name="TUE">"TUE"</string>
+  <string name="tsp">"tsp"</string>
+  <string name="tsInfo">"separate with spaces"</string>
+  <string name="ts">"Tags"</string>
+  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
+  <string name="trylater">"Try Later"</string>
+  <string name="trnsl">"Translate"</string>
+  <string name="triedInfo">"You tried this recipe %1$s"</string>
+  <string name="today">"today"</string>
+  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
+  <string name="title">"Title"</string>
+  <string name="THU">"THU"</string>
+  <string name="Theme">"Theme"</string>
+  <string name="Thai">"Thai"</string>
+  <string name="Teaspoon">"Teaspoon"</string>
+  <string name="tbsp">"tbsp"</string>
+  <string name="Tablespoon">"Tablespoon"</string>
+  <string name="sysDef">"System default"</string>
+  <string name="swm">"Start week on Monday"</string>
+  <string name="Swedish">"Swedish"</string>
+  <string name="sVwInfo">"Helps you choose what to cook when you can\'t decide"</string>
+  <string name="sVw">"Shake to view random recipe"</string>
+  <string name="SUN">"SUN"</string>
+  <string name="strAdd">"Start adding your recipes!"</string>
+  <string name="stp">"Step"</string>
+  <string name="stick">"stick"</string>
+  <string name="stars">"Star rating"</string>
+  <string name="sru">"Share recipe using..."</string>
+  <string name="srt">"Sort"</string>
+  <string name="srpu">"Share recipe photo using..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankan"</string>
+  <string name="Spanish">"Spanish"</string>
+  <string name="Soups">"Soups"</string>
+  <string name="snacks">"Snacks"</string>
+  <string name="small">"small"</string>
+  <string name="sltd">"selected"</string>
+  <string name="_Slowest_first_hHjY6">"Slowest first"</string>
+  <string name="simple">"Simple"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"Side dishes"</string>
+  <string name="shr">"Share"</string>
+  <string name="Settings">"Settings"</string>
+  <string name="SET">"SET"</string>
+  <string name="Serving">"Serving"</string>
+  <string name="ser">"Search"</string>
+  <string name="September">"September"</string>
+  <string name="selRec">"Select recipe"</string>
+  <string name="Seafood">"Seafood"</string>
+  <string name="Scottish">"Scottish"</string>
+  <string name="Sauces">"Sauces"</string>
+  <string name="SAT">"SAT"</string>
+  <string name="Salads">"Salads"</string>
+  <string name="Russian">"Russian"</string>
+  <string name="rst">"RESTART"</string>
+  <string name="rp">"Remove photo"</string>
+  <string name="Roll">"Roll"</string>
+  <string name="rmYUInfo">"You are about to remove %1$s from the yield unit list"</string>
+  <string name="rmUInfo">"You are about to remove %1$s from the unit list"</string>
+  <string name="rmN">"Note removed"</string>
+  <string name="rmIns">"Instruction removed"</string>
+  <string name="rmIng">"Ingredient removed"</string>
+  <string name="rmCuiInfo">"You are about to remove %1$s from the cuisine list"</string>
+  <string name="rmCmb">"Combination removed"</string>
+  <string name="rmCatInfo">"You are about to remove %1$s from the category list"</string>
+  <string name="Rice">"Rice"</string>
+  <string name="restYUL">"Reset yield unit list"</string>
+  <string name="restUL">"Reset unit list"</string>
+  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
+  <string name="restDone">"Reset done"</string>
+  <string name="restCuiL">"Reset cuisine list"</string>
+  <string name="restCatL">"Reset category list"</string>
+  <string name="rest">"Reset"</string>
+  <string name="resNF">"Recipe not found"</string>
+  <string name="req">"Required %1$s"</string>
+  <string name="recU">"Updated:"</string>
+  <string name="recTitle">"My Healthy Recipe"</string>
+  <string name="recs">"recipes"</string>
+  <string name="recRm">"Recipe removed"</string>
+  <string name="recPic">"Recipe photo"</string>
+  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
+  <string name="recI">"Imported:"</string>
+  <string name="recF">"recipes found"</string>
+  <string name="recE">"Already exist:"</string>
+  <string name="rec">"Recipe"</string>
+  <string name="rBtn">"REMOVE"</string>
+  <string name="Rating">"Rating"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="priv">"Privacy policy"</string>
+  <string name="prepT">"Preparation time"</string>
+  <string name="Pound">"Pound"</string>
+  <string name="Poultry">"Poultry"</string>
+  <string name="Portuguese">"Portuguese"</string>
+  <string name="plsAdd">"Use the plus button to add one"</string>
+  <string name="planner">"Meal Planner"</string>
+  <string name="pinch">"pinch"</string>
+  <string name="Piece">"Piece"</string>
+  <string name="piece">"piece"</string>
+  <string name="pht">"Recipe photo"</string>
+  <string name="photogrid">"Photo Grid"</string>
+  <string name="Patty">"Patty"</string>
+  <string name="Pasta">"Pasta"</string>
+  <string name="oz">"oz"</string>
+  <string name="Ounce">"Ounce"</string>
+  <string name="opts">"Options"</string>
+  <string name="_Oldest_first_Z6cq4h">"Oldest first"</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"October"</string>
+  <string name="nwYiU">"New yield unit"</string>
+  <string name="nwCat">"New category"</string>
+  <string name="November">"November"</string>
+  <string name="nos">"Notes"</string>
+  <string name="noRecsInL">"None of the recipes here matches your search"</string>
+  <string name="noRecs">"No recipes match your search"</string>
+  <string name="Noodles">"Noodles"</string>
+  <string name="noFavs">"No favourites yet"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
+  <string name="no">"Note"</string>
+  <string name="nNBtn">"NOT NOW"</string>
+  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
+  <string name="Nigerian">"Nigerian"</string>
+  <string name="newUnit">"New unit"</string>
+  <string name="newRec">"New recipe"</string>
+  <string name="_Newest_first_2Sb3c">"Newest first"</string>
+  <string name="newCui">"New cuisine"</string>
+  <string name="MON">"MON"</string>
+  <string name="Moderate">"Moderate"</string>
+  <string name="ml">"ml"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="min">"min"</string>
+  <string name="Millilitre">"Millilitre"</string>
+  <string name="mg">"mg"</string>
+  <string name="Mexican">"Mexican"</string>
+  <string name="medium">"medium"</string>
+  <string name="Meat">"Meat"</string>
+  <string name="May">"May"</string>
+  <string name="March">"March"</string>
+  <string name="_Main_dishes_u6RGQ">"Main dishes"</string>
+  <string name="mAgo">"%1$s months ago"</string>
+  <string name="lunch">"Lunch"</string>
+  <string name="ltAgo">"a long time ago"</string>
+  <string name="Loaf">"Loaf"</string>
+  <string name="Litre">"Litre"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="Light">"Light"</string>
+  <string name="leaf">"leaf"</string>
+  <string name="lb">"lb"</string>
+  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
+  <string name="large">"large"</string>
+  <string name="lang">"Language"</string>
+  <string name="l">"l"</string>
+  <string name="Korean">"Korean"</string>
+  <string name="Kilogram">"Kilogram"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">"Kenyan"</string>
+  <string name="kEdit">"KEEP EDITING"</string>
+  <string name="June">"June"</string>
+  <string name="July">"July"</string>
+  <string name="joinTG">"Join the Telegram group"</string>
+  <string name="Jewish">"Jewish"</string>
+  <string name="Japanese">"Japanese"</string>
+  <string name="January">"January"</string>
+  <string name="Jamaican">"Jamaican"</string>
+  <string name="Italian">"Italian"</string>
+  <string name="it">"Item"</string>
+  <string name="Irish">"Irish"</string>
+  <string name="invFile">"Invalid file"</string>
+  <string name="intf">"Interface"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ings">"Ingredients"</string>
+  <string name="Indian">"Indian"</string>
+  <string name="in">"in"</string>
+  <string name="impSuc">"Import success"</string>
+  <string name="impip">"Import in progress"</string>
+  <string name="impInfo">"Supports full backups exported by this app"</string>
+  <string name="impFail">"Import failed"</string>
+  <string name="impBu">"Import data"</string>
+  <string name="hr">"hr"</string>
+  <string name="Healthy">"Healthy"</string>
+  <string name="guide">"User guide"</string>
+  <string name="grocery">"Grocery List"</string>
+  <string name="grid">"Grid"</string>
+  <string name="Greek">"Greek"</string>
+  <string name="Gram">"Gram"</string>
+  <string name="gh">"View on GitHub"</string>
+  <string name="German">"German"</string>
+  <string name="Gallon">"Gallon"</string>
+  <string name="gal">"gal"</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"Your favourite recipes are listed here"</string>
+  <string name="FRI">"FRI"</string>
+  <string name="French">"French"</string>
+  <string name="_Fluid_Ounce_bd10L">"Fluid Ounce"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
+  <string name="Filipino">"Filipino"</string>
+  <string name="February">"February"</string>
+  <string name="favourites">"Favourites"</string>
+  <string name="expSuc">"Export success"</string>
+  <string name="expip">"Export in progress"</string>
+  <string name="expBu">"Export full backup"</string>
+  <string name="EnRecipes">"EnRecipes"</string>
+  <string name="English">"English"</string>
+  <string name="Egyptian">"Egyptian"</string>
+  <string name="editRec">"Edit recipe"</string>
+  <string name="Easy">"Easy"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="drop">"drop"</string>
+  <string name="dozen">"dozen"</string>
+  <string name="donate">"Donate"</string>
+  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
+  <string name="disBtn">"DISCARD"</string>
+  <string name="dinner">"Dinner"</string>
+  <string name="_Difficulty_level_cSL5d">"Difficulty level"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="Desserts">"Desserts"</string>
+  <string name="delRecsInfo">"You are about to permanently delete %1$s"</string>
+  <string name="delRecInfo">"You are about to permanently delete the recipe %1$s"</string>
+  <string name="December">"December"</string>
+  <string name="dBtn">"DELETE"</string>
+  <string name="db">"Database"</string>
+  <string name="Dark">"Dark"</string>
+  <string name="Danish">"Danish"</string>
+  <string name="dAgo">"%1$s days ago"</string>
+  <string name="Cup">"Cup"</string>
+  <string name="cup">"cup"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Created">"Created"</string>
+  <string name="cPic">"Crop photo"</string>
+  <string name="cookT">"Cooking time"</string>
+  <string name="conf">"Confirm"</string>
+  <string name="conBtn">"CONTINUE"</string>
+  <string name="cmbs">"Combinations"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"clove"</string>
+  <string name="Chinese">"Chinese"</string>
+  <string name="Challenging">"Challenging"</string>
+  <string name="cBtn">"CANCEL"</string>
+  <string name="cat">"Category"</string>
+  <string name="buMod">"The backup file was modified elsewhere"</string>
+  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
+  <string name="buInc">"Malformed or corrupt backup file"</string>
+  <string name="buFol">"Backup folder"</string>
+  <string name="buEmp">"The backup file is empty"</string>
+  <string name="British">"British"</string>
+  <string name="breakfast">"Breakfast"</string>
+  <string name="Breads">"Breads"</string>
+  <string name="Brazilian">"Brazilian"</string>
+  <string name="Black">"Black"</string>
+  <string name="Beverages">"Beverages"</string>
+  <string name="Barbecue">"Barbecue"</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="allTs">"All Tags"</string>
+  <string name="allCuis">"All Cuisines"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-es/strings.xml b/app/resources/Android/src/main/res/values-es/strings.xml
index 99088c99..cb0422f4 100644
--- a/app/resources/Android/src/main/res/values-es/strings.xml
+++ b/app/resources/Android/src/main/res/values-es/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Temporizador borrado"</string>
+  <string name="dlyDur">"Duración del retraso"</string>
+  <string name="tmrvbrt">"Vibrador del temporizador"</string>
+  <string name="tmrSnd">"Sonido del temporizador"</string>
+  <string name="aTPrst">"Añadido a los preajustes"</string>
+  <string name="fwr">"para qué receta?"</string>
+  <string name="tmrPrsts">"Preselecciones del temporizador"</string>
+  <string name="prstBtn">"PRECIPIOS"</string>
+  <string name="delay">"Retraso"</string>
+  <string name="stop">"Detener"</string>
+  <string name="minute">"minuto"</string>
+  <string name="minutes">"minutos"</string>
+  <string name="hour">"hora"</string>
+  <string name="hours">"horas"</string>
+  <string name="seconds">"segundos"</string>
+  <string name="tmr">"Temporizador %1$s"</string>
+  <string name="strtBtn">"INICIO"</string>
+  <string name="ntmr">"Nuevo temporizador"</string>
+  <string name="timer">"Temporizador de cocción"</string>
+  <string name="sec">"s"</string>
+  <string name="sysDefB">"Por defecto del Sistema + Negro"</string>
   <string name="buto">"Copia de seguridad guardada a %1$s"</string>
   <string name="yld">"Producir"</string>
   <string name="yieldU">"Unidad de medida"</string>
diff --git a/app/resources/Android/src/main/res/values-fi/strings.xml b/app/resources/Android/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000..dbb04b14
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-fi/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="minute">"minuutti"</string>
+  <string name="hour">"tunti"</string>
+  <string name="minutes">"minuuttia"</string>
+  <string name="hours">"tuntia"</string>
+  <string name="seconds">"sekuntia"</string>
+  <string name="dlyDur">"Viiveen kesto"</string>
+  <string name="sec">"s"</string>
+  <string name="prstBtn">"ESIASETUKSET"</string>
+  <string name="tmrPrsts">"Ajastimen esiasetukset"</string>
+  <string name="fwr">"mitä reseptiä varten?"</string>
+  <string name="aTPrst">"Lisätty esiasetuksiin"</string>
+  <string name="tmrSnd">"Ajastinääni"</string>
+  <string name="timer">"Keittoajastin"</string>
+  <string name="ntmr">"Uusi ajastin"</string>
+  <string name="stop">"Pysäytä"</string>
+  <string name="tmr">"Ajastin %1$s"</string>
+  <string name="sysDefB">"Järjestelmän oletusarvo + Musta"</string>
+  <string name="buto">""</string>
+  <string name="yld">""</string>
+  <string name="yieldU">""</string>
+  <string name="yieldQ">""</string>
+  <string name="yesterday">"eilen"</string>
+  <string name="WED">"ke"</string>
+  <string name="wAgo">"%1$s viikkoa sitten"</string>
+  <string name="Vietnamese">"vietnamilainen"</string>
+  <string name="Vegetarian">"Kasvissyöjä"</string>
+  <string name="Vegan">"Vegaani"</string>
+  <string name="untRec">""</string>
+  <string name="unsaved">""</string>
+  <string name="Unit">""</string>
+  <string name="unit">""</string>
+  <string name="Undefined">"Määrittelemätön"</string>
+  <string name="Turkish">""</string>
+  <string name="TUE">"ti"</string>
+  <string name="tsp">""</string>
+  <string name="tsInfo">""</string>
+  <string name="ts">"Tunnisteet"</string>
+  <string name="trySer">"ETSI KAIKISTA RESEPTEISTÄ?"</string>
+  <string name="trylater">""</string>
+  <string name="trnsl">"Käännä"</string>
+  <string name="triedInfo">"Kokeilit tätä reseptiä %1$s"</string>
+  <string name="today">"tänään"</string>
+  <string name="tLInfo">"Reseptit, joita haluat kokeilla myöhemmin, on lueteltu täällä"</string>
+  <string name="title">"Otsikko"</string>
+  <string name="THU">"to"</string>
+  <string name="Theme">"Teema"</string>
+  <string name="Thai">"thaimaalainen"</string>
+  <string name="Teaspoon">""</string>
+  <string name="tbsp">""</string>
+  <string name="Tablespoon">""</string>
+  <string name="sysDef">"Järjestelmän oletus"</string>
+  <string name="swm">"Aloita viikko maanantaina"</string>
+  <string name="Swedish">"ruotsalainen"</string>
+  <string name="sVwInfo">"Auttaa sinua valitsemaan, mitä valmistaa, kun et osaa päättää."</string>
+  <string name="sVw">"Ravista nähdäksesi satunnainen resepti"</string>
+  <string name="SUN">"su"</string>
+  <string name="strAdd">""</string>
+  <string name="stp">""</string>
+  <string name="stick">""</string>
+  <string name="stars">""</string>
+  <string name="sru">"Jaa resepti käyttämällä…"</string>
+  <string name="srt">"Järjestä"</string>
+  <string name="srpu">"Jaa reseptikuva käyttämällä…"</string>
+  <string name="_Sri_Lankan_Z7GfBa">"srilankalainen"</string>
+  <string name="Spanish">"espanjalainen"</string>
+  <string name="Soups">"Keitot"</string>
+  <string name="snacks">""</string>
+  <string name="small">""</string>
+  <string name="sltd">""</string>
+  <string name="_Slowest_first_hHjY6">""</string>
+  <string name="simple">""</string>
+  <string name="_Side_dishes_Z1Et4Vg">""</string>
+  <string name="shr">"Jaa"</string>
+  <string name="Settings">"Asetukset"</string>
+  <string name="SET">"ASETA"</string>
+  <string name="Serving">""</string>
+  <string name="ser">"Etsi"</string>
+  <string name="September">""</string>
+  <string name="selRec">""</string>
+  <string name="Seafood">""</string>
+  <string name="Scottish">"skotlantilainen"</string>
+  <string name="Sauces">"Kastikkeet"</string>
+  <string name="SAT">"la"</string>
+  <string name="Salads">"Salaatit"</string>
+  <string name="Russian">"venäläinen"</string>
+  <string name="rst">"UUDELLEENKÄYNNISTÄ"</string>
+  <string name="rp">"Poista valokuva"</string>
+  <string name="Roll">""</string>
+  <string name="rmYUInfo">""</string>
+  <string name="rmUInfo">""</string>
+  <string name="rmN">"Huomautus poistettu"</string>
+  <string name="rmIns">"Ohje poistettu"</string>
+  <string name="rmIng">"Ainesosa poistettu"</string>
+  <string name="rmCuiInfo">""</string>
+  <string name="rmCmb">"Yhdistelmä poistettu"</string>
+  <string name="rmCatInfo">"Olet poistamassa %1$s luokkaluettelosta"</string>
+  <string name="Rice">"Riisi"</string>
+  <string name="restYUL">""</string>
+  <string name="restUL">""</string>
+  <string name="restInfo">""</string>
+  <string name="restDone">""</string>
+  <string name="restCuiL">""</string>
+  <string name="restCatL">""</string>
+  <string name="rest">"Nollaa"</string>
+  <string name="resNF">""</string>
+  <string name="req">""</string>
+  <string name="recU">"Päivitetty:"</string>
+  <string name="recTitle">"Minun terveellinen reseptini"</string>
+  <string name="recs">"reseptiä"</string>
+  <string name="recRm">"Resepti poistettu"</string>
+  <string name="recPic">"Reseptivalokuva"</string>
+  <string name="recListEmp">""</string>
+  <string name="recI">""</string>
+  <string name="recF">"löydettyä reseptiä"</string>
+  <string name="recE">"On jo olemassa:"</string>
+  <string name="rec">"Resepti"</string>
+  <string name="rBtn">"POISTA"</string>
+  <string name="Rating">""</string>
+  <string name="_Quickest_first_Z1CpP7N">""</string>
+  <string name="qt">""</string>
+  <string name="pt">""</string>
+  <string name="priv">"Tietosuojakäytäntö"</string>
+  <string name="prepT">"Valmisteluaika"</string>
+  <string name="Pound">""</string>
+  <string name="Poultry">""</string>
+  <string name="Portuguese">"portugalilainen"</string>
+  <string name="plsAdd">"Lisää resepti pluspainikkeella"</string>
+  <string name="planner">"Ateriasuunnittelija"</string>
+  <string name="pinch">""</string>
+  <string name="Piece">"Pala"</string>
+  <string name="piece">"pala"</string>
+  <string name="pht">"Reseptivalokuva"</string>
+  <string name="photogrid">""</string>
+  <string name="Patty">""</string>
+  <string name="Pasta">""</string>
+  <string name="oz">""</string>
+  <string name="Ounce">""</string>
+  <string name="opts">"Valinnat"</string>
+  <string name="_Oldest_first_Z6cq4h">""</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"lokakuu"</string>
+  <string name="nwYiU">""</string>
+  <string name="nwCat">"Uusi luokka"</string>
+  <string name="November">"marraskuu"</string>
+  <string name="nos">""</string>
+  <string name="noRecsInL">""</string>
+  <string name="noRecs">"Hakua vastaavia reseptejä ei ole"</string>
+  <string name="Noodles">""</string>
+  <string name="noFavs">""</string>
+  <string name="noAccSensor">""</string>
+  <string name="no">""</string>
+  <string name="nNBtn">""</string>
+  <string name="nLangInfo">""</string>
+  <string name="Nigerian">""</string>
+  <string name="newUnit">""</string>
+  <string name="newRec">""</string>
+  <string name="_Newest_first_2Sb3c">""</string>
+  <string name="newCui">""</string>
+  <string name="MON">""</string>
+  <string name="Moderate">""</string>
+  <string name="ml">""</string>
+  <string name="minimal">""</string>
+  <string name="min">""</string>
+  <string name="Millilitre">""</string>
+  <string name="mg">""</string>
+  <string name="Mexican">""</string>
+  <string name="medium">""</string>
+  <string name="Meat">""</string>
+  <string name="May">""</string>
+  <string name="March">""</string>
+  <string name="_Main_dishes_u6RGQ">""</string>
+  <string name="mAgo">""</string>
+  <string name="lunch">""</string>
+  <string name="ltAgo">""</string>
+  <string name="Loaf">""</string>
+  <string name="Litre">""</string>
+  <string name="listVM">""</string>
+  <string name="Light">""</string>
+  <string name="leaf">""</string>
+  <string name="lb">""</string>
+  <string name="_Last_updated_Z2gEbLD">""</string>
+  <string name="large">""</string>
+  <string name="lang">"Kieli"</string>
+  <string name="l">"l"</string>
+  <string name="Korean">"korealainen"</string>
+  <string name="Kilogram">"kilogramma"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">""</string>
+  <string name="kEdit">""</string>
+  <string name="June">"kesäkuu"</string>
+  <string name="July">"heinäkuu"</string>
+  <string name="joinTG">""</string>
+  <string name="Jewish">"juutalainen"</string>
+  <string name="Japanese">"japanilainen"</string>
+  <string name="January">"tammikuu"</string>
+  <string name="Jamaican">""</string>
+  <string name="Italian">""</string>
+  <string name="it">""</string>
+  <string name="Irish">"irlantilainen"</string>
+  <string name="invFile">"Virheellinen tiedosto"</string>
+  <string name="intf">"Käyttöliittymä"</string>
+  <string name="inss">"Ohjeet"</string>
+  <string name="ings">"Ainekset"</string>
+  <string name="Indian">"intialainen"</string>
+  <string name="in">""</string>
+  <string name="impSuc">"Tuonti onnistui"</string>
+  <string name="impip">"Tuonti käynnissä"</string>
+  <string name="impInfo">"Tukee tämän sovelluksen viemiä täydellisiä varmuuskopioita"</string>
+  <string name="impFail">"Tuonti epäonnistui"</string>
+  <string name="impBu">"Tuo tietoja"</string>
+  <string name="hr">"t."</string>
+  <string name="Healthy">"Terveellinen"</string>
+  <string name="guide">"Käyttöopas"</string>
+  <string name="grocery">"Ostoslista"</string>
+  <string name="grid">""</string>
+  <string name="Greek">"kreikkalainen"</string>
+  <string name="Gram">"gramma"</string>
+  <string name="gh">"Näytä GitHub:ssa"</string>
+  <string name="German">"saksalainen"</string>
+  <string name="Gallon">""</string>
+  <string name="gal">""</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"Suosikkireseptisi on lueteltu täällä"</string>
+  <string name="FRI">"pe"</string>
+  <string name="French">"ranskalainen"</string>
+  <string name="_Fluid_Ounce_bd10L">""</string>
+  <string name="fltr">""</string>
+  <string name="_fl_oz_72kqu">""</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Suodatetut reseptit"</string>
+  <string name="Filipino">""</string>
+  <string name="February">"helmikuu"</string>
+  <string name="favourites">""</string>
+  <string name="expSuc">""</string>
+  <string name="expip">"Vienti käynnissä"</string>
+  <string name="expBu">"Vie koko varmuuskopio"</string>
+  <string name="EnRecipes">""</string>
+  <string name="English">"englantilainen"</string>
+  <string name="Egyptian">"egyptiläinen"</string>
+  <string name="editRec">"Muokkaa resepti"</string>
+  <string name="Easy">"Helppo"</string>
+  <string name="dsp">""</string>
+  <string name="drop">""</string>
+  <string name="dozen">"tusina"</string>
+  <string name="donate">"Lahjoita"</string>
+  <string name="disc">"Tässä reseptissä on tallentamattomia muutoksia. Mitä haluaisit tehdä?"</string>
+  <string name="disBtn">"HYLKÄÄ"</string>
+  <string name="dinner">"Illallinen"</string>
+  <string name="_Difficulty_level_cSL5d">"Vaikeustaso"</string>
+  <string name="detailed">"Yksityiskohtainen"</string>
+  <string name="Desserts">"Jälkiruoat"</string>
+  <string name="delRecsInfo">"Olet poistamassa %1$s pysyvästi"</string>
+  <string name="delRecInfo">"Olet poistamassa reseptiä %1$s pysyvästi"</string>
+  <string name="December">"joulukuu"</string>
+  <string name="dBtn">"POISTA"</string>
+  <string name="db">"Tietokanta"</string>
+  <string name="Dark">"Tumma"</string>
+  <string name="Danish">"tanskalainen"</string>
+  <string name="dAgo">"%1$s päivää sitten"</string>
+  <string name="Cup">"Kuppi"</string>
+  <string name="cup">"cup"</string>
+  <string name="cui">"Keittiö"</string>
+  <string name="Created">"Luotu"</string>
+  <string name="cPic">"Rajaa kuva"</string>
+  <string name="cookT">"Kypsennysaika"</string>
+  <string name="conf">"Vahvista"</string>
+  <string name="conBtn">"JATKA"</string>
+  <string name="cmbs">"Yhdistelmät"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"kynsi"</string>
+  <string name="Chinese">"kiinalainen"</string>
+  <string name="Challenging">"Haastava"</string>
+  <string name="cBtn">"PERUUTA"</string>
+  <string name="cat">"Luokka"</string>
+  <string name="buMod">"Varmuuskopiotiedostoa muutettiin muualla"</string>
+  <string name="buInfo">"Luo ZIP-tiedoston, joka sisältää kaikki tiedot, jotka voidaan tuoda takaisin"</string>
+  <string name="buInc">"Virheellinen tai vioittunut varmuuskopiotiedosto"</string>
+  <string name="buFol">"Varmuuskopioiden hakemisto"</string>
+  <string name="buEmp">"Varmuuskopiotiedosto on tyhjä"</string>
+  <string name="British">"brittiläinen"</string>
+  <string name="breakfast">"Aamiainen"</string>
+  <string name="Breads">"Leivät"</string>
+  <string name="Brazilian">"brasilialainen"</string>
+  <string name="Black">"Musta"</string>
+  <string name="Beverages">"Juomat"</string>
+  <string name="Barbecue">"Grilli"</string>
+  <string name="August">"elokuu"</string>
+  <string name="aStpBtn">""</string>
+  <string name="April">"huhtikuu"</string>
+  <string name="appRst">"Sovelluksen uudelleenkäynnistys vaaditaan"</string>
+  <string name="apply">"KÄYTÄ"</string>
+  <string name="appInfo">"EnRecipes on avoimen lähdekoodin, yksityisyyden suojaa kunnioittava digitaalinen keittokirja, jonka avulla voit luoda, hallita ja jakaa reseptejäsi"</string>
+  <string name="Appetizers">"Alkupalat"</string>
+  <string name="appCrd">"Jaettu EnRecipesin kautta. Lataa se F-Droidista, IzzyOnDroidista tai Play Storesta."</string>
+  <string name="_app_name_1k3Sbz">""</string>
+  <string name="app_name">""</string>
+  <string name="title_activity_kimera">""</string>
+  <string name="aNoBtn">"LISÄÄ HUOMAUTUS"</string>
+  <string name="aNBtn">"LISÄÄ UUSI"</string>
+  <string name="American">"amerikkalainen"</string>
+  <string name="allTs">"Kaikki tunnisteet"</string>
+  <string name="allCuis">"Kaikki keittiöt"</string>
+  <string name="allCats">"Kaikki luokat"</string>
+  <string name="aIngBtn">"LISÄÄ AINESOSA"</string>
+  <string name="aFBu">"Lisää resepti varmuuskopioinnin suorittamiseen"</string>
+  <string name="addCmbBtn">"LISÄÄ YHDISTELMÄ"</string>
+  <string name="aD">"Valmista!"</string>
+  <string name="aBtn">"LISÄÄ"</string>
+  <string name="About">"Tietoja"</string>
+  <string name="aap">"Liitä valokuva"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="delay">"Delay"</string>
+  <string name="strtBtn">"START"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rBE/strings.xml b/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
index 4f7fdc6f..b040193e 100644
--- a/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Minuterie effacée"</string>
+  <string name="delay">"Retard"</string>
+  <string name="dlyDur">"Durée du retard"</string>
+  <string name="minute">"minute"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="hour">"heure"</string>
+  <string name="hours">"heures"</string>
+  <string name="seconds">"secondes"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Minuterie de cuisson"</string>
+  <string name="ntmr">"Nouvelle minuterie"</string>
+  <string name="strtBtn">"DÉMARRER"</string>
+  <string name="stop">"Arrêter"</string>
+  <string name="tmr">"Minuterie %1$s"</string>
+  <string name="prstBtn">"PRÉRÉGLAGES"</string>
+  <string name="tmrPrsts">"Préréglages de la minuterie"</string>
+  <string name="fwr">"pour quelle recette ?"</string>
+  <string name="aTPrst">"Ajouté aux préréglages"</string>
+  <string name="tmrSnd">"Son de la minuterie"</string>
+  <string name="tmrvbrt">"Vibreur de la minuterie"</string>
+  <string name="sysDefB">"Selon le système + Noir"</string>
   <string name="buto">"Sauvegardé dans %1$s"</string>
   <string name="yld">"Rendement"</string>
   <string name="yieldU">"Unité de rendement"</string>
@@ -21,7 +42,7 @@
   <string name="tsInfo">"séparez par des espaces"</string>
   <string name="ts">"Étiquettes"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES ?"</string>
-  <string name="trylater">"Essayer plus tard"</string>
+  <string name="trylater">"À essayer plus tard"</string>
   <string name="trnsl">"Traduire"</string>
   <string name="triedInfo">"Vous avez essayé cette recette %1$s"</string>
   <string name="today">"aujourd’hui"</string>
@@ -49,7 +70,7 @@
   <string name="_Sri_Lankan_Z7GfBa">"sri-lankaise"</string>
   <string name="Spanish">"espagnole"</string>
   <string name="Soups">"Soupes"</string>
-  <string name="snacks">"en-cas"</string>
+  <string name="snacks">"En-cas"</string>
   <string name="small">"petit"</string>
   <string name="sltd">"sélectionné"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
@@ -88,7 +109,7 @@
   <string name="restCatL">"Réinitialiser la liste des catégories"</string>
   <string name="rest">"Réinitialiser"</string>
   <string name="resNF">"Recette introuvable"</string>
-  <string name="req">"%1$s requise"</string>
+  <string name="req">"%1$s requis(e)"</string>
   <string name="recU">"mise à jour :"</string>
   <string name="recTitle">"Ma recette saine"</string>
   <string name="recs">"recettes"</string>
@@ -110,7 +131,7 @@
   <string name="Poultry">"Volaille"</string>
   <string name="Portuguese">"portugaise"</string>
   <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="planner">"Organisateur de repas"</string>
+  <string name="planner">"Planificateur de repas"</string>
   <string name="pinch">"pincée"</string>
   <string name="Piece">"Morceau"</string>
   <string name="piece">"morceau"</string>
@@ -154,8 +175,8 @@
   <string name="May">"mai"</string>
   <string name="March">"mars"</string>
   <string name="_Main_dishes_u6RGQ">"Plats principaux"</string>
-  <string name="mAgo">"Il ya %1$s mois"</string>
-  <string name="lunch">"diner"</string>
+  <string name="mAgo">"Il y a %1$s mois"</string>
+  <string name="lunch">"Diner"</string>
   <string name="ltAgo">"il y a longtemps"</string>
   <string name="Loaf">"Miche"</string>
   <string name="Litre">"Litre"</string>
@@ -229,7 +250,7 @@
   <string name="donate">"Faire un don"</string>
   <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire ?"</string>
   <string name="disBtn">"IGNORER"</string>
-  <string name="dinner">"souper"</string>
+  <string name="dinner">"Souper"</string>
   <string name="_Difficulty_level_cSL5d">"Niveau de difficulté"</string>
   <string name="detailed">"Détaillée"</string>
   <string name="Desserts">"Desserts"</string>
diff --git a/app/resources/Android/src/main/res/values-fr-rCA/strings.xml b/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
index ed55dc71..c29559c6 100644
--- a/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Minuterie effacée"</string>
+  <string name="delay">"Retard"</string>
+  <string name="dlyDur">"Durée du retard"</string>
+  <string name="minute">"minute"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="hour">"heure"</string>
+  <string name="hours">"heures"</string>
+  <string name="seconds">"secondes"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Minuterie de cuisson"</string>
+  <string name="ntmr">"Nouvelle minuterie"</string>
+  <string name="strtBtn">"DÉMARRER"</string>
+  <string name="stop">"Arrêter"</string>
+  <string name="tmr">"Minuterie %1$s"</string>
+  <string name="prstBtn">"PRÉRÉGLAGES"</string>
+  <string name="tmrPrsts">"Préréglages de la minuterie"</string>
+  <string name="fwr">"pour quelle recette?"</string>
+  <string name="aTPrst">"Ajouté aux préréglages"</string>
+  <string name="tmrSnd">"Son de la minuterie"</string>
+  <string name="tmrvbrt">"Vibreur de la minuterie"</string>
+  <string name="sysDefB">"Selon le système + Noir"</string>
   <string name="buto">"Sauvegardé dans %1$s"</string>
   <string name="yld">"Rendement"</string>
   <string name="yieldU">"Unité de rendement"</string>
@@ -21,7 +42,7 @@
   <string name="tsInfo">"séparez par des espaces"</string>
   <string name="ts">"Étiquettes"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES?"</string>
-  <string name="trylater">"Essayer plus tard"</string>
+  <string name="trylater">"À essayer plus tard"</string>
   <string name="trnsl">"Traduire"</string>
   <string name="triedInfo">"Vous avez essayé cette recette %1$s"</string>
   <string name="today">"aujourd’hui"</string>
@@ -49,7 +70,7 @@
   <string name="_Sri_Lankan_Z7GfBa">"sri-lankaise"</string>
   <string name="Spanish">"espagnole"</string>
   <string name="Soups">"Soupes"</string>
-  <string name="snacks">"en-cas"</string>
+  <string name="snacks">"En-cas"</string>
   <string name="small">"petit"</string>
   <string name="sltd">"sélectionné"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
@@ -88,7 +109,7 @@
   <string name="restCatL">"Réinitialiser la liste des catégories"</string>
   <string name="rest">"Réinitialiser"</string>
   <string name="resNF">"Recette introuvable"</string>
-  <string name="req">"%1$s requise"</string>
+  <string name="req">"%1$s requis(e)"</string>
   <string name="recU">"mise à jour :"</string>
   <string name="recTitle">"Ma recette saine"</string>
   <string name="recs">"recettes"</string>
@@ -110,7 +131,7 @@
   <string name="Poultry">"Volaille"</string>
   <string name="Portuguese">"portugaise"</string>
   <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="planner">"Organisateur de repas"</string>
+  <string name="planner">"Planificateur de repas"</string>
   <string name="pinch">"pincée"</string>
   <string name="Piece">"Morceau"</string>
   <string name="piece">"morceau"</string>
@@ -154,8 +175,8 @@
   <string name="May">"mai"</string>
   <string name="March">"mars"</string>
   <string name="_Main_dishes_u6RGQ">"Plats principaux"</string>
-  <string name="mAgo">"Il ya %1$s mois"</string>
-  <string name="lunch">"dîner"</string>
+  <string name="mAgo">"Il y a %1$s mois"</string>
+  <string name="lunch">"Dîner"</string>
   <string name="ltAgo">"il y a longtemps"</string>
   <string name="Loaf">"Miche"</string>
   <string name="Litre">"Litre"</string>
@@ -229,7 +250,7 @@
   <string name="donate">"Faire un don"</string>
   <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire?"</string>
   <string name="disBtn">"IGNORER"</string>
-  <string name="dinner">"souper"</string>
+  <string name="dinner">"Souper"</string>
   <string name="_Difficulty_level_cSL5d">"Niveau de difficulté"</string>
   <string name="detailed">"Détaillée"</string>
   <string name="Desserts">"Desserts"</string>
diff --git a/app/resources/Android/src/main/res/values-fr-rCH/strings.xml b/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
index 00f0bd80..7a0d42b5 100644
--- a/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Minuterie effacée"</string>
+  <string name="delay">"Retard"</string>
+  <string name="dlyDur">"Durée du retard"</string>
+  <string name="minute">"minute"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="hour">"heure"</string>
+  <string name="hours">"heures"</string>
+  <string name="seconds">"secondes"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Minuterie de cuisson"</string>
+  <string name="ntmr">"Nouvelle minuterie"</string>
+  <string name="strtBtn">"DÉMARRER"</string>
+  <string name="stop">"Arrêter"</string>
+  <string name="tmr">"Minuterie %1$s"</string>
+  <string name="prstBtn">"PRÉRÉGLAGES"</string>
+  <string name="tmrPrsts">"Préréglages de la minuterie"</string>
+  <string name="fwr">"pour quelle recette?"</string>
+  <string name="aTPrst">"Ajouté aux préréglages"</string>
+  <string name="tmrSnd">"Son de la minuterie"</string>
+  <string name="tmrvbrt">"Vibreur de la minuterie"</string>
+  <string name="sysDefB">"Selon le système + Noir"</string>
   <string name="buto">"Sauvegardé dans %1$s"</string>
   <string name="yld">"Rendement"</string>
   <string name="yieldU">"Unité de rendement"</string>
@@ -21,7 +42,7 @@
   <string name="tsInfo">"séparez par des espaces"</string>
   <string name="ts">"Étiquettes"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES?"</string>
-  <string name="trylater">"Essayer plus tard"</string>
+  <string name="trylater">"À essayer plus tard"</string>
   <string name="trnsl">"Traduire"</string>
   <string name="triedInfo">"Vous avez essayé cette recette %1$s"</string>
   <string name="today">"aujourd’hui"</string>
@@ -49,7 +70,7 @@
   <string name="_Sri_Lankan_Z7GfBa">"sri-lankaise"</string>
   <string name="Spanish">"espagnole"</string>
   <string name="Soups">"Soupes"</string>
-  <string name="snacks">"en-cas"</string>
+  <string name="snacks">"En-cas"</string>
   <string name="small">"petit"</string>
   <string name="sltd">"sélectionné"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
@@ -88,7 +109,7 @@
   <string name="restCatL">"Réinitialiser la liste des catégories"</string>
   <string name="rest">"Réinitialiser"</string>
   <string name="resNF">"Recette introuvable"</string>
-  <string name="req">"%1$s requise"</string>
+  <string name="req">"%1$s requis(e)"</string>
   <string name="recU">"mise à jour :"</string>
   <string name="recTitle">"Ma recette saine"</string>
   <string name="recs">"recettes"</string>
@@ -110,7 +131,7 @@
   <string name="Poultry">"Volaille"</string>
   <string name="Portuguese">"portugaise"</string>
   <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="planner">"Organisateur de repas"</string>
+  <string name="planner">"Planificateur de repas"</string>
   <string name="pinch">"pincée"</string>
   <string name="Piece">"Morceau"</string>
   <string name="piece">"morceau"</string>
@@ -154,8 +175,8 @@
   <string name="May">"mai"</string>
   <string name="March">"mars"</string>
   <string name="_Main_dishes_u6RGQ">"Plats principaux"</string>
-  <string name="mAgo">"Il ya %1$s mois"</string>
-  <string name="lunch">"dîner"</string>
+  <string name="mAgo">"Il y a %1$s mois"</string>
+  <string name="lunch">"Dîner"</string>
   <string name="ltAgo">"il y a longtemps"</string>
   <string name="Loaf">"Miche"</string>
   <string name="Litre">"Litre"</string>
@@ -229,7 +250,7 @@
   <string name="donate">"Faire un don"</string>
   <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire?"</string>
   <string name="disBtn">"IGNORER"</string>
-  <string name="dinner">"souper"</string>
+  <string name="dinner">"Souper"</string>
   <string name="_Difficulty_level_cSL5d">"Niveau de difficulté"</string>
   <string name="detailed">"Détaillée"</string>
   <string name="Desserts">"Desserts"</string>
diff --git a/app/resources/Android/src/main/res/values-fr/strings.xml b/app/resources/Android/src/main/res/values-fr/strings.xml
index 715b7271..0f02331e 100644
--- a/app/resources/Android/src/main/res/values-fr/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Minuterie effacée"</string>
+  <string name="delay">"Retard"</string>
+  <string name="dlyDur">"Durée du retard"</string>
+  <string name="minute">"minute"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="hour">"heure"</string>
+  <string name="hours">"heures"</string>
+  <string name="seconds">"secondes"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Minuterie de cuisson"</string>
+  <string name="ntmr">"Nouvelle minuterie"</string>
+  <string name="strtBtn">"DÉMARRER"</string>
+  <string name="stop">"Arrêter"</string>
+  <string name="tmr">"Minuterie %1$s"</string>
+  <string name="prstBtn">"PRÉRÉGLAGES"</string>
+  <string name="tmrPrsts">"Préréglages de la minuterie"</string>
+  <string name="fwr">"pour quelle recette ?"</string>
+  <string name="aTPrst">"Ajouté aux préréglages"</string>
+  <string name="tmrSnd">"Son de la minuterie"</string>
+  <string name="tmrvbrt">"Vibreur de la minuterie"</string>
+  <string name="sysDefB">"Selon le système + Noir"</string>
   <string name="buto">"Sauvegardé dans %1$s"</string>
   <string name="yld">"Rendement"</string>
   <string name="yieldU">"Unité de portion"</string>
@@ -7,7 +28,7 @@
   <string name="yesterday">"hier"</string>
   <string name="WED">"mer"</string>
   <string name="wAgo">"il y a %1$s semaines"</string>
-  <string name="Vietnamese">"Vietnamienne"</string>
+  <string name="Vietnamese">"vietnamienne"</string>
   <string name="Vegetarian">"Végétarien"</string>
   <string name="Vegan">"Végétalien"</string>
   <string name="untRec">"Recette sans titre"</string>
@@ -15,13 +36,13 @@
   <string name="Unit">"Unité"</string>
   <string name="unit">"unité"</string>
   <string name="Undefined">"Indéfini"</string>
-  <string name="Turkish">"Turque"</string>
+  <string name="Turkish">"turque"</string>
   <string name="TUE">"mar"</string>
   <string name="tsp">"c.à.c"</string>
   <string name="tsInfo">"séparez par des espaces"</string>
   <string name="ts">"Étiquettes"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES ?"</string>
-  <string name="trylater">"Essayer plus tard"</string>
+  <string name="trylater">"À essayer plus tard"</string>
   <string name="trnsl">"Traduire"</string>
   <string name="triedInfo">"Vous avez essayé cette recette %1$s"</string>
   <string name="today">"aujourd’hui"</string>
@@ -29,13 +50,13 @@
   <string name="title">"Titre"</string>
   <string name="THU">"jeu"</string>
   <string name="Theme">"Thème"</string>
-  <string name="Thai">"Thaïlandaise"</string>
+  <string name="Thai">"thaïlandaise"</string>
   <string name="Teaspoon">"Cuillère à café"</string>
   <string name="tbsp">"cuillérée"</string>
   <string name="Tablespoon">"Cuillère à soupe"</string>
   <string name="sysDef">"Selon le système"</string>
   <string name="swm">"Début de la semaine le lundi"</string>
-  <string name="Swedish">"Suédoise"</string>
+  <string name="Swedish">"suédoise"</string>
   <string name="sVwInfo">"Vous aide à choisir quoi cuisiner quand vous ne pouvez pas vous décider"</string>
   <string name="sVw">"Secouez pour voir une recette au hasard"</string>
   <string name="SUN">"dim"</string>
@@ -46,14 +67,14 @@
   <string name="sru">"Partager la recette en utilisant…"</string>
   <string name="srt">"Trier"</string>
   <string name="srpu">"Partager une photo de recette en utilisant…"</string>
-  <string name="_Sri_Lankan_Z7GfBa">"Sri-lankaise"</string>
-  <string name="Spanish">"Espagnole"</string>
+  <string name="_Sri_Lankan_Z7GfBa">"sri-lankaise"</string>
+  <string name="Spanish">"espagnole"</string>
   <string name="Soups">"Soupes"</string>
-  <string name="snacks">"en-cas"</string>
+  <string name="snacks">"En-cas"</string>
   <string name="small">"petit"</string>
   <string name="sltd">"sélectionné"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
-  <string name="simple">"Simple"</string>
+  <string name="simple">"Simplicité"</string>
   <string name="_Side_dishes_Z1Et4Vg">"Plats d’accompagnement"</string>
   <string name="shr">"Partager"</string>
   <string name="Settings">"Paramètres"</string>
@@ -63,11 +84,11 @@
   <string name="September">"septembre"</string>
   <string name="selRec">"Sélectionner une recette"</string>
   <string name="Seafood">"Fruits de mer"</string>
-  <string name="Scottish">"Écossaise"</string>
-  <string name="Sauces">"Sauces"</string>
+  <string name="Scottish">"écossaise"</string>
+  <string name="Sauces">"Soupes"</string>
   <string name="SAT">"sam"</string>
   <string name="Salads">"Salades"</string>
-  <string name="Russian">"Russe"</string>
+  <string name="Russian">"russe"</string>
   <string name="rst">"REDÉMARRER"</string>
   <string name="rp">"Retirer la photo"</string>
   <string name="Roll">"Rouleau"</string>
@@ -88,7 +109,7 @@
   <string name="restCatL">"Réinitialiser la liste des catégories"</string>
   <string name="rest">"Réinitialiser"</string>
   <string name="resNF">"Recette introuvable"</string>
-  <string name="req">"%1$s requise"</string>
+  <string name="req">"%1$s requis(e)"</string>
   <string name="recU">"mise à jour :"</string>
   <string name="recTitle">"Ma recette saine"</string>
   <string name="recs">"recettes"</string>
@@ -108,9 +129,9 @@
   <string name="prepT">"Temps de préparation"</string>
   <string name="Pound">"Livre"</string>
   <string name="Poultry">"Volaille"</string>
-  <string name="Portuguese">"Portugaise"</string>
+  <string name="Portuguese">"portugaise"</string>
   <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="planner">"Organisateur de repas"</string>
+  <string name="planner">"Planificateur de repas"</string>
   <string name="pinch">"pincée"</string>
   <string name="Piece">"Morceau"</string>
   <string name="piece">"morceau"</string>
@@ -136,7 +157,7 @@
   <string name="no">"Note"</string>
   <string name="nNBtn">"PAS MAINTENANT"</string>
   <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
-  <string name="Nigerian">"Nigériane"</string>
+  <string name="Nigerian">"nigériane"</string>
   <string name="newUnit">"Nouvelle unité"</string>
   <string name="newRec">"Nouvelle recette"</string>
   <string name="_Newest_first_2Sb3c">"La plus récente d’abord"</string>
@@ -146,19 +167,19 @@
   <string name="ml">"ml"</string>
   <string name="minimal">"Minimale"</string>
   <string name="min">"min"</string>
-  <string name="Millilitre">"Millilitre"</string>
+  <string name="Millilitre">"Millilette"</string>
   <string name="mg">"mg"</string>
-  <string name="Mexican">"Mexicaine"</string>
+  <string name="Mexican">"mexicaine"</string>
   <string name="medium">"moyen"</string>
   <string name="Meat">"Viande"</string>
   <string name="May">"mai"</string>
   <string name="March">"mars"</string>
   <string name="_Main_dishes_u6RGQ">"Plats principaux"</string>
-  <string name="mAgo">"Il ya %1$s mois"</string>
-  <string name="lunch">"déjeuner"</string>
+  <string name="mAgo">"Il y a %1$s mois"</string>
+  <string name="lunch">"Déjeuner"</string>
   <string name="ltAgo">"il y a longtemps"</string>
   <string name="Loaf">"Miche"</string>
-  <string name="Litre">"Litre"</string>
+  <string name="Litre">"Leitre"</string>
   <string name="listVM">"Type de vue en liste"</string>
   <string name="Light">"Clair"</string>
   <string name="leaf">"feuille"</string>
@@ -167,26 +188,26 @@
   <string name="large">"grand"</string>
   <string name="lang">"Langue"</string>
   <string name="l">"l"</string>
-  <string name="Korean">"Coréenne"</string>
+  <string name="Korean">"coréenne"</string>
   <string name="Kilogram">"Kilogramme"</string>
   <string name="kg">"kg"</string>
-  <string name="Kenyan">"Kényane"</string>
+  <string name="Kenyan">"kényane"</string>
   <string name="kEdit">"CONTINUER"</string>
   <string name="June">"juin"</string>
   <string name="July">"juillet"</string>
   <string name="joinTG">"Rejoignez le groupe Telegram"</string>
-  <string name="Jewish">"Juive"</string>
-  <string name="Japanese">"Japonaise"</string>
+  <string name="Jewish">"juive"</string>
+  <string name="Japanese">"japonaise"</string>
   <string name="January">"janvier"</string>
-  <string name="Jamaican">"Jamaïcaine"</string>
-  <string name="Italian">"Italienne"</string>
+  <string name="Jamaican">"jamaïcaine"</string>
+  <string name="Italian">"italienne"</string>
   <string name="it">"Élément"</string>
-  <string name="Irish">"Irlandaise"</string>
+  <string name="Irish">"irlandaise"</string>
   <string name="invFile">"Fichier invalide"</string>
   <string name="intf">"Interface"</string>
   <string name="inss">"Instructions"</string>
   <string name="ings">"Ingrédients"</string>
-  <string name="Indian">"Indienne"</string>
+  <string name="Indian">"indienne"</string>
   <string name="in">"in"</string>
   <string name="impSuc">"Importation réussie"</string>
   <string name="impip">"Importation en cours"</string>
@@ -198,29 +219,29 @@
   <string name="guide">"Guide d’utilisation"</string>
   <string name="grocery">"Liste de courses"</string>
   <string name="grid">"Grille"</string>
-  <string name="Greek">"Grecque"</string>
+  <string name="Greek">"grecque"</string>
   <string name="Gram">"Gramme"</string>
   <string name="gh">"Voir sur GitHub"</string>
-  <string name="German">"Allemande"</string>
-  <string name="Gallon">"Gallon"</string>
+  <string name="German">"allemande"</string>
+  <string name="Gallon">"Galon"</string>
   <string name="gal">"gal"</string>
   <string name="g">"g"</string>
   <string name="fsList">"Vos recettes favorites sont listées ici"</string>
   <string name="FRI">"ven"</string>
-  <string name="French">"Française"</string>
+  <string name="French">"française"</string>
   <string name="_Fluid_Ounce_bd10L">"Once liquide"</string>
   <string name="fltr">"Filtre"</string>
   <string name="_fl_oz_72kqu">"oz liq"</string>
   <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
-  <string name="Filipino">"Philippine"</string>
+  <string name="Filipino">"philippine"</string>
   <string name="February">"février"</string>
   <string name="favourites">"Favoris"</string>
   <string name="expSuc">"Exportation réussie"</string>
   <string name="expip">"Exportation en cours"</string>
   <string name="expBu">"Exporter une sauvegarde complète"</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="English">"Anglaise"</string>
-  <string name="Egyptian">"Égyptienne"</string>
+  <string name="English">"anglaise"</string>
+  <string name="Egyptian">"égyptienne"</string>
   <string name="editRec">"Modifier la recette"</string>
   <string name="Easy">"Facile"</string>
   <string name="dsp">"c.à.d"</string>
@@ -229,21 +250,21 @@
   <string name="donate">"Faire un don"</string>
   <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire ?"</string>
   <string name="disBtn">"IGNORER"</string>
-  <string name="dinner">"dîner"</string>
+  <string name="dinner">"Dîner"</string>
   <string name="_Difficulty_level_cSL5d">"Niveau de difficulté"</string>
   <string name="detailed">"Détaillée"</string>
-  <string name="Desserts">"Desserts"</string>
+  <string name="Desserts">"Délices"</string>
   <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement %1$s"</string>
   <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette %1$s"</string>
   <string name="December">"décembre"</string>
   <string name="dBtn">"SUPPRIMER"</string>
   <string name="db">"Base de données"</string>
   <string name="Dark">"Sombre"</string>
-  <string name="Danish">"Danoise"</string>
+  <string name="Danish">"danoise"</string>
   <string name="dAgo">"il y a %1$s jours"</string>
   <string name="Cup">"Tasse"</string>
   <string name="cup">"tasse"</string>
-  <string name="cui">"Cuisine"</string>
+  <string name="cui">"Cuisines"</string>
   <string name="Created">"Créé le"</string>
   <string name="cPic">"Recadrer la photo"</string>
   <string name="cookT">"Temps de cuisson"</string>
@@ -252,7 +273,7 @@
   <string name="cmbs">"Combinaisons"</string>
   <string name="cm">"cm"</string>
   <string name="clove">"gousse"</string>
-  <string name="Chinese">"Chinoise"</string>
+  <string name="Chinese">"chinoise"</string>
   <string name="Challenging">"Difficile"</string>
   <string name="cBtn">"ANNULER"</string>
   <string name="cat">"Catégorie"</string>
@@ -261,13 +282,13 @@
   <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
   <string name="buFol">"Dossier de sauvegarde"</string>
   <string name="buEmp">"La sauvegarde est vide"</string>
-  <string name="British">"Britannique"</string>
+  <string name="British">"britannique"</string>
   <string name="breakfast">"Petit déjeuner"</string>
   <string name="Breads">"Pains"</string>
   <string name="Brazilian">"Brésilienne"</string>
   <string name="Black">"Noir"</string>
   <string name="Beverages">"Boissons"</string>
-  <string name="Barbecue">"Barbecue"</string>
+  <string name="Barbecue">"Grillades"</string>
   <string name="August">"août"</string>
   <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
   <string name="April">"avril"</string>
diff --git a/app/resources/Android/src/main/res/values-hi/strings.xml b/app/resources/Android/src/main/res/values-hi/strings.xml
index 42988824..3727273b 100644
--- a/app/resources/Android/src/main/res/values-hi/strings.xml
+++ b/app/resources/Android/src/main/res/values-hi/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="sec">"सेकंड"</string>
+  <string name="timer">"कुकिंग टाइमर"</string>
+  <string name="ntmr">"नया टाइमर"</string>
+  <string name="strtBtn">"शुरू"</string>
+  <string name="stop">"रुकें"</string>
+  <string name="delay">"देरी"</string>
+  <string name="tmr">"टाइमर%1$s"</string>
+  <string name="prstBtn">"प्रीसेट"</string>
+  <string name="tmrPrsts">"टाइमर प्रीसेट"</string>
+  <string name="aTPrst">"प्रीसेट में जोड़ा गया"</string>
+  <string name="tmrSnd">"टाइमर की आवाज़"</string>
+  <string name="tmrvbrt">"टाइमर वाइब्रेट"</string>
+  <string name="dlyDur">"विलंब अवधि"</string>
+  <string name="minute">"मिनट"</string>
+  <string name="minutes">"मिनटो"</string>
+  <string name="hour">"घंटा"</string>
+  <string name="hours">"घंटे"</string>
+  <string name="seconds">"सेकंड"</string>
+  <string name="tmrClr">"टाइमर साफ"</string>
+  <string name="fwr">"किस विधि के लिए?"</string>
+  <string name="sysDefB">"प्रणालीगत चूक + काला"</string>
   <string name="buto">"%1$s में बैकअप लिया गया"</string>
   <string name="yld">"मान जाना"</string>
   <string name="yieldU">"उपज इकाई"</string>
diff --git a/app/resources/Android/src/main/res/values-id/strings.xml b/app/resources/Android/src/main/res/values-id/strings.xml
index 30799337..5b9776e9 100644
--- a/app/resources/Android/src/main/res/values-id/strings.xml
+++ b/app/resources/Android/src/main/res/values-id/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="stop">"Berhenti"</string>
+  <string name="delay">"Menunda"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="prstBtn">"PRESET"</string>
+  <string name="tmrPrsts">"Preset timer"</string>
+  <string name="fwr">"untuk resep yang mana?"</string>
+  <string name="aTPrst">"Ditambahkan ke preset"</string>
+  <string name="tmrSnd">"Suara timer"</string>
+  <string name="tmrvbrt">"Timer bergetar"</string>
+  <string name="dlyDur">"Durasi penundaan"</string>
+  <string name="minute">"menit"</string>
+  <string name="minutes">"menit"</string>
+  <string name="hour">"jam"</string>
+  <string name="hours">"jam"</string>
+  <string name="seconds">"detik"</string>
+  <string name="tmrClr">"Timer dibersihkan"</string>
+  <string name="timer">"Timer Memasak"</string>
+  <string name="ntmr">"Timer baru"</string>
+  <string name="strtBtn">"MULAI"</string>
+  <string name="sec">"s"</string>
+  <string name="sysDefB">"Default sistem + Hitam"</string>
   <string name="buto">"Didukung ke %1$s"</string>
   <string name="yld">"Menghasilkan"</string>
   <string name="yieldU">"Satuan hasil"</string>
diff --git a/app/resources/Android/src/main/res/values-it/strings.xml b/app/resources/Android/src/main/res/values-it/strings.xml
index 6ab45dec..0addf598 100644
--- a/app/resources/Android/src/main/res/values-it/strings.xml
+++ b/app/resources/Android/src/main/res/values-it/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Contaminuti cancellato"</string>
+  <string name="delay">"Ritardo"</string>
+  <string name="dlyDur">"Durata del ritardo"</string>
+  <string name="minute">"minuto"</string>
+  <string name="minutes">"minuti"</string>
+  <string name="hour">"ora"</string>
+  <string name="hours">"ore"</string>
+  <string name="seconds">"secondi"</string>
+  <string name="sec">"s"</string>
+  <string name="stop">"Ferma"</string>
+  <string name="prstBtn">"Preimpostazioni"</string>
+  <string name="tmrPrsts">"Preimpostazioni del contaminuti"</string>
+  <string name="fwr">"per quale ricetta?"</string>
+  <string name="aTPrst">"Aggiunto alle preimpostazioni"</string>
+  <string name="tmrSnd">"Suono del contaminuti"</string>
+  <string name="tmrvbrt">"Vibrazione contaminuti"</string>
+  <string name="timer">"Contaminuti di cottura"</string>
+  <string name="ntmr">"Nuovo contaminuti"</string>
+  <string name="strtBtn">"AVVIA"</string>
+  <string name="tmr">"Contaminuti %1$s"</string>
+  <string name="sysDefB">"Predefinito del sistema + Nero"</string>
   <string name="buto">"Backup salvato in %1$s"</string>
   <string name="yld">"Resa"</string>
   <string name="yieldU">"Unità di resa"</string>
@@ -21,7 +42,7 @@
   <string name="tsInfo">"separa con spazi"</string>
   <string name="ts">"Etichette"</string>
   <string name="trySer">"CERCARE IN TUTTE LE RICETTE?"</string>
-  <string name="trylater">"Prova più tardi"</string>
+  <string name="trylater">"Da provare più tardi"</string>
   <string name="trnsl">"Traduci"</string>
   <string name="triedInfo">"Hai provato questa ricetta %1$s"</string>
   <string name="today">"oggi"</string>
@@ -117,7 +138,7 @@
   <string name="pht">"Foto ricetta"</string>
   <string name="photogrid">"Griglia di foto"</string>
   <string name="Patty">"Polpetta"</string>
-  <string name="Pasta">"Pasta"</string>
+  <string name="Pasta">"Pastore"</string>
   <string name="oz">"oz"</string>
   <string name="Ounce">"Oncia"</string>
   <string name="opts">"Opzioni"</string>
diff --git a/app/resources/Android/src/main/res/values-ja/strings.xml b/app/resources/Android/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000..3c98214e
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-ja/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="medium">"中"</string>
+  <string name="large">"大"</string>
+  <string name="small">"小"</string>
+  <string name="it">"材料"</string>
+  <string name="lb">"ポンド"</string>
+  <string name="oz">"オンス"</string>
+  <string name="pinch">"ピンチ"</string>
+  <string name="stick">"スティック"</string>
+  <string name="nNBtn">"あとで"</string>
+  <string name="Undefined">"未定義"</string>
+  <string name="in">"中の"</string>
+  <string name="sysDefB">"システム既定+黒"</string>
+  <string name="buto">"%1$s としてバックアップしました"</string>
+  <string name="yld">"仕上がり分量"</string>
+  <string name="yieldU">"仕上がり分量の単位"</string>
+  <string name="yieldQ">"仕上がり分量"</string>
+  <string name="yesterday">"昨日"</string>
+  <string name="WED">"水"</string>
+  <string name="wAgo">"%1$s 週前"</string>
+  <string name="Vietnamese">"ベトナム料理"</string>
+  <string name="Vegetarian">"ベジタリアン"</string>
+  <string name="Vegan">"ビーガン"</string>
+  <string name="untRec">"無題のレシピ"</string>
+  <string name="unsaved">"未保存の変更"</string>
+  <string name="Unit">"単位"</string>
+  <string name="unit">"個"</string>
+  <string name="Turkish">"トルコ料理"</string>
+  <string name="TUE">"火"</string>
+  <string name="tsp">"小さじ"</string>
+  <string name="tsInfo">"スペースで区切ってください"</string>
+  <string name="ts">"タグ"</string>
+  <string name="trySer">"全てのレシピを検索しますか？"</string>
+  <string name="trylater">"あとで作る"</string>
+  <string name="trnsl">"翻訳"</string>
+  <string name="triedInfo">"に作りました"</string>
+  <string name="today">"今日"</string>
+  <string name="tLInfo">"あとで試したいレシピはここに並びます"</string>
+  <string name="title">"タイトル"</string>
+  <string name="THU">"木"</string>
+  <string name="Theme">"テーマ"</string>
+  <string name="Thai">"タイ料理"</string>
+  <string name="Teaspoon">"小さじ"</string>
+  <string name="tbsp">"大さじ"</string>
+  <string name="Tablespoon">"大さじ"</string>
+  <string name="sysDef">"システム既定"</string>
+  <string name="swm">"月曜始まりにする"</string>
+  <string name="Swedish">"スウェーデン料理"</string>
+  <string name="sVwInfo">"何を作るか決められないときに使います"</string>
+  <string name="sVw">"振ってランダムなレシピを表示"</string>
+  <string name="SUN">"日"</string>
+  <string name="strAdd">"レシピを追加しましょう！"</string>
+  <string name="stp">"作り方"</string>
+  <string name="stars">"星評価"</string>
+  <string name="sru">"レシピを共有..."</string>
+  <string name="srt">"並び替え"</string>
+  <string name="srpu">"レシピの写真を共有..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"スリランカ料理"</string>
+  <string name="Spanish">"スペイン料理"</string>
+  <string name="Soups">"スープ"</string>
+  <string name="snacks">"軽食"</string>
+  <string name="sltd">"選択"</string>
+  <string name="_Slowest_first_hHjY6">"遅い順"</string>
+  <string name="simple">"シンプル"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"副菜"</string>
+  <string name="shr">"共有"</string>
+  <string name="Settings">"設定"</string>
+  <string name="SET">"設定"</string>
+  <string name="Serving">"人前"</string>
+  <string name="ser">"検索"</string>
+  <string name="September">"9月"</string>
+  <string name="selRec">"レシピを選択"</string>
+  <string name="Seafood">"シーフード"</string>
+  <string name="Scottish">"スコットランド料理"</string>
+  <string name="Sauces">"ソース"</string>
+  <string name="SAT">"土"</string>
+  <string name="Salads">"サラダ"</string>
+  <string name="Russian">"ロシア料理"</string>
+  <string name="rst">"再起動"</string>
+  <string name="rp">"写真を削除"</string>
+  <string name="Roll">"ロール"</string>
+  <string name="rmYUInfo">"仕上がり分量の単位のリストから %1$s を削除しようとしています"</string>
+  <string name="rmUInfo">"単位のリストから %1$s を削除しようとしています"</string>
+  <string name="rmN">"メモが削除されました"</string>
+  <string name="rmIns">"作り方を削除しました"</string>
+  <string name="rmIng">"材料を削除しました"</string>
+  <string name="rmCuiInfo">"ジャンルのリストから %1$s を削除しようとしています"</string>
+  <string name="rmCmb">"組合せが削除されました"</string>
+  <string name="rmCatInfo">"カテゴリーのリストから %1$s を削除しようとしています"</string>
+  <string name="Rice">"お米料理"</string>
+  <string name="restYUL">"仕上がり分量の単位のリストをリセットする"</string>
+  <string name="restUL">"単位のリストをリセットする"</string>
+  <string name="restInfo">"リストをリセットすると、作成した項目が削除され、既定の項目を復元します。既にあるレシピには影響しません。"</string>
+  <string name="restDone">"リセットが完了しました"</string>
+  <string name="restCuiL">"ジャンルのリストをリセット"</string>
+  <string name="restCatL">"カテゴリーリストをリセット"</string>
+  <string name="rest">"リセット"</string>
+  <string name="resNF">"レシピが見つかりません"</string>
+  <string name="req">"%1$s が必要"</string>
+  <string name="recU">"アップデート:"</string>
+  <string name="recTitle">"私の健康レシピ"</string>
+  <string name="recs">"レシピ"</string>
+  <string name="recRm">"レシピを削除しました"</string>
+  <string name="recPic">"レシピの写真"</string>
+  <string name="recListEmp">"まだ何もありません！レシピを追加してもう一度試してください"</string>
+  <string name="recI">"インポートしました:"</string>
+  <string name="recF">"件のレシピが見つかりました"</string>
+  <string name="recE">"既に存在します:"</string>
+  <string name="rec">"レシピ"</string>
+  <string name="rBtn">"削除"</string>
+  <string name="Rating">"評価"</string>
+  <string name="_Quickest_first_Z1CpP7N">"速いもの順"</string>
+  <string name="qt">"クォート"</string>
+  <string name="pt">"少々"</string>
+  <string name="priv">"プライバシーポリシー"</string>
+  <string name="prepT">"準備時間"</string>
+  <string name="Pound">"ポンド"</string>
+  <string name="Poultry">"チキン料理"</string>
+  <string name="Portuguese">"ポルトガル料理"</string>
+  <string name="plsAdd">"プラスボタンを押して追加します"</string>
+  <string name="planner">"献立プラン"</string>
+  <string name="Piece">"片"</string>
+  <string name="piece">"片"</string>
+  <string name="pht">"レシピの写真"</string>
+  <string name="photogrid">"写真グリッド"</string>
+  <string name="Patty">"パティ"</string>
+  <string name="Pasta">"パスタ"</string>
+  <string name="Ounce">"オンス"</string>
+  <string name="opts">"オプション"</string>
+  <string name="_Oldest_first_Z6cq4h">"古いもの順"</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"10月"</string>
+  <string name="nwYiU">"新しい仕上がり単位"</string>
+  <string name="nwCat">"新しいカテゴリー"</string>
+  <string name="November">"11月"</string>
+  <string name="nos">"メモ"</string>
+  <string name="noRecsInL">"検索に一致するレシピが見つかりませんでした"</string>
+  <string name="noRecs">"検索に一致するレシピがありません"</string>
+  <string name="Noodles">"麺"</string>
+  <string name="noFavs">"お気に入りはまだありません"</string>
+  <string name="noAccSensor">"加速度センサーが無効です"</string>
+  <string name="no">"メモ"</string>
+  <string name="nLangInfo">"新しい言語を使用するためにEnRecipesを再起動"</string>
+  <string name="Nigerian">"ナイジェリア料理"</string>
+  <string name="newUnit">"新しい単位"</string>
+  <string name="newRec">"新しいレシピ"</string>
+  <string name="_Newest_first_2Sb3c">"新しい順"</string>
+  <string name="newCui">"新しいジャンル"</string>
+  <string name="MON">"月"</string>
+  <string name="Moderate">"普通"</string>
+  <string name="ml">"ml"</string>
+  <string name="minimal">"最小"</string>
+  <string name="min">"分"</string>
+  <string name="Millilitre">"ミリリットル"</string>
+  <string name="mg">"mg"</string>
+  <string name="Mexican">"メキシコ料理"</string>
+  <string name="Meat">"肉料理"</string>
+  <string name="May">"5月"</string>
+  <string name="March">"3月"</string>
+  <string name="_Main_dishes_u6RGQ">"主菜"</string>
+  <string name="mAgo">"%1$s か月前"</string>
+  <string name="lunch">"昼食"</string>
+  <string name="ltAgo">"ずっと前"</string>
+  <string name="Loaf">"ローフ"</string>
+  <string name="Litre">"リットル"</string>
+  <string name="listVM">"一覧の表示方法"</string>
+  <string name="Light">"ライト"</string>
+  <string name="leaf">"枚"</string>
+  <string name="_Last_updated_Z2gEbLD">"最終更新"</string>
+  <string name="lang">"言語"</string>
+  <string name="l">"リットル"</string>
+  <string name="Korean">"韓国料理"</string>
+  <string name="Kilogram">"キログラム"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">"ケニア料理"</string>
+  <string name="kEdit">"編集を続ける"</string>
+  <string name="June">"6月"</string>
+  <string name="July">"7月"</string>
+  <string name="joinTG">"Telegramグループに参加"</string>
+  <string name="Jewish">"ユダヤ料理"</string>
+  <string name="Japanese">"和食"</string>
+  <string name="January">"1月"</string>
+  <string name="Jamaican">"ジャマイカ料理"</string>
+  <string name="Italian">"イタリア料理"</string>
+  <string name="Irish">"アイルランド料理"</string>
+  <string name="invFile">"無効なファイルです"</string>
+  <string name="intf">"インターフェイス"</string>
+  <string name="inss">"作り方"</string>
+  <string name="ings">"材料"</string>
+  <string name="Indian">"インド料理"</string>
+  <string name="impSuc">"インポートに成功"</string>
+  <string name="impip">"インポートを実行中"</string>
+  <string name="impInfo">"アプリからエクスポートしたフルバックアップに対応しています"</string>
+  <string name="impFail">"インポートに失敗"</string>
+  <string name="impBu">"データをインポート"</string>
+  <string name="hr">"時間"</string>
+  <string name="Healthy">"ヘルシー"</string>
+  <string name="guide">"ユーザーガイド"</string>
+  <string name="grocery">"食材のリスト"</string>
+  <string name="grid">"グリッド"</string>
+  <string name="Greek">"ギリシャ料理"</string>
+  <string name="Gram">"グラム"</string>
+  <string name="gh">"GitHubで見る"</string>
+  <string name="German">"ドイツ料理"</string>
+  <string name="Gallon">"ガロン"</string>
+  <string name="gal">"ガロン"</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"お気に入りのレシピはここに表示されます"</string>
+  <string name="FRI">"金"</string>
+  <string name="French">"フランス料理"</string>
+  <string name="_Fluid_Ounce_bd10L">"液量オンス"</string>
+  <string name="fltr">"絞り込み"</string>
+  <string name="_fl_oz_72kqu">"液量オンス"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"絞り込み結果"</string>
+  <string name="Filipino">"フィリピン料理"</string>
+  <string name="February">"2月"</string>
+  <string name="favourites">"お気に入り"</string>
+  <string name="expSuc">"エクスポートに成功"</string>
+  <string name="expip">"エクスポートを実行中"</string>
+  <string name="expBu">"バックアップをエクスポート"</string>
+  <string name="English">"イングランド料理"</string>
+  <string name="Egyptian">"エジプト料理"</string>
+  <string name="editRec">"レシピを編集する"</string>
+  <string name="Easy">"簡単"</string>
+  <string name="dsp">"デザート用スプーン"</string>
+  <string name="drop">"滴"</string>
+  <string name="dozen">"ダース"</string>
+  <string name="donate">"寄付する"</string>
+  <string name="disc">"レシピの変更が保存されていません。どうしますか？"</string>
+  <string name="disBtn">"破棄"</string>
+  <string name="dinner">"夕食"</string>
+  <string name="_Difficulty_level_cSL5d">"難易度"</string>
+  <string name="detailed">"詳細"</string>
+  <string name="Desserts">"デザート"</string>
+  <string name="delRecsInfo">"%1$s 件のレシピを削除しようとしています"</string>
+  <string name="delRecInfo">"レシピ %1$s を削除しようとしています"</string>
+  <string name="December">"12月"</string>
+  <string name="dBtn">"削除"</string>
+  <string name="db">"データベース"</string>
+  <string name="Dark">"ダーク"</string>
+  <string name="Danish">"デンマーク料理"</string>
+  <string name="dAgo">"%1$s 日前"</string>
+  <string name="Cup">"カップ"</string>
+  <string name="cup">"カップ"</string>
+  <string name="cui">"ジャンル"</string>
+  <string name="Created">"作成日時"</string>
+  <string name="cPic">"写真を切り抜く"</string>
+  <string name="cookT">"調理時間"</string>
+  <string name="conf">"確認"</string>
+  <string name="conBtn">"続ける"</string>
+  <string name="cmbs">"組合せ"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"クローブ"</string>
+  <string name="Chinese">"中華料理"</string>
+  <string name="Challenging">"難しい"</string>
+  <string name="cBtn">"キャンセル"</string>
+  <string name="cat">"カテゴリー"</string>
+  <string name="buMod">"バックアップファイルが一部修正されています"</string>
+  <string name="buInfo">"全てのデータを復元するためのZIPファイルを生成します"</string>
+  <string name="buInc">"バックアップファイルが壊れています"</string>
+  <string name="buFol">"バックアップフォルダー"</string>
+  <string name="buEmp">"バックアップファイルが空です"</string>
+  <string name="British">"イギリス料理"</string>
+  <string name="breakfast">"朝食"</string>
+  <string name="Breads">"パン"</string>
+  <string name="Brazilian">"ブラジル料理"</string>
+  <string name="Black">"黒"</string>
+  <string name="Beverages">"飲物"</string>
+  <string name="Barbecue">"キャンプ料理"</string>
+  <string name="August">"8月"</string>
+  <string name="aStpBtn">"手順を追加"</string>
+  <string name="April">"4月"</string>
+  <string name="appRst">"アプリの再起動が必要"</string>
+  <string name="apply">"適用する"</string>
+  <string name="appInfo">"EnRecipesはレシピを作成・管理・共有することができる、オープンソースでプライバシーに配慮したデジタル料理本です"</string>
+  <string name="Appetizers">"前菜"</string>
+  <string name="appCrd">"EnRecipesから共有されました。F-DroidかIzzyOnDroidかPlayストアからダウンロード出来ます。"</string>
+  <string name="aNoBtn">"メモを追加"</string>
+  <string name="aNBtn">"新しく追加"</string>
+  <string name="American">"アメリカ料理"</string>
+  <string name="allTs">"全てのタグ"</string>
+  <string name="allCuis">"全てのジャンル"</string>
+  <string name="allCats">"全てのカテゴリー"</string>
+  <string name="aIngBtn">"材料を追加"</string>
+  <string name="aFBu">"バックアップするにはレシピを登録してください"</string>
+  <string name="addCmbBtn">"組合せを追加"</string>
+  <string name="aD">"完了しました！"</string>
+  <string name="aBtn">"追加"</string>
+  <string name="About">"アプリについて"</string>
+  <string name="aap">"写真を添付"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sec">"sec"</string>
+  <string name="EnRecipes">"EnRecipes"</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-kn/strings.xml b/app/resources/Android/src/main/res/values-kn/strings.xml
new file mode 100644
index 00000000..00104094
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-kn/strings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sysDefB">"System default + Black"</string>
+  <string name="buto">"Backed up to %1$s"</string>
+  <string name="yld">"Yield"</string>
+  <string name="yieldU">"Yield unit"</string>
+  <string name="yieldQ">"Yield quantity"</string>
+  <string name="yesterday">"yesterday"</string>
+  <string name="WED">"WED"</string>
+  <string name="wAgo">"%1$s weeks ago"</string>
+  <string name="Vietnamese">"Vietnamese"</string>
+  <string name="Vegetarian">"Vegetarian"</string>
+  <string name="Vegan">"Vegan"</string>
+  <string name="untRec">"Untitled Recipe"</string>
+  <string name="unsaved">"Unsaved changes"</string>
+  <string name="Unit">"Unit"</string>
+  <string name="unit">"unit"</string>
+  <string name="Undefined">"Undefined"</string>
+  <string name="Turkish">"Turkish"</string>
+  <string name="TUE">"TUE"</string>
+  <string name="tsp">"tsp"</string>
+  <string name="tsInfo">"separate with spaces"</string>
+  <string name="ts">"Tags"</string>
+  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
+  <string name="trylater">"Try Later"</string>
+  <string name="trnsl">"Translate"</string>
+  <string name="triedInfo">"You tried this recipe %1$s"</string>
+  <string name="today">"today"</string>
+  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
+  <string name="title">"Title"</string>
+  <string name="THU">"THU"</string>
+  <string name="Theme">"Theme"</string>
+  <string name="Thai">"Thai"</string>
+  <string name="Teaspoon">"Teaspoon"</string>
+  <string name="tbsp">"tbsp"</string>
+  <string name="Tablespoon">"Tablespoon"</string>
+  <string name="sysDef">"System default"</string>
+  <string name="swm">"Start week on Monday"</string>
+  <string name="Swedish">"Swedish"</string>
+  <string name="sVwInfo">"Helps you choose what to cook when you can\'t decide"</string>
+  <string name="sVw">"Shake to view random recipe"</string>
+  <string name="SUN">"SUN"</string>
+  <string name="strAdd">"Start adding your recipes!"</string>
+  <string name="stp">"Step"</string>
+  <string name="stick">"stick"</string>
+  <string name="stars">"Star rating"</string>
+  <string name="sru">"Share recipe using..."</string>
+  <string name="srt">"Sort"</string>
+  <string name="srpu">"Share recipe photo using..."</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankan"</string>
+  <string name="Spanish">"Spanish"</string>
+  <string name="Soups">"Soups"</string>
+  <string name="snacks">"Snacks"</string>
+  <string name="small">"small"</string>
+  <string name="sltd">"selected"</string>
+  <string name="_Slowest_first_hHjY6">"Slowest first"</string>
+  <string name="simple">"Simple"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"Side dishes"</string>
+  <string name="shr">"Share"</string>
+  <string name="Settings">"Settings"</string>
+  <string name="SET">"SET"</string>
+  <string name="Serving">"Serving"</string>
+  <string name="ser">"Search"</string>
+  <string name="September">"September"</string>
+  <string name="selRec">"Select recipe"</string>
+  <string name="Seafood">"Seafood"</string>
+  <string name="Scottish">"Scottish"</string>
+  <string name="Sauces">"Sauces"</string>
+  <string name="SAT">"SAT"</string>
+  <string name="Salads">"Salads"</string>
+  <string name="Russian">"Russian"</string>
+  <string name="rst">"RESTART"</string>
+  <string name="rp">"Remove photo"</string>
+  <string name="Roll">"Roll"</string>
+  <string name="rmYUInfo">"You are about to remove %1$s from the yield unit list"</string>
+  <string name="rmUInfo">"You are about to remove %1$s from the unit list"</string>
+  <string name="rmN">"Note removed"</string>
+  <string name="rmIns">"Instruction removed"</string>
+  <string name="rmIng">"Ingredient removed"</string>
+  <string name="rmCuiInfo">"You are about to remove %1$s from the cuisine list"</string>
+  <string name="rmCmb">"Combination removed"</string>
+  <string name="rmCatInfo">"You are about to remove %1$s from the category list"</string>
+  <string name="Rice">"Rice"</string>
+  <string name="restYUL">"Reset yield unit list"</string>
+  <string name="restUL">"Reset unit list"</string>
+  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
+  <string name="restDone">"Reset done"</string>
+  <string name="restCuiL">"Reset cuisine list"</string>
+  <string name="restCatL">"Reset category list"</string>
+  <string name="rest">"Reset"</string>
+  <string name="resNF">"Recipe not found"</string>
+  <string name="req">"Required %1$s"</string>
+  <string name="recU">"Updated:"</string>
+  <string name="recTitle">"My Healthy Recipe"</string>
+  <string name="recs">"recipes"</string>
+  <string name="recRm">"Recipe removed"</string>
+  <string name="recPic">"Recipe photo"</string>
+  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
+  <string name="recI">"Imported:"</string>
+  <string name="recF">"recipes found"</string>
+  <string name="recE">"Already exist:"</string>
+  <string name="rec">"Recipe"</string>
+  <string name="rBtn">"REMOVE"</string>
+  <string name="Rating">"Rating"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="priv">"Privacy policy"</string>
+  <string name="prepT">"Preparation time"</string>
+  <string name="Pound">"Pound"</string>
+  <string name="Poultry">"Poultry"</string>
+  <string name="Portuguese">"Portuguese"</string>
+  <string name="plsAdd">"Use the plus button to add one"</string>
+  <string name="planner">"Meal Planner"</string>
+  <string name="pinch">"pinch"</string>
+  <string name="Piece">"Piece"</string>
+  <string name="piece">"piece"</string>
+  <string name="pht">"Recipe photo"</string>
+  <string name="photogrid">"Photo Grid"</string>
+  <string name="Patty">"Patty"</string>
+  <string name="Pasta">"Pasta"</string>
+  <string name="oz">"oz"</string>
+  <string name="Ounce">"Ounce"</string>
+  <string name="opts">"Options"</string>
+  <string name="_Oldest_first_Z6cq4h">"Oldest first"</string>
+  <string name="OK">"OK"</string>
+  <string name="October">"October"</string>
+  <string name="nwYiU">"New yield unit"</string>
+  <string name="nwCat">"New category"</string>
+  <string name="November">"November"</string>
+  <string name="nos">"Notes"</string>
+  <string name="noRecsInL">"None of the recipes here matches your search"</string>
+  <string name="noRecs">"No recipes match your search"</string>
+  <string name="Noodles">"Noodles"</string>
+  <string name="noFavs">"No favourites yet"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
+  <string name="no">"Note"</string>
+  <string name="nNBtn">"NOT NOW"</string>
+  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
+  <string name="Nigerian">"Nigerian"</string>
+  <string name="newUnit">"New unit"</string>
+  <string name="newRec">"New recipe"</string>
+  <string name="_Newest_first_2Sb3c">"Newest first"</string>
+  <string name="newCui">"New cuisine"</string>
+  <string name="MON">"MON"</string>
+  <string name="Moderate">"Moderate"</string>
+  <string name="ml">"ml"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="sec">"sec"</string>
+  <string name="min">"min"</string>
+  <string name="Millilitre">"Millilitre"</string>
+  <string name="mg">"mg"</string>
+  <string name="Mexican">"Mexican"</string>
+  <string name="medium">"medium"</string>
+  <string name="Meat">"Meat"</string>
+  <string name="May">"May"</string>
+  <string name="March">"March"</string>
+  <string name="_Main_dishes_u6RGQ">"Main dishes"</string>
+  <string name="mAgo">"%1$s months ago"</string>
+  <string name="lunch">"Lunch"</string>
+  <string name="ltAgo">"a long time ago"</string>
+  <string name="Loaf">"Loaf"</string>
+  <string name="Litre">"Litre"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="Light">"Light"</string>
+  <string name="leaf">"leaf"</string>
+  <string name="lb">"lb"</string>
+  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
+  <string name="large">"large"</string>
+  <string name="lang">"Language"</string>
+  <string name="l">"l"</string>
+  <string name="Korean">"Korean"</string>
+  <string name="Kilogram">"Kilogram"</string>
+  <string name="kg">"kg"</string>
+  <string name="Kenyan">"Kenyan"</string>
+  <string name="kEdit">"KEEP EDITING"</string>
+  <string name="June">"June"</string>
+  <string name="July">"July"</string>
+  <string name="joinTG">"Join the Telegram group"</string>
+  <string name="Jewish">"Jewish"</string>
+  <string name="Japanese">"Japanese"</string>
+  <string name="January">"January"</string>
+  <string name="Jamaican">"Jamaican"</string>
+  <string name="Italian">"Italian"</string>
+  <string name="it">"Item"</string>
+  <string name="Irish">"Irish"</string>
+  <string name="invFile">"Invalid file"</string>
+  <string name="intf">"Interface"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ings">"Ingredients"</string>
+  <string name="Indian">"Indian"</string>
+  <string name="in">"in"</string>
+  <string name="impSuc">"Import success"</string>
+  <string name="impip">"Import in progress"</string>
+  <string name="impInfo">"Supports full backups exported by this app"</string>
+  <string name="impFail">"Import failed"</string>
+  <string name="impBu">"Import data"</string>
+  <string name="hr">"hr"</string>
+  <string name="Healthy">"Healthy"</string>
+  <string name="guide">"User guide"</string>
+  <string name="grocery">"Grocery List"</string>
+  <string name="grid">"Grid"</string>
+  <string name="Greek">"Greek"</string>
+  <string name="Gram">"Gram"</string>
+  <string name="gh">"View on GitHub"</string>
+  <string name="German">"German"</string>
+  <string name="Gallon">"Gallon"</string>
+  <string name="gal">"gal"</string>
+  <string name="g">"g"</string>
+  <string name="fsList">"Your favourite recipes are listed here"</string>
+  <string name="FRI">"FRI"</string>
+  <string name="French">"French"</string>
+  <string name="_Fluid_Ounce_bd10L">"Fluid Ounce"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
+  <string name="Filipino">"Filipino"</string>
+  <string name="February">"February"</string>
+  <string name="favourites">"Favourites"</string>
+  <string name="expSuc">"Export success"</string>
+  <string name="expip">"Export in progress"</string>
+  <string name="expBu">"Export full backup"</string>
+  <string name="EnRecipes">"EnRecipes"</string>
+  <string name="English">"English"</string>
+  <string name="Egyptian">"Egyptian"</string>
+  <string name="editRec">"Edit recipe"</string>
+  <string name="Easy">"Easy"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="drop">"drop"</string>
+  <string name="dozen">"dozen"</string>
+  <string name="donate">"Donate"</string>
+  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
+  <string name="disBtn">"DISCARD"</string>
+  <string name="dinner">"Dinner"</string>
+  <string name="_Difficulty_level_cSL5d">"Difficulty level"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="Desserts">"Desserts"</string>
+  <string name="delRecsInfo">"You are about to permanently delete %1$s"</string>
+  <string name="delRecInfo">"You are about to permanently delete the recipe %1$s"</string>
+  <string name="December">"December"</string>
+  <string name="dBtn">"DELETE"</string>
+  <string name="db">"Database"</string>
+  <string name="Dark">"Dark"</string>
+  <string name="Danish">"Danish"</string>
+  <string name="dAgo">"%1$s days ago"</string>
+  <string name="Cup">"Cup"</string>
+  <string name="cup">"cup"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Created">"Created"</string>
+  <string name="cPic">"Crop photo"</string>
+  <string name="cookT">"Cooking time"</string>
+  <string name="conf">"Confirm"</string>
+  <string name="conBtn">"CONTINUE"</string>
+  <string name="cmbs">"Combinations"</string>
+  <string name="cm">"cm"</string>
+  <string name="clove">"clove"</string>
+  <string name="Chinese">"Chinese"</string>
+  <string name="Challenging">"Challenging"</string>
+  <string name="cBtn">"CANCEL"</string>
+  <string name="cat">"Category"</string>
+  <string name="buMod">"The backup file was modified elsewhere"</string>
+  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
+  <string name="buInc">"Malformed or corrupt backup file"</string>
+  <string name="buFol">"Backup folder"</string>
+  <string name="buEmp">"The backup file is empty"</string>
+  <string name="British">"British"</string>
+  <string name="breakfast">"Breakfast"</string>
+  <string name="Breads">"Breads"</string>
+  <string name="Brazilian">"Brazilian"</string>
+  <string name="Black">"Black"</string>
+  <string name="Beverages">"Beverages"</string>
+  <string name="Barbecue">"Barbecue"</string>
+  <string name="August">"August"</string>
+  <string name="aStpBtn">"ADD STEP"</string>
+  <string name="April">"April"</string>
+  <string name="appRst">"App restart required"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="appInfo">"EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes"</string>
+  <string name="Appetizers">"Appetizers"</string>
+  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="aNoBtn">"ADD NOTE"</string>
+  <string name="aNBtn">"ADD NEW"</string>
+  <string name="American">"American"</string>
+  <string name="allTs">"All Tags"</string>
+  <string name="allCuis">"All Cuisines"</string>
+  <string name="allCats">"All Categories"</string>
+  <string name="aIngBtn">"ADD INGREDIENT"</string>
+  <string name="aFBu">"Add a recipe to perform a backup"</string>
+  <string name="addCmbBtn">"ADD COMBINATION"</string>
+  <string name="aD">"All done!"</string>
+  <string name="aBtn">"ADD"</string>
+  <string name="About">"About"</string>
+  <string name="aap">"Attach a photo"</string>
+</resources>
diff --git a/app/resources/Android/src/main/res/values-ml/strings.xml b/app/resources/Android/src/main/res/values-ml/strings.xml
index 3cb7daee..3f79d599 100644
--- a/app/resources/Android/src/main/res/values-ml/strings.xml
+++ b/app/resources/Android/src/main/res/values-ml/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="sysDefB">"സിസ്റ്റം സ്ഥിരസ്ഥിതി + കറുപ്പ്"</string>
   <string name="buto">"%1$s ലേക്ക് ബാക്കപ്പ് ചെയ്തു"</string>
   <string name="yld">"വരുമാനം"</string>
   <string name="yieldU">"വിളവ് യൂണിറ്റ്"</string>
@@ -292,4 +293,24 @@
   <string name="aBtn">"ചേർക്കുക"</string>
   <string name="About">"കുറിച്ച്"</string>
   <string name="aap">"ഒരു ഫോട്ടോ അറ്റാച്ചുചെയ്യുക"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sec">"sec"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-nb-rNO/strings.xml b/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
index 93da2fc7..6fad27d7 100644
--- a/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
+++ b/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="sec">"s"</string>
+  <string name="sysDefB">"Systemforvalg + Svart"</string>
   <string name="buto">"Støttet opp til %1$s"</string>
   <string name="yld">"Nyttemengde"</string>
   <string name="yieldU">"Enhet for nyttemengde"</string>
@@ -292,4 +294,23 @@
   <string name="aBtn">"Legg til"</string>
   <string name="About">"Om"</string>
   <string name="aap">"Legg ved et bilde"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-night/styles.xml b/app/resources/Android/src/main/res/values-night/styles.xml
index 34e7f52f..39e32333 100644
--- a/app/resources/Android/src/main/res/values-night/styles.xml
+++ b/app/resources/Android/src/main/res/values-night/styles.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" >
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 	<style name="LaunchScreenThemeBase" parent="Theme.AppCompat.NoActionBar">
 		<item name="colorPrimary">
-			@color/dark
-		</item>
-		<item name="colorPrimaryDark">
-			@color/dark
-		</item>
-		<item name="colorAccent">
-			@color/dark
+			@color/orange
 		</item>
 		<item name="android:windowBackground">
 			@drawable/splash_screen_dark
@@ -16,6 +10,9 @@
 		<item name="android:windowLightStatusBar">
 			false
 		</item>
+		<item name="android:statusBarColor">
+			@color/dark
+		</item>
 		<item name="android:windowLightNavigationBar" tools:targetApi="27">
 			false
 		</item>
@@ -26,30 +23,38 @@
 	<style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
 	</style>
 	<style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
-		<item name="colorPrimary">
-			@color/dark
-		</item>
-		<item name="colorPrimaryDark">
-			@color/dark
-		</item>
 		<item name="colorAccent">
-			@color/dark
+			@color/orange
 		</item>
 		<item name="colorControlNormal">
 			#00000000
 		</item>
 	</style>
 	<style name="AppTheme" parent="AppThemeBase">
-		<item name="android:listViewStyle">@style/ListViewTheme</item>
-		<item name="android:scrollViewStyle">@style/ScrollViewTheme</item>
+		<item name="android:listViewStyle">
+			@style/ListViewTheme
+		</item>
+		<item name="android:scrollViewStyle">
+			@style/ScrollViewTheme
+		</item>
 	</style>
 	<style name="ListViewTheme" parent="android:Widget.ListView">
-    	<item name="android:overScrollMode">never</item>
-    	<item name="android:divider">#00000000</item>
-    	<item name="android:dividerHeight">0dp</item>
-    	<item name="android:listSelector">#00000000</item>
+		<item name="android:overScrollMode">
+			never
+		</item>
+		<item name="android:divider">
+			#00000000
+		</item>
+		<item name="android:dividerHeight">
+			0dp
+		</item>
+		<item name="android:listSelector">
+			#00000000
+		</item>
 	</style>
 	<style name="ScrollViewTheme" parent="android:Widget.ScrollView">
-		<item name="android:overScrollMode">never</item>
+		<item name="android:overScrollMode">
+			never
+		</item>
 	</style>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-nl/strings.xml b/app/resources/Android/src/main/res/values-nl/strings.xml
index d45779b5..eefee2b7 100644
--- a/app/resources/Android/src/main/res/values-nl/strings.xml
+++ b/app/resources/Android/src/main/res/values-nl/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Kookwekker gewist"</string>
+  <string name="delay">"Vertraging"</string>
+  <string name="dlyDur">"Vertragingsduur"</string>
+  <string name="minute">"minuut"</string>
+  <string name="minutes">"minuten"</string>
+  <string name="hour">"uur"</string>
+  <string name="hours">"uur"</string>
+  <string name="seconds">"seconden"</string>
+  <string name="tmrvbrt">"Kookwekker laten trillen"</string>
+  <string name="stop">"Stoppen"</string>
+  <string name="prstBtn">"VOORINSTELLINGEN"</string>
+  <string name="tmrPrsts">"Kookwekker: voorinstellingen"</string>
+  <string name="fwr">"bij welk recept?"</string>
+  <string name="aTPrst">"Toegevoegd aan voorinstellingen"</string>
+  <string name="tmrSnd">"Kookwekkergeluid"</string>
+  <string name="sec">"s"</string>
+  <string name="timer">"Kookwekker"</string>
+  <string name="ntmr">"Nieuwe kookwekker"</string>
+  <string name="strtBtn">"STARTEN"</string>
+  <string name="tmr">"Kookwekker %1$s"</string>
+  <string name="sysDefB">"Systeemthema + Zwart"</string>
   <string name="buto">"Gebackupt naar %1$s"</string>
   <string name="yld">"Hoeveelheid"</string>
   <string name="yieldU">"Eenheid"</string>
diff --git a/app/resources/Android/src/main/res/values-pt-rBR/strings.xml b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
index 5ff5a956..9cc2f3fc 100644
--- a/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Temporizador liberado"</string>
+  <string name="seconds">"segundos"</string>
+  <string name="hours">"horas"</string>
+  <string name="hour">"hora"</string>
+  <string name="minutes">"atas"</string>
+  <string name="minute">"minuto"</string>
+  <string name="dlyDur">"Duração do atraso"</string>
+  <string name="tmrvbrt">"Temporizador vibrar"</string>
+  <string name="tmrSnd">"Som temporizador"</string>
+  <string name="aTPrst">"Adicionado às predefinições"</string>
+  <string name="fwr">"para qual receita?"</string>
+  <string name="tmrPrsts">"Predefinições temporizadas"</string>
+  <string name="delay">"Atraso"</string>
+  <string name="stop">"Parada"</string>
+  <string name="sec">"s"</string>
+  <string name="prstBtn">"PERSPECTIVAS"</string>
+  <string name="timer">"Temporizador de Culinária"</string>
+  <string name="ntmr">"Novo timer"</string>
+  <string name="strtBtn">"INICIAR"</string>
+  <string name="tmr">"Temporizador %1$s"</string>
+  <string name="dAgo">"%1$s dias atrás"</string>
+  <string name="Filipino">"Filipina"</string>
+  <string name="mAgo">"%1$s meses atrás"</string>
+  <string name="Thai">"Tailandesa"</string>
+  <string name="wAgo">"%1$s semanas atrás"</string>
+  <string name="sysDefB">"Padrão do sistema + Preto"</string>
+  <string name="yld">"Porção"</string>
   <string name="Jewish">"Judeu"</string>
   <string name="Japanese">"Japonês"</string>
   <string name="January">"Janeiro"</string>
@@ -70,7 +97,7 @@
   <string name="restDone">"Reposição feita"</string>
   <string name="restInfo">"A redefinição de uma lista eliminará as entradas criadas pelo usuário e restaurará as entradas padrão. As receitas existentes não serão afetadas."</string>
   <string name="restUL">"Reiniciar a lista de unidades"</string>
-  <string name="restYUL">"Redefinir a lista de unidades de rendimento"</string>
+  <string name="restYUL">"Redefinir a lista de unidades de porção"</string>
   <string name="rmCmb">"Combinação removida"</string>
   <string name="rmIng">"Ingrediente removido"</string>
   <string name="rmIns">"Instrução retirada"</string>
@@ -114,7 +141,7 @@
   <string name="_Oldest_first_Z6cq4h">"Os mais antigos"</string>
   <string name="OK">"OK"</string>
   <string name="October">"Outubro"</string>
-  <string name="nwYiU">"Nova unidade de produção"</string>
+  <string name="nwYiU">"Nova unidade de porção"</string>
   <string name="nwCat">"Nova categoria"</string>
   <string name="noRecsInL">"Nenhuma das receitas aqui corresponde à sua busca"</string>
   <string name="noAccSensor">"O sensor do acelerômetro está desativado ou não está funcionando"</string>
@@ -143,8 +170,8 @@
   <string name="WED">"VIA"</string>
   <string name="FRI">"SEX"</string>
   <string name="MON">"SEG"</string>
-  <string name="yieldU">"Unidade de rendimento"</string>
-  <string name="yieldQ">"Quantidade de rendimento"</string>
+  <string name="yieldU">"Unidade de porção"</string>
+  <string name="yieldQ">"Quantidade de porção"</string>
   <string name="Vegetarian">"Vegetariano"</string>
   <string name="Vegan">"Vegano"</string>
   <string name="unit">"Unidade"</string>
@@ -177,7 +204,7 @@
   <string name="Salads">"Saladas"</string>
   <string name="rst">"REINICIAR"</string>
   <string name="Roll">"Lista"</string>
-  <string name="rmYUInfo">"Você está prestes a remover a unidade de rendimento"</string>
+  <string name="rmYUInfo">"Você está prestes a remover a unidade de porção"</string>
   <string name="rmUInfo">"Você está prestes a remover a unidade"</string>
   <string name="rmCuiInfo">"Você está prestes a remover a cozinha"</string>
   <string name="rmCatInfo">"Você está prestes a remover a categoria"</string>
@@ -286,10 +313,4 @@
   <string name="aD">"Tudo feito!"</string>
   <string name="aBtn">"ADICIONAR"</string>
   <string name="About">"Sobre"</string>
-  <string name="yld">"Yield"</string>
-  <string name="wAgo">"%1$s weeks ago"</string>
-  <string name="Thai">"Thai"</string>
-  <string name="mAgo">"%1$s months ago"</string>
-  <string name="Filipino">"Filipino"</string>
-  <string name="dAgo">"%1$s days ago"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-pt/strings.xml b/app/resources/Android/src/main/res/values-pt/strings.xml
index 2bb3255f..d8d3f7b9 100644
--- a/app/resources/Android/src/main/res/values-pt/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt/strings.xml
@@ -1,5 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Temporizador a zero"</string>
+  <string name="prstBtn">"PRIMEIROS"</string>
+  <string name="tmrPrsts">"Predefinições temporizadas"</string>
+  <string name="fwr">"para que receita?"</string>
+  <string name="aTPrst">"Adicionado às predefinições"</string>
+  <string name="tmrSnd">"Som temporizador"</string>
+  <string name="tmrvbrt">"Vibrador temporizador"</string>
+  <string name="seconds">"segundos"</string>
+  <string name="hours">"horas"</string>
+  <string name="hour">"hora"</string>
+  <string name="minutes">"minutos"</string>
+  <string name="minute">"minuto"</string>
+  <string name="sec">"s"</string>
+  <string name="stop">"Parar"</string>
+  <string name="delay">"Atraso"</string>
+  <string name="dlyDur">"Duração do atraso"</string>
+  <string name="timer">"Temporizador de cozedura"</string>
+  <string name="ntmr">"Novo temporizador"</string>
+  <string name="strtBtn">"INICIAR"</string>
+  <string name="tmr">"Temporizador %1$s"</string>
+  <string name="aBtn">"ADICIONAR"</string>
+  <string name="aD">"Terminado!"</string>
+  <string name="addCmbBtn">"ADICIONAR COMBINAÇÃO"</string>
+  <string name="aFBu">"Adicione uma receita para fazer uma cópia de segurança"</string>
+  <string name="aIngBtn">"ADICIONAR INGREDIENTE"</string>
+  <string name="allCats">"Todas as categorias"</string>
+  <string name="allCuis">"Todas as cozinhas"</string>
+  <string name="allTs">"Todas as etiquetas"</string>
+  <string name="aNBtn">"ADICIONAR NOVA"</string>
+  <string name="aNoBtn">"ADICIONAR NOTA"</string>
+  <string name="appCrd">"Partilhado via EnRecipes. Obtenha-o no F-Droid, IzzyOnDroid ou na Play Store."</string>
+  <string name="appInfo">"EnRecipes é um livro de receitas digital de código aberto, amigo da privacidade, que lhe permite criar, gerir e partilhar as suas receitas"</string>
+  <string name="apply">"APLICAR"</string>
+  <string name="appRst">"É necessário reiniciar a aplicação"</string>
+  <string name="April">"Abril"</string>
+  <string name="aStpBtn">"ADICIONAR PASSO"</string>
+  <string name="August">"Agosto"</string>
+  <string name="cBtn">"CANCELAR"</string>
+  <string name="conBtn">"CONTINUAR"</string>
+  <string name="dBtn">"ELIMINAR"</string>
+  <string name="disBtn">"DESCARTAR"</string>
+  <string name="fsList">"As suas receitas favoritas são apresentadas aqui"</string>
+  <string name="gh">"Ver no GitHub"</string>
+  <string name="grid">"Grelha"</string>
+  <string name="guide">"Guia do utilizador"</string>
+  <string name="impBu">"Importar dados"</string>
+  <string name="impFail">"A importação falhou"</string>
+  <string name="impInfo">"Suporta cópias de segurança completas exportadas por esta aplicação"</string>
+  <string name="impip">"Importação em curso"</string>
+  <string name="impSuc">"Importado com sucesso"</string>
+  <string name="ings">"Ingredientes"</string>
+  <string name="inss">"Instruções"</string>
+  <string name="intf">"Interface"</string>
+  <string name="invFile">"Ficheiro inválido"</string>
+  <string name="it">"Item"</string>
+  <string name="January">"Janeiro"</string>
+  <string name="joinTG">"Junte-se ao grupo no Telegram"</string>
+  <string name="July">"Julho"</string>
+  <string name="June">"Junho"</string>
+  <string name="kEdit">"CONTINUAR A EDITAR"</string>
+  <string name="lang">"Idioma"</string>
+  <string name="listVM">"Modo de vista em lista"</string>
+  <string name="ltAgo">"há muito tempo"</string>
+  <string name="mAgo">"%1$s meses atrás"</string>
+  <string name="March">"Março"</string>
+  <string name="May">"Maio"</string>
+  <string name="minimal">"Mínimo"</string>
+  <string name="newCui">"Nova cozinha"</string>
+  <string name="newRec">"Nova receita"</string>
+  <string name="newUnit">"Nova unidade"</string>
+  <string name="nLangInfo">"Reinicie o EnRecipes para usar o novo idioma"</string>
+  <string name="nNBtn">"AGORA NÃO"</string>
+  <string name="no">"Nota"</string>
+  <string name="noFavs">"Ainda não tem favoritos"</string>
+  <string name="noRecs">"Nenhuma receita corresponde à pesquisa"</string>
+  <string name="pht">"Fotografia da receita"</string>
+  <string name="plsAdd">"Use o botão mais para adicionar uma"</string>
+  <string name="prepT">"Tempo de preparação"</string>
+  <string name="priv">"Política de privacidade"</string>
+  <string name="rBtn">"REMOVER"</string>
+  <string name="restInfo">"A redefinição de uma lista eliminará as entradas criadas pelo utilizador e restaurará as entradas predefinidas. As receitas existentes não serão afetadas."</string>
+  <string name="restUL">"Repor lista de unidades"</string>
+  <string name="restYUL">"Repor lista de unidades de porções"</string>
+  <string name="yld">"Porção"</string>
+  <string name="rmCmb">"Combinação removida"</string>
+  <string name="rmIng">"Ingrediente removido"</string>
+  <string name="rmIns">"Instrução removida"</string>
+  <string name="rmN">"Nota removida"</string>
+  <string name="rp">"Remover fotografia"</string>
+  <string name="rst">"REINICIAR"</string>
+  <string name="selRec">"Selecione a receita"</string>
+  <string name="September">"Setembro"</string>
+  <string name="ser">"Pesquisar"</string>
+  <string name="shr">"Partilhar"</string>
+  <string name="simple">"Simples"</string>
+  <string name="sltd">"selecionada"</string>
+  <string name="srpu">"Partilhar fotografia da receita usando..."</string>
+  <string name="srt">"Ordenar"</string>
+  <string name="sru">"Partilhar receita usando..."</string>
+  <string name="stars">"Classificação por estrelas"</string>
+  <string name="stp">"Etapa"</string>
+  <string name="trySer">"PROCURAR EM TODAS AS RECEITAS?"</string>
+  <string name="sysDefB">"Padrão do sistema + Preto"</string>
+  <string name="FRI">"SEX"</string>
+  <string name="MON">"SEG"</string>
+  <string name="SAT">"SÁB"</string>
+  <string name="SUN">"DOM"</string>
+  <string name="TUE">"TER"</string>
+  <string name="WED">"QUA"</string>
+  <string name="THU">"QUI"</string>
   <string name="rec">"Receita"</string>
   <string name="recE">"Já existem:"</string>
   <string name="recF">"receitas encontradas"</string>
@@ -9,20 +119,20 @@
   <string name="recRm">"Receita retirada"</string>
   <string name="recs">"receitas"</string>
   <string name="recTitle">"A minha receita saudável"</string>
-  <string name="recU">"Actualizado:"</string>
+  <string name="recU">"Atualizado:"</string>
   <string name="req">"Necessárias %1$s"</string>
   <string name="resNF">"Receita não encontrada"</string>
   <string name="rest">"Reiniciar"</string>
   <string name="restCatL">"Reiniciar lista de categorias"</string>
   <string name="restCuiL">"Repor a lista de cozinha"</string>
   <string name="restDone">"Reposição feita"</string>
-  <string name="buto">"Replacement made"</string>
-  <string name="yieldQ">"Quantidade de produção"</string>
-  <string name="yieldU">"Unidade de rendimento"</string>
+  <string name="buto">"Cópia de segurança guardada em %1$s"</string>
+  <string name="yieldQ">"Quantidade da porção"</string>
+  <string name="yieldU">"Unidade de porção"</string>
   <string name="Black">"Preto"</string>
-  <string name="buEmp">"O arquivo de backup está vazio"</string>
-  <string name="buFol">"Pasta de backup"</string>
-  <string name="buInc">"Ficheiro de backup malformado ou corrupto"</string>
+  <string name="buEmp">"O ficheiro da cópia de segurança está vazio"</string>
+  <string name="buFol">"Pasta da cópia de segurança"</string>
+  <string name="buInc">"Ficheiro da cópia de segurança está mal formado ou corrupto"</string>
   <string name="buInfo">"Gera um ficheiro ZIP contendo todos os seus dados que podem ser importados de volta"</string>
   <string name="buMod">"O ficheiro de cópia de segurança foi modificado noutro local"</string>
   <string name="cat">"Categoria"</string>
@@ -42,7 +152,7 @@
   <string name="editRec">"Editar receita"</string>
   <string name="expBu">"Exportar apoio total"</string>
   <string name="expip">"Exportação em curso"</string>
-  <string name="expSuc">"Sucesso de exportação"</string>
+  <string name="expSuc">"Exportado com sucesso"</string>
   <string name="February">"Fevereiro"</string>
   <string name="_Filtered_recipes_Z1alhhu">"Receitas filtradas"</string>
   <string name="fltr">"Filtro"</string>
@@ -50,13 +160,13 @@
   <string name="nos">"Notas"</string>
   <string name="November">"Novembro"</string>
   <string name="nwCat">"Nova categoria"</string>
-  <string name="nwYiU">"Nova unidade de rendimento"</string>
+  <string name="nwYiU">"Nova unidade de porção"</string>
   <string name="October">"Outubro"</string>
   <string name="opts">"Opções"</string>
   <string name="photogrid">"Grelha de fotos"</string>
   <string name="wAgo">"%1$s semanas atrás"</string>
   <string name="untRec">"Receita sem título"</string>
-  <string name="unsaved">"Alterações não salvas"</string>
+  <string name="unsaved">"Alterações não guardadas"</string>
   <string name="tsInfo">"separar com espaços"</string>
   <string name="ts">"Etiquetas"</string>
   <string name="trnsl">"Traduzir"</string>
@@ -67,11 +177,11 @@
   <string name="swm">"Começa na segunda-feira"</string>
   <string name="sVwInfo">"Ajuda-o a escolher o que deve cozinhar quando não consegue decidir"</string>
   <string name="sVw">"Sacudir para ver a receita aleatória"</string>
-  <string name="rmYUInfo">"Está prestes a remover %1$s da lista de unidades de rendimento"</string>
+  <string name="rmYUInfo">"Está prestes a remover %1$s da lista de unidades de porções"</string>
   <string name="rmUInfo">"Está prestes a remover %1$s da lista de unidades"</string>
   <string name="rmCuiInfo">"Está prestes a retirar %1$s da lista de cozinha"</string>
   <string name="rmCatInfo">"Está prestes a remover %1$s da lista de categorias"</string>
-  <string name="noAccSensor">"O sensor do acelerómetro ou está desactivado ou não está a funcionar"</string>
+  <string name="noAccSensor">"O sensor do acelerómetro ou está desativado ou não está a funcionar"</string>
   <string name="yesterday">"ontem"</string>
   <string name="Vietnamese">"Vietnamita"</string>
   <string name="Vegetarian">"Vegetariano"</string>
@@ -81,7 +191,7 @@
   <string name="Undefined">"Indefinido"</string>
   <string name="Turkish">"Turca"</string>
   <string name="tsp">"colher de chá"</string>
-  <string name="trylater">"Tente Mais Tarde"</string>
+  <string name="trylater">"Tentar mais tarde"</string>
   <string name="today">"hoje"</string>
   <string name="Theme">"Tema"</string>
   <string name="Thai">"Tailandesa"</string>
@@ -91,7 +201,7 @@
   <string name="Swedish">"Sueca"</string>
   <string name="strAdd">"Comece a adicionar as suas receitas!"</string>
   <string name="stick">"galho"</string>
-  <string name="_Sri_Lankan_Z7GfBa">"Cingalês"</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Cingalesa"</string>
   <string name="Spanish">"Espanhola"</string>
   <string name="Soups">"Sopas"</string>
   <string name="snacks">"Lanches"</string>
@@ -99,10 +209,10 @@
   <string name="_Slowest_first_hHjY6">"Mais lentas primeiro"</string>
   <string name="_Side_dishes_Z1Et4Vg">"Acompanhamentos"</string>
   <string name="Settings">"Definições"</string>
-  <string name="SET">"SET"</string>
+  <string name="SET">"DEFINIR"</string>
   <string name="Serving">"Porção"</string>
   <string name="Seafood">"Marisco"</string>
-  <string name="Scottish">"Escocêsa"</string>
+  <string name="Scottish">"Escocesa"</string>
   <string name="Sauces">"Molhos"</string>
   <string name="Salads">"Saladas"</string>
   <string name="Russian">"Russa"</string>
@@ -115,7 +225,7 @@
   <string name="Pound">"Pound"</string>
   <string name="Poultry">"Aves"</string>
   <string name="Portuguese">"Portuguesa"</string>
-  <string name="planner">"Plano Refeições"</string>
+  <string name="planner">"Plano de refeições"</string>
   <string name="pinch">"pitada"</string>
   <string name="Piece">"Peça"</string>
   <string name="piece">"peça"</string>
@@ -151,15 +261,15 @@
   <string name="kg">"kg"</string>
   <string name="Kenyan">"Queniana"</string>
   <string name="Jewish">"Judaica"</string>
-  <string name="Japanese">"Japonêsa"</string>
+  <string name="Japanese">"Japonesa"</string>
   <string name="Jamaican">"Jamaicana"</string>
   <string name="Italian">"Italiana"</string>
-  <string name="Irish">"Irlândesa"</string>
+  <string name="Irish">"Irlandesa"</string>
   <string name="Indian">"Indiana"</string>
   <string name="in">"in"</string>
   <string name="hr">"hr"</string>
   <string name="Healthy">"Saudável"</string>
-  <string name="grocery">"Lista Supermercado"</string>
+  <string name="grocery">"Lista de compras"</string>
   <string name="Greek">"Grega"</string>
   <string name="Gram">"Grama"</string>
   <string name="German">"Alemã"</string>
@@ -167,12 +277,12 @@
   <string name="gal">"gal"</string>
   <string name="g">"g"</string>
   <string name="French">"Francesa"</string>
-  <string name="_Fluid_Ounce_bd10L">"Onça Fluida"</string>
+  <string name="_Fluid_Ounce_bd10L">"Onça líquida"</string>
   <string name="_fl_oz_72kqu">"fl oz"</string>
   <string name="Filipino">"Filipina"</string>
   <string name="favourites">"Favoritos"</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="English">"Inglêsa"</string>
+  <string name="English">"Inglesa"</string>
   <string name="Egyptian">"Egípcia"</string>
   <string name="Easy">"Fácil"</string>
   <string name="dsp">"colher de sobremesa"</string>
@@ -182,7 +292,7 @@
   <string name="_Difficulty_level_cSL5d">"Nível de dificuldade"</string>
   <string name="Desserts">"Sobremesas"</string>
   <string name="Dark">"Escuro"</string>
-  <string name="Danish">"Dinamarquêsa"</string>
+  <string name="Danish">"Dinamarquesa"</string>
   <string name="Cup">"Copo"</string>
   <string name="cup">"copo"</string>
   <string name="Created">"Criado"</string>
@@ -202,94 +312,5 @@
   <string name="title_activity_kimera">"EnRecipes"</string>
   <string name="American">"Americana"</string>
   <string name="About">"Sobre"</string>
-  <string name="aap">""</string>
-  <string name="yld">"Yield"</string>
-  <string name="WED">"WED"</string>
-  <string name="TUE">"TUE"</string>
-  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
-  <string name="THU">"THU"</string>
-  <string name="SUN">"SUN"</string>
-  <string name="stp">"Step"</string>
-  <string name="stars">"Star rating"</string>
-  <string name="sru">"Share recipe using..."</string>
-  <string name="srt">"Sort"</string>
-  <string name="srpu">"Share recipe photo using..."</string>
-  <string name="sltd">"selected"</string>
-  <string name="simple">"Simple"</string>
-  <string name="shr">"Share"</string>
-  <string name="ser">"Search"</string>
-  <string name="September">"September"</string>
-  <string name="selRec">"Select recipe"</string>
-  <string name="SAT">"SAT"</string>
-  <string name="rst">"RESTART"</string>
-  <string name="rp">"Remove photo"</string>
-  <string name="rmN">"Note removed"</string>
-  <string name="rmIns">"Instruction removed"</string>
-  <string name="rmIng">"Ingredient removed"</string>
-  <string name="rmCmb">"Combination removed"</string>
-  <string name="restYUL">"Reset yield unit list"</string>
-  <string name="restUL">"Reset unit list"</string>
-  <string name="restInfo">"Resetting a list will delete user-created entries and restore default entries. Existing recipes will not be affected."</string>
-  <string name="rBtn">"REMOVE"</string>
-  <string name="priv">"Privacy policy"</string>
-  <string name="prepT">"Preparation time"</string>
-  <string name="plsAdd">"Use the plus button to add one"</string>
-  <string name="pht">"Recipe photo"</string>
-  <string name="noRecs">"No recipes match your search"</string>
-  <string name="noFavs">"No favourites yet"</string>
-  <string name="no">"Note"</string>
-  <string name="nNBtn">"NOT NOW"</string>
-  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
-  <string name="newUnit">"New unit"</string>
-  <string name="newRec">"New recipe"</string>
-  <string name="newCui">"New cuisine"</string>
-  <string name="MON">"MON"</string>
-  <string name="minimal">"Minimal"</string>
-  <string name="May">"May"</string>
-  <string name="March">"March"</string>
-  <string name="mAgo">"%1$s months ago"</string>
-  <string name="ltAgo">"a long time ago"</string>
-  <string name="listVM">"List view mode"</string>
-  <string name="lang">"Language"</string>
-  <string name="kEdit">"KEEP EDITING"</string>
-  <string name="June">"June"</string>
-  <string name="July">"July"</string>
-  <string name="joinTG">"Join the Telegram group"</string>
-  <string name="January">"January"</string>
-  <string name="it">"Item"</string>
-  <string name="invFile">"Invalid file"</string>
-  <string name="intf">"Interface"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="ings">"Ingredients"</string>
-  <string name="impSuc">"Import success"</string>
-  <string name="impip">"Import in progress"</string>
-  <string name="impInfo">"Supports full backups exported by this app"</string>
-  <string name="impFail">"Import failed"</string>
-  <string name="impBu">"Import data"</string>
-  <string name="guide">"User guide"</string>
-  <string name="grid">"Grid"</string>
-  <string name="gh">"View on GitHub"</string>
-  <string name="fsList">"Your favourite recipes are listed here"</string>
-  <string name="FRI">"FRI"</string>
-  <string name="disBtn">"DISCARD"</string>
-  <string name="dBtn">"DELETE"</string>
-  <string name="conBtn">"CONTINUE"</string>
-  <string name="cBtn">"CANCEL"</string>
-  <string name="August">"August"</string>
-  <string name="aStpBtn">"ADD STEP"</string>
-  <string name="April">"April"</string>
-  <string name="appRst">"App restart required"</string>
-  <string name="apply">"APPLY"</string>
-  <string name="appInfo">"EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes"</string>
-  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
-  <string name="aNoBtn">"ADD NOTE"</string>
-  <string name="aNBtn">"ADD NEW"</string>
-  <string name="allTs">"All Tags"</string>
-  <string name="allCuis">"All Cuisines"</string>
-  <string name="allCats">"All Categories"</string>
-  <string name="aIngBtn">"ADD INGREDIENT"</string>
-  <string name="aFBu">"Add a recipe to perform a backup"</string>
-  <string name="addCmbBtn">"ADD COMBINATION"</string>
-  <string name="aD">"All done!"</string>
-  <string name="aBtn">"ADD"</string>
+  <string name="aap">"Anexar uma fotografia"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ru/strings.xml b/app/resources/Android/src/main/res/values-ru/strings.xml
index 3c19c980..f6ea48c8 100644
--- a/app/resources/Android/src/main/res/values-ru/strings.xml
+++ b/app/resources/Android/src/main/res/values-ru/strings.xml
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Таймер очищен"</string>
+  <string name="seconds">"секунды"</string>
+  <string name="hours">"часы"</string>
+  <string name="hour">"час"</string>
+  <string name="minutes">"минут"</string>
+  <string name="minute">"минута"</string>
+  <string name="dlyDur">"Длительность задержки"</string>
+  <string name="tmrvbrt">"Таймер вибрации"</string>
+  <string name="tmrSnd">"Звук таймера"</string>
+  <string name="aTPrst">"Добавлено в предустановки"</string>
+  <string name="fwr">"для какого рецепта?"</string>
+  <string name="tmrPrsts">"Предустановки таймера"</string>
+  <string name="prstBtn">"ПРЕЗЕТЫ"</string>
+  <string name="delay">"Задержка"</string>
+  <string name="stop">"Стоп"</string>
+  <string name="sec">"вто"</string>
+  <string name="timer">"Таймер готовки"</string>
+  <string name="ntmr">"Новый таймер"</string>
+  <string name="tmr">"Таймер %1$s"</string>
+  <string name="strtBtn">"СТАРТ"</string>
+  <string name="sysDefB">"По умолчанию + Чернить"</string>
   <string name="buto">"Резервировано до %1$s"</string>
   <string name="yld">"Урожай"</string>
   <string name="yieldU">"Подавать в"</string>
diff --git a/app/resources/Android/src/main/res/values-ta/strings.xml b/app/resources/Android/src/main/res/values-ta/strings.xml
index 91596ccb..1bf92994 100644
--- a/app/resources/Android/src/main/res/values-ta/strings.xml
+++ b/app/resources/Android/src/main/res/values-ta/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="sysDefB">"அமைப்பு இயல்புநிலை + கருப்பு"</string>
   <string name="buto">"%1$s இல் காப்புப் பிரதி எடுக்கப்பட்டது"</string>
   <string name="yld">"மகசூல்"</string>
   <string name="yieldU">"மகசூல் அலகு"</string>
@@ -292,4 +293,24 @@
   <string name="aBtn">"சேர்"</string>
   <string name="About">"பற்றி"</string>
   <string name="aap">"புகைப்படத்தை இணைக்கவும்"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sec">"sec"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-te/strings.xml b/app/resources/Android/src/main/res/values-te/strings.xml
index 91049607..8d6d0171 100644
--- a/app/resources/Android/src/main/res/values-te/strings.xml
+++ b/app/resources/Android/src/main/res/values-te/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="sysDefB">"సిస్టమ్ డిఫాల్ట్ + నలుపు"</string>
   <string name="buto">"%1$s కు బ్యాకప్ చేయబడింది"</string>
   <string name="yld">"దిగుబడి"</string>
   <string name="yieldU">"దిగుబడి యూనిట్"</string>
@@ -292,4 +293,24 @@
   <string name="aBtn">"చేర్చు"</string>
   <string name="About">"గురించి"</string>
   <string name="aap">"ఫోటోను అటాచ్ చేయండి"</string>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sec">"sec"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values/colors.xml b/app/resources/Android/src/main/res/values/colors.xml
index e30afdce..d55b086c 100644
--- a/app/resources/Android/src/main/res/values/colors.xml
+++ b/app/resources/Android/src/main/res/values/colors.xml
@@ -9,6 +9,9 @@
 	<color name="ns_accent">
 		#ffffff
 	</color>
+	<color name="orange">
+		#ff5200
+	</color>
 	<color name="white">
 		#ffffff
 	</color>
diff --git a/app/resources/Android/src/main/res/values/strings.xml b/app/resources/Android/src/main/res/values/strings.xml
index fa7fa8f8..00104094 100644
--- a/app/resources/Android/src/main/res/values/strings.xml
+++ b/app/resources/Android/src/main/res/values/strings.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="tmrClr">"Timer cleared"</string>
+  <string name="seconds">"seconds"</string>
+  <string name="hours">"hours"</string>
+  <string name="hour">"hour"</string>
+  <string name="minutes">"minutes"</string>
+  <string name="minute">"minute"</string>
+  <string name="dlyDur">"Delay duration"</string>
+  <string name="tmrvbrt">"Timer vibrate"</string>
+  <string name="tmrSnd">"Timer sound"</string>
+  <string name="aTPrst">"Added to presets"</string>
+  <string name="fwr">"for which recipe?"</string>
+  <string name="tmrPrsts">"Timer presets"</string>
+  <string name="prstBtn">"PRESETS"</string>
+  <string name="tmr">"Timer %1$s"</string>
+  <string name="delay">"Delay"</string>
+  <string name="stop">"Stop"</string>
+  <string name="strtBtn">"START"</string>
+  <string name="ntmr">"New timer"</string>
+  <string name="timer">"Cooking Timer"</string>
+  <string name="sysDefB">"System default + Black"</string>
   <string name="buto">"Backed up to %1$s"</string>
   <string name="yld">"Yield"</string>
   <string name="yieldU">"Yield unit"</string>
@@ -145,6 +165,7 @@
   <string name="Moderate">"Moderate"</string>
   <string name="ml">"ml"</string>
   <string name="minimal">"Minimal"</string>
+  <string name="sec">"sec"</string>
   <string name="min">"min"</string>
   <string name="Millilitre">"Millilitre"</string>
   <string name="mg">"mg"</string>
diff --git a/app/resources/Android/src/main/res/values/styles.xml b/app/resources/Android/src/main/res/values/styles.xml
index 604572cc..decefe13 100644
--- a/app/resources/Android/src/main/res/values/styles.xml
+++ b/app/resources/Android/src/main/res/values/styles.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" >
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 	<style name="LaunchScreenThemeBase" parent="Theme.AppCompat.NoActionBar">
 		<item name="colorPrimary">
-			@color/light
-		</item>
-		<item name="colorPrimaryDark">
-			@color/light
-		</item>
-		<item name="colorAccent">
-			@color/light
+			@color/orange
 		</item>
 		<item name="android:windowBackground">
 			@drawable/splash_screen
@@ -16,6 +10,9 @@
 		<item name="android:windowLightStatusBar">
 			true
 		</item>
+		<item name="android:statusBarColor">
+			@color/light
+		</item>
 		<item name="android:windowLightNavigationBar" tools:targetApi="27">
 			true
 		</item>
@@ -26,30 +23,38 @@
 	<style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
 	</style>
 	<style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
-		<item name="colorPrimary">
-			@color/light
-		</item>
-		<item name="colorPrimaryDark">
-			@color/light
-		</item>
 		<item name="colorAccent">
-			@color/light
+			@color/orange
 		</item>
 		<item name="colorControlNormal">
 			#00000000
 		</item>
 	</style>
 	<style name="AppTheme" parent="AppThemeBase">
-		<item name="android:listViewStyle">@style/ListViewTheme</item>
-		<item name="android:scrollViewStyle">@style/ScrollViewTheme</item>
+		<item name="android:listViewStyle">
+			@style/ListViewTheme
+		</item>
+		<item name="android:scrollViewStyle">
+			@style/ScrollViewTheme
+		</item>
 	</style>
 	<style name="ListViewTheme" parent="android:Widget.ListView">
-    	<item name="android:overScrollMode">never</item>
-    	<item name="android:divider">#00000000</item>
-    	<item name="android:dividerHeight">0dp</item>
-    	<item name="android:listSelector">#00000000</item>
+		<item name="android:overScrollMode">
+			never
+		</item>
+		<item name="android:divider">
+			#00000000
+		</item>
+		<item name="android:dividerHeight">
+			0dp
+		</item>
+		<item name="android:listSelector">
+			#00000000
+		</item>
 	</style>
 	<style name="ScrollViewTheme" parent="android:Widget.ScrollView">
-		<item name="android:overScrollMode">never</item>
+		<item name="android:overScrollMode">
+			never
+		</item>
 	</style>
 </resources>
diff --git a/app/shared/utils.js b/app/shared/utils.js
index 86f840e7..608839af 100644
--- a/app/shared/utils.js
+++ b/app/shared/utils.js
@@ -1,20 +1,27 @@
-import { Application, AndroidApplication, Utils } from '@nativescript/core'
+import {
+  Application,
+  AndroidApplication,
+  Utils,
+  Device,
+  Color,
+  path,
+  knownFolders,
+} from '@nativescript/core'
 let timerOne
 export const restartApp = () => {
+  const ctx = Utils.ad.getApplicationContext()
   let mStartActivity = new android.content.Intent(
-    Application.android.context,
+    ctx,
     Application.android.startActivity.getClass()
   )
   let mPendingIntentId = Math.random() * 100000
   let mPendingIntent = android.app.PendingIntent.getActivity(
-    Application.android.context,
+    ctx,
     mPendingIntentId,
     mStartActivity,
     android.app.PendingIntent.FLAG_CANCEL_CURRENT
   )
-  let mgr = Application.android.context.getSystemService(
-    android.content.Context.ALARM_SERVICE
-  )
+  let mgr = ctx.getSystemService(android.content.Context.ALARM_SERVICE)
   mgr.set(
     android.app.AlarmManager.RTC,
     java.lang.System.currentTimeMillis() + 100,
@@ -112,6 +119,26 @@ export const copyPhotoToCache = (uri, filepath) => {
   })
 }
 
+// COPY DB FILE
+export const copyDBToExport = () => {
+  const src = path.join(knownFolders.documents().path, 'EnRecipes.db')
+  const dst = path.join(
+    knownFolders.documents().getFolder('EnRecipes').path,
+    'EnRecipes.db'
+  )
+  const input = new java.io.FileInputStream(src)
+  try {
+    const output = new java.io.FileOutputStream(dst)
+    let len
+    let buffer = Array.create('byte', 1024)
+    while ((len = input.read(buffer)) > 0) output.write(buffer, 0, len)
+  } catch (error) {
+    console.log(error)
+  } finally {
+    input.close()
+  }
+}
+
 // BACKUP FOLDER PICKER
 export const getBackupFolder = () => {
   const ctx =
@@ -272,3 +299,158 @@ export const shareImage = (image, subject) => {
   intent.putExtra(android.content.Intent.EXTRA_STREAM, shareUri)
   share(intent, subject)
 }
+
+// TIMER NOTIFICATION
+export class TimerNotification {
+  static getResource(ctx, icon) {
+    const packageName = ctx.getApplicationInfo().packageName
+    let resources = ctx.getResources()
+    return (
+      resources.getIdentifier(icon, 'drawable', packageName) ||
+      ctx.getApplicationInfo().icon
+    )
+  }
+  static clear(nID) {
+    let ctx = Utils.ad.getApplicationContext()
+    const NotifySrv = ctx.getSystemService(
+      android.content.Context.NOTIFICATION_SERVICE
+    )
+    NotifySrv.cancel(nID)
+  }
+  static show({
+    actions,
+    bID,
+    cID,
+    cName,
+    description,
+    nID,
+    priority,
+    sound,
+    title,
+    vibrate,
+  }) {
+    let sdkv = Device.sdkVersion * 1
+    let soundUri
+    if (sound) soundUri = new android.net.Uri.parse(sound)
+    const NotifyMgr = android.app.NotificationManager
+    let ctx = Utils.ad.getApplicationContext()
+    const NotifySrv = ctx.getSystemService(
+      android.content.Context.NOTIFICATION_SERVICE
+    )
+
+    if (priority) {
+      // Show over lock screen
+      Application.android.on(AndroidApplication.activityResumedEvent, () => {
+        const window = Application.android.startActivity.getWindow()
+        const windowMgr = android.view.WindowManager
+        window.addFlags(
+          windowMgr.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+            windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
+            windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
+        )
+      })
+    }
+
+    if (sdkv >= 26) {
+      const importance = priority
+        ? NotifyMgr.IMPORTANCE_HIGH
+        : NotifyMgr.IMPORTANCE_DEFAULT
+      const AudioAttributes = android.media.AudioAttributes
+      const audioAttributes = new AudioAttributes.Builder()
+        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+        .setUsage(AudioAttributes.USAGE_ALARM)
+        .build()
+      const Channel = new android.app.NotificationChannel(
+        cID,
+        cName,
+        importance
+      )
+      if (description) Channel.setDescription(description)
+      Channel.enableVibration(vibrate)
+      Channel.enableLights(false)
+      if (sound) Channel.setSound(soundUri, audioAttributes)
+      else Channel.setSound(null, null)
+      Channel.setShowBadge(true)
+      NotifySrv.createNotificationChannel(Channel)
+    }
+
+    const Intent = android.content.Intent
+    const PendingIntent = android.app.PendingIntent
+
+    const mainInt = new Intent(ctx, com.tns.NativeScriptActivity.class)
+    mainInt.putExtra('action', 'open_timer')
+    const mainPInt = PendingIntent.getActivity(
+      ctx,
+      1,
+      mainInt,
+      PendingIntent.FLAG_UPDATE_CURRENT
+    )
+
+    // Action intent
+    let actionInt1, actionInt2, actionPInt1, actionPInt2
+    if (actions) {
+      actionInt1 = new Intent(bID)
+      actionInt1.putExtra('action', 'delay')
+      actionPInt1 = PendingIntent.getBroadcast(
+        ctx,
+        2,
+        actionInt1,
+        PendingIntent.FLAG_UPDATE_CURRENT
+      )
+      actionInt2 = new Intent(bID)
+      actionInt2.putExtra('action', 'stop')
+      actionPInt2 = PendingIntent.getBroadcast(
+        ctx,
+        3,
+        actionInt2,
+        PendingIntent.FLAG_UPDATE_CURRENT
+      )
+    }
+
+    // CREATE NOTIFICATION
+    const NotificationCompat = androidx.core.app.NotificationCompat
+    let icon = TimerNotification.getResource(ctx, 'ic_stat_notify_silhouette')
+    let builder = new NotificationCompat.Builder(ctx, cID)
+      .setColor(new Color('#ff5200').android)
+      .setContentIntent(mainPInt)
+      .setContentTitle(title)
+      .setOngoing(true)
+      .setPriority(priority)
+      .setShowWhen(actions)
+      .setSmallIcon(icon)
+      .setSound(sound ? soundUri : null)
+      .setTicker(title)
+      .setAutoCancel(false)
+    if (description) builder.setContentText(description)
+    if (vibrate) builder.setVibrate([500, 1000])
+    if (actions) {
+      builder.setDeleteIntent(actionPInt2)
+      builder.setFullScreenIntent(mainPInt, true)
+      builder.addAction(null, 'Delay', actionPInt1)
+      builder.addAction(null, 'Stop', actionPInt2)
+    }
+    let notification = builder.build()
+    notification.flags = NotificationCompat.FLAG_INSISTENT
+    NotifySrv.notify(nID, notification)
+  }
+}
+
+// GET RINGTONES LIST
+export const getTones = () => {
+  let ctx = Utils.ad.getApplicationContext()
+  let tones = []
+  const RingtoneManager = android.media.RingtoneManager
+  const ringtonesMgr = new RingtoneManager(ctx)
+  ringtonesMgr.setType(RingtoneManager.TYPE_ALARM)
+  const cursor = ringtonesMgr.getCursor()
+  while (cursor.moveToNext()) {
+    tones.push({
+      title: cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX),
+      uri:
+        cursor.getString(RingtoneManager.URI_COLUMN_INDEX) +
+        '/' +
+        cursor.getString(RingtoneManager.ID_COLUMN_INDEX),
+    })
+  }
+  return tones
+}
diff --git a/app/store.ts b/app/store.ts
index f3d37e36..b900312d 100644
--- a/app/store.ts
+++ b/app/store.ts
@@ -1,14 +1,36 @@
 import Vue from 'nativescript-vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
-import { CouchBase } from '@triniwiz/nativescript-couchbase'
-import { getFileAccess, File, ApplicationSettings, Application } from '@nativescript/core'
-const EnRecipesDB = new CouchBase('EnRecipes')
-const userCuisinesDB = new CouchBase('userCuisines')
-const userCategoriesDB = new CouchBase('userCategories')
-const userYieldUnitsDB = new CouchBase('userYieldUnits')
-const userUnitsDB = new CouchBase('userUnits')
-const mealPlansDB = new CouchBase('mealPlans')
+import { openOrCreate } from '@akylas/nativescript-sqlite'
+import {
+  getFileAccess,
+  File,
+  ApplicationSettings,
+  Application,
+  knownFolders,
+  path,
+} from '@nativescript/core'
+
+// OPEN DATABASE FILE
+const db = openOrCreate(
+  path.join(knownFolders.documents().path, 'EnRecipes.db')
+)
+
+// CREATE recipes TABLE
+db.execute(
+  'CREATE TABLE IF NOT EXISTS recipes (id TEXT PRIMARY KEY, image TEXT, title TEXT, cuisine TEXT, category TEXT, tags TEXT, prepTime TEXT, cookTime TEXT, yieldQuantity TEXT, yieldUnit TEXT, difficulty TEXT, rating INT, ingredients TEXT, instructions TEXT, combinations TEXT, notes TEXT, favorite INT, tried INT, lastTried INT, lastModified INT, created INT)'
+)
+
+// CREATE lists TABLE
+db.execute(
+  'CREATE TABLE IF NOT EXISTS lists (cuisines TEXT, categories TEXT, yieldUnits TEXT, units TEXT)'
+)
+
+// CREATE mealPlans TABLE
+db.execute(
+  'CREATE TABLE IF NOT EXISTS mealPlans (date INT, type TEXT, title TEXT)'
+)
+
 const defaultCuisines = [
   'American',
   'Brazilian',
@@ -116,30 +138,18 @@ const defaultUnits = [
 ]
 const listItems = {
   cuisines: {
-    db: userCuisinesDB,
-    key: 'userCuisines',
-    stateName: 'cuisines',
     sort: true,
     defaultItems: defaultCuisines,
   },
   categories: {
-    db: userCategoriesDB,
-    key: 'userCategories',
-    stateName: 'categories',
     sort: true,
     defaultItems: defaultCategories,
   },
   yieldUnits: {
-    db: userYieldUnitsDB,
-    key: 'userYieldUnits',
-    stateName: 'yieldUnits',
     sort: false,
     defaultItems: defaultYieldUnits,
   },
   units: {
-    db: userUnitsDB,
-    key: 'userUnits',
-    stateName: 'units',
     sort: false,
     defaultItems: defaultUnits,
   },
@@ -154,61 +164,69 @@ export default new Vuex.Store({
     units: [],
     mealPlans: [],
     icon: {
-      back: '\ue900',
-      bag: '\ue901',
-      bagged: '\ue902',
-      cal: '\ue903',
-      category: '\ue904',
-      check: '\ue905',
-      cog: '\ue906',
+      cog: '\ue900',
+      home: '\ue901',
+      try: '\ue902',
+      tried: '\ue903',
+      fav: '\ue904',
+      faved: '\ue905',
+      menu: '\ue906',
       cuisine: '\ue907',
-      db: '\ue908',
-      del: '\ue909',
-      diff: '\ue90a',
-      don: '\ue90b',
-      done: '\ue90c',
-      edit: '\ue90d',
-      exp: '\ue90e',
-      fav: '\ue90f',
-      faved: '\ue910',
-      filter: '\ue911',
-      folder: '\ue912',
-      gh: '\ue913',
-      help: '\ue914',
-      home: '\ue915',
-      img: '\ue916',
-      imp: '\ue917',
-      info: '\ue918',
-      interface: '\ue919',
-      lang: '\ue91a',
-      layout: '\ue91b',
-      left: '\ue91c',
-      menu: '\ue91d',
-      opts: '\ue91e',
-      plus: '\ue91f',
-      price: '\ue920',
-      priv: '\ue921',
-      reset: '\ue922',
-      right: '\ue923',
-      save: '\ue924',
-      sear: '\ue925',
-      share: '\ue926',
-      shuf: '\ue927',
-      sort: '\ue928',
-      star: '\ue929',
-      starred: '\ue92a',
-      tag: '\ue92b',
-      tg: '\ue92c',
-      theme: '\ue92d',
-      time: '\ue92e',
-      tod: '\ue92f',
-      trans: '\ue930',
-      tried: '\ue931',
-      try: '\ue932',
-      uncheck: '\ue933',
-      undo: '\ue934',
-      week: '\ue935',
-      x: '\ue936',
+      category: '\ue908',
+      tag: '\ue909',
+      star: '\ue90a',
+      starred: '\ue90b',
+      time: '\ue90c',
+      diff: '\ue90d',
+      bag: '\ue90e',
+      bagged: '\ue90f',
+      price: '\ue910',
+      sear: '\ue911',
+      sort: '\ue912',
+      filter: '\ue913',
+      plus: '\ue914',
+      done: '\ue915',
+      back: '\ue916',
+      x: '\ue917',
+      del: '\ue918',
+      save: '\ue919',
+      undo: '\ue91a',
+      edit: '\ue91b',
+      cal: '\ue91c',
+      tod: '\ue91d',
+      left: '\ue91e',
+      right: '\ue91f',
+      img: '\ue920',
+      uncheck: '\ue921',
+      check: '\ue922',
+      share: '\ue923',
+      timer: '\ue924',
+      start: '\ue925',
+      pause: '\ue926',
+      addTo: '\ue927',
+      sound: '\ue928',
+      vibrate: '\ue929',
+      interface: '\ue92a',
+      opts: '\ue92b',
+      db: '\ue92c',
+      reset: '\ue92d',
+      info: '\ue92e',
+      lang: '\ue92f',
+      theme: '\ue930',
+      layout: '\ue931',
+      shuf: '\ue932',
+      week: '\ue933',
+      folder: '\ue934',
+      exp: '\ue935',
+      imp: '\ue936',
+      gh: '\ue937',
+      tg: '\ue938',
+      help: '\ue939',
+      priv: '\ue93a',
+      don: '\ue93b',
+      trans: '\ue93c',
+      delay: '\ue93d',
+      ring: '\ue93e',
     },
     currentComponent: 'EnRecipes',
     sortType: 'Oldest first',
@@ -290,20 +308,92 @@ export default new Vuex.Store({
         title: 'తెలుగు',
       },
     ],
-    shakeEnabled: true,
+    shakeEnabled: ApplicationSettings.getBoolean('shakeEnabled', true),
     importSummary: {
       found: 0,
       imported: 0,
       updated: 0,
     },
-    layout: 'detailed',
+    layout: ApplicationSettings.getString('layout', 'detailed'),
     selectedCuisine: null,
     selectedCategory: null,
     selectedTag: null,
     appTheme: 'sysDef',
-    mondayFirst: false,
+    mondayFirst: ApplicationSettings.getBoolean('mondayFirst', false),
+    timerDelay: ApplicationSettings.getString('timerDelay', '1 minute'),
+    timerSound: {},
+    timerVibrate: ApplicationSettings.getBoolean('timerVibrate', false),
+    timerPresets: [
+      {
+        id: 534534563,
+        label: 'Soft Eggs',
+        recipeID: null,
+        time: '00:06:00',
+        timerInterval: null,
+        isPaused: false,
+        preset: 1,
+      },
+      {
+        id: 564646,
+        label: 'Medium Eggs',
+        recipeID: null,
+        time: '00:08:00',
+        timerInterval: null,
+        isPaused: false,
+        preset: 1,
+      },
+      {
+        id: 43276767,
+        label: 'Hard Eggs',
+        recipeID: null,
+        time: '00:10:00',
+        timerInterval: null,
+        isPaused: false,
+        preset: 1,
+      },
+    ],
+    activeTimers: [],
+    timerIntervals: [],
   },
   mutations: {
+    addTimerPreset(state, timer) {
+      state.timerPresets.push(timer)
+    },
+    removeTimerPreset(state, index) {
+      state.timerPresets.splice(index, 1)
+    },
+    clearTimerInterval(state) {
+      state.activeTimers.forEach((e) => {
+        clearInterval(e.timerInterval)
+        e.timerInterval = null
+      })
+    },
+    addActiveTimer(state, { timer, index }) {
+      state.activeTimers.splice(index, 0, timer)
+    },
+    updateActiveTimer(state, timer) {
+      let index = state.activeTimers.findIndex((e) => e.id == timer.id)
+      state.activeTimers.splice(index, 1, timer)
+    },
+    removeActiveTimer(state, index) {
+      state.activeTimers.splice(index, 1)
+    },
+    setTimerDelay(state, delay) {
+      state.timerDelay = delay
+      ApplicationSettings.setString('timerDelay', delay)
+    },
+    setTimerSound(state, sound) {
+      state.timerSound = {
+        title: sound.title,
+        uri: sound.uri,
+      }
+      ApplicationSettings.setString('timerSoundTitle', sound.title)
+      ApplicationSettings.setString('timerSoundUri', sound.uri)
+    },
+    setTimerVibrate(state, bool) {
+      state.timerVibrate = bool
+      ApplicationSettings.setBoolean('timerVibrate', bool)
+    },
     clearImportSummary(state) {
       for (const key in state.importSummary) state.importSummary[key] = 0
     },
@@ -314,14 +404,16 @@ export default new Vuex.Store({
     setTheme(state, theme) {
       switch (theme) {
         case 'sysDef':
-          state.appTheme = Application.systemAppearance() == 'dark' ? "Dark" : "Light"
-          break;
+          state.appTheme =
+            Application.systemAppearance() == 'dark' ? 'Dark' : 'Light'
+          break
         case 'sysDefB':
-          state.appTheme = Application.systemAppearance() == 'dark' ? "Black" : "Light"
-          break;
+          state.appTheme =
+            Application.systemAppearance() == 'dark' ? 'Black' : 'Light'
+          break
         default:
           state.appTheme = theme
-          break;
+          break
       }
       ApplicationSettings.setString('appTheme', theme)
     },
@@ -335,25 +427,20 @@ export default new Vuex.Store({
       state.sortType = sortType
     },
     initRecipes(state) {
-      EnRecipesDB.query({ select: [] }).forEach((r) => {
-        if (r.timeRequired) {
-          r.prepTime = '00:00'
-          r.cookTime = r.timeRequired
-          delete r.timeRequired
-        }
-        if (!r.hasOwnProperty('cuisine')) r.cuisine = 'Undefined'
-        if (!r.hasOwnProperty('tags')) r.tags = []
-        if (!r.hasOwnProperty('difficulty')) r.difficulty = 'Easy'
-        if (!r.hasOwnProperty('rating')) r.rating = 0
-        if (!r.hasOwnProperty('created')) r.created = r.lastModified
-        // if (!r.hasOwnProperty("inBag"))
-        //   r.inBag = false
-        state.recipes.push(r)
+      db.select('SELECT * FROM recipes').then((res) => {
+        res.forEach((e) => {
+          Object.keys(e).forEach(
+            (f) =>
+              f.match(/tags|ingredients|instructions|combinations|notes/) &&
+              (e[f] = JSON.parse(e[f]))
+          )
+          state.recipes.push(e)
+        })
       })
       state.shakeEnabled = ApplicationSettings.getBoolean('shakeEnabled', true)
       state.sortType = ApplicationSettings.getString('sortType', 'Oldest first')
     },
-    importRecipes(state, recipes) {
+    importRecipesFromJSON(state, recipes) {
       let localRecipesIDs, partition
       let imported = 0
       let updated = 0
@@ -365,45 +452,100 @@ export default new Vuex.Store({
             r.cookTime = r.timeRequired
             delete r.timeRequired
           }
+          if (r.imageSrc) {
+            r.image = r.imageSrc.replace('enrecipes', 'EnRecipes')
+            delete r.imageSrc
+          }
           if (!r.hasOwnProperty('cuisine')) r.cuisine = 'Undefined'
           if (!r.hasOwnProperty('tags')) r.tags = []
           if (!r.hasOwnProperty('difficulty')) r.difficulty = 'Easy'
           if (!r.hasOwnProperty('rating')) r.rating = 0
           if (!r.hasOwnProperty('created')) r.created = r.lastModified
-          // if (!r.hasOwnProperty("inBag"))
-          //   r.inBag = false
+          r.yieldQuantity = r.yield.quantity
+          r.yieldUnit = r.yield.unit
+          delete r.yield
           return r
         })
       }
       function createDocuments(data) {
         data = getUpdatedData(data)
         state.recipes = [...state.recipes, ...data]
-        data.forEach((recipe) => {
+        data.forEach((r) => {
           imported++
-          EnRecipesDB.createDocument(recipe, recipe.id)
+          db.execute(
+            `INSERT INTO recipes (id, image, title, cuisine, category, tags, prepTime, cookTime, yieldQuantity, yieldUnit, difficulty, rating, ingredients, instructions, combinations, notes, favorite, tried, lastTried, lastModified, created) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+            [
+              r.id,
+              r.image,
+              r.title,
+              r.cuisine,
+              r.category,
+              JSON.stringify(r.tags),
+              r.prepTime,
+              r.cookTime,
+              r.yieldQuantity,
+              r.yieldUnit,
+              r.difficulty,
+              r.rating,
+              JSON.stringify(r.ingredients),
+              JSON.stringify(r.instructions),
+              JSON.stringify(r.combinations),
+              JSON.stringify(r.notes),
+              r.favorite ? 1 : 0,
+              r.tried ? 1 : 0,
+              r.lastTried ? new Date(r.lastTried).getTime() : null,
+              r.lastModified ? new Date(r.lastModified).getTime() : null,
+              r.created ? new Date(r.created).getTime() : null,
+            ]
+          )
         })
       }
       function updateDocuments(data) {
         data = getUpdatedData(data)
-        data.forEach((recipe) => {
+        data.forEach((r) => {
           let recipeIndex = state.recipes
             .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
+              let d2 = new Date(r.lastModified).getTime()
+              return e.id === r.id && d1 < d2 ? i : -1
             })
             .filter((e) => e >= 0)[0]
           if (recipeIndex >= 0) {
             updated++
-            Object.assign(state.recipes[recipeIndex], recipe)
-            EnRecipesDB.updateDocument(recipe.id, recipe)
+            Object.assign(state.recipes[recipeIndex], r)
+            db.execute(
+              `REPLACE INTO recipes (id, image, title, cuisine, category, tags, prepTime, cookTime, yieldQuantity, yieldUnit, difficulty, rating, ingredients, instructions, combinations, notes, favorite, tried, lastTried, lastModified, created) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+              [
+                r.id,
+                r.image,
+                r.title,
+                r.cuisine,
+                r.category,
+                JSON.stringify(r.tags),
+                r.prepTime,
+                r.cookTime,
+                r.yieldQuantity,
+                r.yieldUnit,
+                r.difficulty,
+                r.rating,
+                JSON.stringify(r.ingredients),
+                JSON.stringify(r.instructions),
+                JSON.stringify(r.combinations),
+                JSON.stringify(r.notes),
+                r.favorite ? 1 : 0,
+                r.tried ? 1 : 0,
+                r.lastTried ? new Date(r.lastTried).getTime() : null,
+                r.lastModified ? new Date(r.lastModified).getTime() : null,
+                r.created ? new Date(r.created).getTime() : null,
+              ]
+            )
           }
         })
       }
       if (state.recipes.length) {
         localRecipesIDs = state.recipes.map((e) => e.id)
         partition = recipes.reduce(
-          (result, recipe, i) => {
+          (result, recipe) => {
             localRecipesIDs.indexOf(recipe.id) < 0
               ? result[0].push(recipe) // create candidates
               : result[1].push(recipe) // update candidates
@@ -420,160 +562,196 @@ export default new Vuex.Store({
       state.importSummary.imported = imported
       state.importSummary.updated = updated
     },
-    addRecipe(state, { id, recipe }) {
-      state.recipes.push(recipe)
-      EnRecipesDB.createDocument(recipe, id)
+    importRecipesFromDB(state, recipes) {
+      let localRecipesIDs: string[], partition: any[]
+      let imported = 0
+      let updated = 0
+      function createDocuments(data: any[]) {
+        data.forEach((r) => {
+          const cols = Object.keys(r).join(', ')
+          const placeholder = Object.keys(r)
+            .fill('?')
+            .join(', ')
+          imported++
+          db.execute(
+            `REPLACE INTO recipes (${cols}) VALUES (${placeholder})`,
+            Object.values(r)
+          )
+          Object.keys(r).forEach(
+            (f) =>
+              f.match(/tags|ingredients|instructions|combinations|notes/) &&
+              (r[f] = JSON.parse(r[f]))
+          )
+          state.recipes.push(r)
+        })
+      }
+      function updateDocuments(data: any[]) {
+        data.forEach((r) => {
+          let recipeIndex = state.recipes
+            .map((e, i) => {
+              let d1 = new Date(e.lastModified).getTime()
+              let d2 = new Date(r.lastModified).getTime()
+              return e.id === r.id && d1 < d2 ? i : -1
+            })
+            .filter((e) => e >= 0)[0]
+          if (recipeIndex >= 0) {
+            updated++
+            const cols = Object.keys(r).join(', ')
+            const placeholder = Object.keys(r)
+              .fill('?')
+              .join(', ')
+            db.execute(
+              `REPLACE INTO recipes (${cols}) VALUES (${placeholder})`,
+              Object.values(r)
+            )
+            Object.keys(r).forEach(
+              (f) =>
+                f.match(/tags|ingredients|instructions|combinations|notes/) &&
+                (r[f] = JSON.parse(r[f]))
+            )
+            Object.assign(state.recipes[recipeIndex], r)
+          }
+        })
+      }
+      if (state.recipes.length) {
+        localRecipesIDs = state.recipes.map((e) => e.id)
+        partition = recipes.reduce(
+          (result, recipe) => {
+            localRecipesIDs.indexOf(recipe.id) < 0
+              ? result[0].push(recipe) // create candidates
+              : result[1].push(recipe) // update candidates
+            return result
+          },
+          [[], []]
+        )
+        if (partition[0].length) createDocuments(partition[0])
+        if (partition[1].length) updateDocuments(partition[1])
+      } else {
+        createDocuments(recipes)
+      }
+      state.importSummary.found = recipes.length
+      state.importSummary.imported = imported
+      state.importSummary.updated = updated
     },
-    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)
-      EnRecipesDB.deleteDocument(id)
-      state.recipes.forEach((e, i) => {
-        if (e.combinations.includes(id)) {
-          state.recipes[i].combinations.splice(e.combinations.indexOf(id), 1)
-          EnRecipesDB.updateDocument(state.recipes[i].id, state.recipes[i])
-        }
+    addRecipe(state, recipe) {
+      let r = JSON.parse(JSON.stringify(recipe))
+      Object.keys(recipe).forEach((e) => {
+        if (e.match(/tags|ingredients|instructions|combinations|notes/))
+          r[e] = JSON.stringify(r[e])
+        if (e.match(/favorite|tried/)) r[e] = r[e] ? 1 : 0
       })
+      const cols = Object.keys(recipe).join(', ')
+      const placeholder = Object.keys(recipe)
+        .fill('?')
+        .join(', ')
+      db.execute(
+        `REPLACE INTO recipes (${cols}) VALUES (${placeholder})`,
+        Object.values(r)
+      )
+      let i: number
+      function exist({ id }, index: number) {
+        if (id === recipe.id) {
+          i = index
+          return true
+        }
+        return false
+      }
+      state.recipes.some(exist)
+        ? Object.assign(state.recipes[i], recipe)
+        : state.recipes.push(recipe)
     },
     deleteRecipes(state, ids) {
-      ids.forEach((id) => {
+      ids.forEach((id: string) => {
         let index = state.recipes.findIndex((e) => e.id === id)
-        getFileAccess().deleteFile(state.recipes[index].imageSrc)
+        getFileAccess().deleteFile(state.recipes[index].image)
         state.recipes.splice(index, 1)
-        EnRecipesDB.deleteDocument(id)
+        db.execute(`DELETE FROM recipes WHERE id = '${id}'`)
         state.recipes.forEach((e, i) => {
           if (e.combinations.includes(id)) {
             state.recipes[i].combinations.splice(e.combinations.indexOf(id), 1)
-            EnRecipesDB.updateDocument(state.recipes[i].id, state.recipes[i])
+            db.execute(
+              `UPDATE recipes SET combinations = '${JSON.stringify(
+                state.recipes[i].combinations
+              )}' WHERE id = '${id}'`
+            )
           }
         })
       })
     },
     initListItems(state) {
-      function initialize(listName) {
-        let userItems
-        let db = listItems[listName].db
-        let key = listItems[listName].key
-        let stateName = listItems[listName].stateName
-        let defaultItems = listItems[listName].defaultItems
-        if (!state[stateName].length) {
-          let isStored = db.query({ select: [] }).length
-          if (isStored) {
-            userItems = db.getDocument(key)[key]
-            if (userItems.some((e) => defaultItems.includes(e)))
-              state[stateName] = userItems
-            else state[stateName] = [...defaultItems, ...userItems]
-          } else {
-            if (listItems[listName].sort) {
-              state[stateName].sort()
-            }
-            state[stateName] = defaultItems
-            db.createDocument(
-              {
-                [key]: [],
-              },
-              key
+      if (!state.cuisines.length) {
+        db.select(`SELECT * FROM lists`).then((res) => {
+          if (!res.length) {
+            db.execute(
+              `INSERT INTO lists (cuisines, categories, yieldUnits, units) VALUES (?, ?, ?, ?)`,
+              [null, null, null, null]
             )
           }
-        }
+
+          db.select(`SELECT * FROM lists`).then((res) => {
+            Object.keys(res[0]).forEach((list) => {
+              let userItems: string[]
+              let defaultItems = listItems[list].defaultItems
+              if (res[0][list]) {
+                userItems = JSON.parse(res[0][list])
+                state[list] = userItems.some((e: string) =>
+                  defaultItems.includes(e)
+                )
+                  ? userItems
+                  : [...defaultItems, ...userItems]
+              } else {
+                state[list] = defaultItems
+                listItems[list].sort && state[list].sort()
+              }
+            })
+          })
+        })
       }
-      ;['cuisines', 'categories', 'yieldUnits', 'units'].forEach((item) => {
-        initialize(item)
-      })
     },
     importListItems(state, { data, listName }) {
-      let db = listItems[listName].db
-      let key = listItems[listName].key
-      let stateName = listItems[listName].stateName
-      let items = new Set([...state[stateName], ...data])
-      state[stateName] = [...items]
-      if (listItems[listName].sort) state[stateName].sort()
-      db.updateDocument(key, { [key]: state[stateName] })
+      state[listName] = [...new Set([...state[listName], ...data])]
+      if (listItems[listName].sort) state[listName].sort()
+      db.execute(
+        `UPDATE lists SET ${listName} = '${JSON.stringify(state[listName])}'`
+      )
     },
     addListItem(state, { item, listName }) {
-      let db = listItems[listName].db
-      let key = listItems[listName].key
-      let stateName = listItems[listName].stateName
-      let lowercase = state[stateName].map((e) => e.toLowerCase())
+      let lowercase = state[listName].map((e: string) => e.toLowerCase())
       if (lowercase.indexOf(item.toLowerCase()) == -1) {
-        state[stateName].push(item)
-        db.updateDocument(key, { [key]: state[stateName] })
+        state[listName].push(item)
         if (listItems[listName].sort)
-          state[stateName].sort((a, b) =>
+          state[listName].sort((a: string, b: string) =>
             a.toLowerCase().localeCompare(b.toLowerCase())
           )
-      }
-    },
-    removeListItem(state, { item, listName }) {
-      let db = listItems[listName].db
-      let key = listItems[listName].key
-      let stateName = listItems[listName].stateName
-      let index = state[stateName].indexOf(item)
-      state[stateName].splice(index, 1)
-      db.updateDocument(key, { [key]: state[stateName] })
-      if (listItems[listName].sort) state[stateName].sort()
-    },
-    resetListItems(state, listName) {
-      let stateName = listItems[listName].stateName
-      let defaultItems = listItems[listName].defaultItems
-      state[listName] = [...defaultItems]
-      if (listItems[listName].sort) {
-        state[stateName].sort()
-      }
-    },
-    initMealPlans(state) {
-      let isMealPlansDBStored = mealPlansDB.query({ select: [] }).length
-      if (isMealPlansDBStored) {
-        let plans = mealPlansDB.getDocument('mealPlans').mealPlans
-        if (plans.length && plans[0].hasOwnProperty('eventColor')) {
-          plans.forEach((p) => {
-            let d = new Date(p.startDate)
-            p.date = new Date(
-              d.getFullYear(),
-              d.getMonth(),
-              d.getDate(),
-              0
-            ).getTime()
-            switch (new Date(p.date).getHours()) {
-              case 0:
-                p.type = 'breakfast'
-                break
-              case 5:
-                p.type = 'lunch'
-                break
-              case 10:
-                p.type = 'dinner'
-                break
-              case 15:
-                p.type = 'snacks'
-                break
-            }
-            delete p.startDate
-            delete p.endDate
-            delete p.eventColor
-            state.mealPlans.push(p)
-          })
-          mealPlansDB.updateDocument('mealPlans', {
-            mealPlans: state.mealPlans,
-          })
-        } else state.mealPlans = [...plans]
-      } else {
-        mealPlansDB.createDocument(
-          {
-            mealPlans: [],
-          },
-          'mealPlans'
+        db.execute(
+          `UPDATE lists SET ${listName} = '${JSON.stringify(state[listName])}'`
         )
       }
     },
-    importMealPlans(state, mealPlans) {
+    removeListItem(state, { item, listName }) {
+      state[listName].splice(state[listName].indexOf(item), 1)
+      db.execute(
+        `UPDATE lists SET ${listName} = '${JSON.stringify(state[listName])}'`
+      )
+    },
+    resetListItems(state, listName) {
+      let defaultItems = listItems[listName].defaultItems
+      state[listName] = [...defaultItems]
+      if (listItems[listName].sort)
+        state[listName].sort((a: string, b: string) =>
+          a.toLowerCase().localeCompare(b.toLowerCase())
+        )
+      db.execute(
+        `UPDATE lists SET ${listName} = '${JSON.stringify(state[listName])}'`
+      )
+    },
+    initMealPlans(state) {
+      if (!state.mealPlans.length)
+        db.select(`SELECT * FROM mealPlans`).then((res) =>
+          res.forEach((m: {}) => state.mealPlans.push(m))
+        )
+    },
+    importMealPlansFromJSON(state, mealPlans) {
       let newMealPlans = mealPlans.filter((e) => {
         if (e.hasOwnProperty('eventColor')) {
           return !state.mealPlans.some((f) => {
@@ -638,46 +816,66 @@ export default new Vuex.Store({
         })
       }
       state.mealPlans = [...state.mealPlans, ...updatedMealPlans]
-      mealPlansDB.updateDocument('mealPlans', { mealPlans: state.mealPlans })
+      updatedMealPlans.forEach((m) => {
+        db.execute(
+          `INSERT INTO mealPlans (date, type, title) VALUES (?, ?, ?)`,
+          [m.date, m.type, m.title]
+        )
+      })
     },
-    addMealPlan(state, { title, date, type, index }) {
+    importMealPlansFromDB(state, mealPlans) {
+      let newMealPlans = mealPlans.filter(
+        (e) =>
+          !state.mealPlans.some((f) =>
+            Object.keys(f).every((key) => f[key] == e[key])
+          )
+      )
+      state.mealPlans = [...state.mealPlans, ...newMealPlans]
+      newMealPlans.forEach((m) => {
+        db.execute(
+          `INSERT INTO mealPlans (date, type, title) VALUES (?, ?, ?)`,
+          [m.date, m.type, m.title]
+        )
+      })
+    },
+    addMealPlan(state, { date, type, title }) {
       let mealPlan = {
-        title,
         date,
         type,
+        title,
       }
-      if (index != null) state.mealPlans.splice(index, 0, mealPlan)
-      else state.mealPlans.push(mealPlan)
-      mealPlansDB.updateDocument('mealPlans', {
-        mealPlans: [...state.mealPlans],
-      })
+      state.mealPlans.push(mealPlan)
+      const cols = Object.keys(mealPlan).join(', ')
+      const placeholder = Object.keys(mealPlan)
+        .fill('?')
+        .join(', ')
+      db.execute(
+        `INSERT INTO mealPlans (${cols}) VALUES (${placeholder})`,
+        Object.values(mealPlan)
+      )
     },
-    deleteMealPlan(state, { title, date, type, index }) {
+    deleteMealPlan(state, { date, type, title }) {
+      let index = state.mealPlans.findIndex(
+        (e) => e.title === title && e.type === type && e.date === date
+      )
       state.mealPlans.splice(index, 1)
       state.mealPlans = [...state.mealPlans]
-      mealPlansDB.updateDocument('mealPlans', {
-        mealPlans: [...state.mealPlans],
-      })
-    },
-    toggleState(state, { id, recipe, key, setDate }) {
-      let index = state.recipes.indexOf(
-        state.recipes.filter((e) => e.id === id)[0]
+      db.execute(
+        `DELETE FROM mealPlans WHERE date = ${date} AND type = '${type}' AND title = '${title}'`
       )
-      state.recipes[index][key] = !state.recipes[index][key]
-      if (setDate) state.recipes[index].lastTried = new Date()
-      EnRecipesDB.updateDocument(id, recipe)
     },
-    setRecipeAsTried(state, { id, recipe }) {
-      let index = state.recipes.indexOf(
-        state.recipes.filter((e) => e.id === id)[0]
+    toggleState(state, { id, key, setDate }) {
+      let index = state.recipes.findIndex((e) => e.id == id)
+      state.recipes[index][key] = state.recipes[index][key] ? 0 : 1
+      db.execute(
+        `UPDATE recipes SET ${key} = ${state.recipes[index][key]} WHERE id = '${id}'`
       )
-      state.recipes[index].tried = true
-      state.recipes[index].lastTried = new Date()
-      EnRecipesDB.updateDocument(id, recipe)
-    },
-    setLastTriedDate(state, index) {
-      state.recipes[index].lastTried = new Date()
-      EnRecipesDB.updateDocument(state.recipes[index].id, state.recipes[index])
+      if (setDate) {
+        state.recipes[index].lastTried = new Date().getTime()
+        db.execute(
+          `UPDATE recipes SET lastTried = ${state.recipes[index].lastTried} WHERE id = '${id}'`
+        )
+      }
     },
     setComponent(state, comp) {
       state.currentComponent = comp
@@ -686,7 +884,11 @@ export default new Vuex.Store({
       state.recipes.forEach((e, i) => {
         if (combinations.includes(e.id)) {
           state.recipes[i].combinations.splice(e.combinations.indexOf(id), 1)
-          EnRecipesDB.updateDocument(state.recipes[i].id, state.recipes[i])
+          db.execute(
+            `UPDATE recipes SET combinations = '${JSON.stringify(
+              state.recipes[i].combinations
+            )}' WHERE id = '${id}'`
+          )
         }
       })
     },
@@ -694,26 +896,23 @@ export default new Vuex.Store({
       state.shakeEnabled = shake
       ApplicationSettings.setBoolean('shakeEnabled', shake)
     },
-    setRating(state, { id, recipe, rating }) {
-      let index = state.recipes.indexOf(
-        state.recipes.filter((e) => e.id === id)[0]
-      )
+    setRating(state, { id, rating }) {
+      let index = state.recipes.findIndex((e) => e.id == id)
       state.recipes[index].rating = rating
-      EnRecipesDB.updateDocument(id, recipe)
+      db.execute(`UPDATE recipes SET rating = ${rating} WHERE id = '${id}'`)
     },
-    toggleCart(state, { id, recipe }) {
+    toggleCart(state, { id }) {
       let index = state.recipes.indexOf(
         state.recipes.filter((e) => e.id === id)[0]
       )
       state.recipes[index].inBag = !state.recipes[index].inBag
-      EnRecipesDB.updateDocument(id, recipe)
     },
     unlinkBrokenImages(state) {
       state.recipes.forEach((r, i) => {
-        if (r.imageSrc && !File.exists(r.imageSrc)) {
-          r.imageSrc = null
+        if (r.image && !File.exists(r.image)) {
+          r.image = null
           Object.assign(state.recipes[i], r)
-          EnRecipesDB.updateDocument(r.id, r)
+          db.execute(`UPDATE recipes SET image = null WHERE id = '${r.id}'`)
         }
       })
     },
@@ -728,6 +927,33 @@ export default new Vuex.Store({
     },
   },
   actions: {
+    addTimerPreset({ commit }, timer) {
+      commit('addTimerPreset', timer)
+    },
+    removeTimerPreset({ commit }, timer) {
+      commit('removeTimerPreset', timer)
+    },
+    clearTimerInterval({ commit }) {
+      commit('clearTimerInterval')
+    },
+    addActiveTimer({ commit }, timer) {
+      commit('addActiveTimer', timer)
+    },
+    updateActiveTimer({ commit }, timer) {
+      commit('updateActiveTimer', timer)
+    },
+    removeActiveTimer({ commit }, index) {
+      commit('removeActiveTimer', index)
+    },
+    setTimerDelay({ commit }, delay) {
+      commit('setTimerDelay', delay)
+    },
+    setTimerSound({ commit }, sound) {
+      commit('setTimerSound', sound)
+    },
+    setTimerVibrate({ commit }, bool) {
+      commit('setTimerVibrate', bool)
+    },
     clearImportSummary({ commit }) {
       commit('clearImportSummary')
     },
@@ -749,25 +975,22 @@ export default new Vuex.Store({
     initRecipes({ commit }) {
       commit('initRecipes')
     },
-    importRecipesAction({ commit }, recipes) {
-      commit('importRecipes', recipes)
+    importRecipesFromJSON({ commit }, recipes) {
+      commit('importRecipesFromJSON', recipes)
+    },
+    importRecipesFromDB({ commit }, recipes) {
+      commit('importRecipesFromDB', recipes)
     },
     addRecipeAction({ commit }, recipe) {
       commit('addRecipe', recipe)
     },
-    overwriteRecipeAction({ commit }, updatedRecipe) {
-      commit('overwriteRecipe', updatedRecipe)
-    },
-    deleteRecipeAction({ commit }, recipe) {
-      commit('deleteRecipe', recipe)
-    },
-    deleteRecipesAction({ commit }, ids) {
+    deleteRecipes({ commit }, ids) {
       commit('deleteRecipes', ids)
     },
     initListItems({ commit }) {
       commit('initListItems')
     },
-    importListItemsAction({ commit }, data) {
+    importListItems({ commit }, data) {
       commit('importListItems', data)
     },
     addListItemAction({ commit }, item) {
@@ -782,8 +1005,11 @@ export default new Vuex.Store({
     initMealPlans({ commit }) {
       commit('initMealPlans')
     },
-    importMealPlansAction({ commit }, mealPlans) {
-      commit('importMealPlans', mealPlans)
+    importMealPlansFromJSON({ commit }, mealPlans) {
+      commit('importMealPlansFromJSON', mealPlans)
+    },
+    importMealPlansFromDB({ commit }, mealPlans) {
+      commit('importMealPlansFromDB', mealPlans)
     },
     addMealPlanAction({ commit }, mealPlan) {
       commit('addMealPlan', mealPlan)
@@ -794,12 +1020,6 @@ export default new Vuex.Store({
     toggleStateAction({ commit }, toggledRecipe) {
       commit('toggleState', toggledRecipe)
     },
-    setRecipeAsTriedAction({ commit }, recipe) {
-      commit('setRecipeAsTried', recipe)
-    },
-    setLastTriedDateAction({ commit }, index) {
-      commit('setLastTriedDate', index)
-    },
     setComponent({ commit }, comp) {
       commit('setComponent', comp)
     },
diff --git a/fastlane/metadata/android/en-GB/changelogs/8.txt b/fastlane/metadata/android/en-GB/changelogs/8.txt
deleted file mode 100644
index ff8c6b66..00000000
--- a/fastlane/metadata/android/en-GB/changelogs/8.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- You can now choose a system default theme to follow your device's dark mode setting (for Android 10 and above)
-- Cooking timer tool has been added
-- Individual settings page for each tool
\ No newline at end of file
diff --git a/nativescript.config.ts b/nativescript.config.ts
index fc941933..033ea2bd 100644
--- a/nativescript.config.ts
+++ b/nativescript.config.ts
@@ -1,7 +1,7 @@
 import { NativeScriptConfig } from "@nativescript/core"
 
 export default {
-  id: "com.vishnuraghav.enrecipes",
+  id: "com.vishnuraghav.EnRecipes",
   appPath: "app",
   appResourcesPath: "app/resources",
   android: {
diff --git a/package-lock.json b/package-lock.json
index 442c9ad2..16de09fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,35 +1,48 @@
 {
   "name": "enrecipes",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "enrecipes",
-      "version": "1.0.0",
+      "version": "2.0.0",
       "license": "GPL",
       "dependencies": {
+        "@akylas/nativescript-sqlite": "^3.3.12",
         "@nativescript-community/ui-collectionview": "^4.0.29",
-        "@nativescript/core": "~8.0.1",
+        "@nativescript/core": "^8.0.5",
+        "@nativescript/local-notifications": "^5.0.3",
         "@nativescript/localize": "^5.0.4",
         "@triniwiz/nativescript-accelerometer": "^4.0.3",
-        "@triniwiz/nativescript-couchbase": "^1.2.2",
         "nativescript-imagecropper": "^4.0.1",
         "nativescript-intl": "^4.0.2",
-        "nativescript-vue": "~2.9.0",
+        "nativescript-vue": "^2.9.0",
         "vuex": "^3.6.2"
       },
       "devDependencies": {
         "@nativescript/android": "8.0.0",
-        "@nativescript/types-android": "^8.0.0",
+        "@nativescript/types": "^8.0.1",
         "@nativescript/webpack": "beta",
-        "@types/node": "^14.14.37",
+        "@types/node": "^15.3.0",
         "nativescript-vue-template-compiler": "~2.9.0",
-        "sass": "^1.32.8",
+        "sass": "^1.32.13",
         "typescript": "^4.2.4",
         "vue": "^2.6.12"
       }
     },
+    "node_modules/@akylas/nativescript-sqlite": {
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/@akylas/nativescript-sqlite/-/nativescript-sqlite-3.3.12.tgz",
+      "integrity": "sha512-wu8zoLfw9OJP6UYQ0BAUsnf7rEsLY4gC+X71r7ga7zZcTqwNmmU+9E6so2eZlAdzzYIwUMIeTrxRm/VB129DRA==",
+      "dependencies": {
+        "@nativescript/hook": "~2.0.0"
+      },
+      "peerDependencies": {
+        "@nano-sql/core": "^2.3.7",
+        "@nativescript-community/typeorm": "0.2.28-1"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
@@ -40,9 +53,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz",
-      "integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
+      "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==",
       "dev": true
     },
     "node_modules/@babel/core": {
@@ -85,12 +98,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.13.16",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz",
-      "integrity": "sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz",
+      "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.13.16",
+        "@babel/types": "^7.14.2",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       }
@@ -120,14 +133,14 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz",
+      "integrity": "sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-get-function-arity": "^7.12.13",
         "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.14.2"
       }
     },
     "node_modules/@babel/helper-get-function-arity": {
@@ -158,19 +171,19 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
-      "integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz",
+      "integrity": "sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.13.12",
         "@babel/helper-replace-supers": "^7.13.12",
         "@babel/helper-simple-access": "^7.13.12",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.13",
-        "@babel/types": "^7.13.14"
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -213,9 +226,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+      "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
       "dev": true
     },
     "node_modules/@babel/helper-validator-option": {
@@ -225,93 +238,31 @@
       "dev": true
     },
     "node_modules/@babel/helpers": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.17.tgz",
-      "integrity": "sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+      "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.17",
-        "@babel/types": "^7.13.17"
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
-      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+      "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
-      "version": "7.13.16",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz",
-      "integrity": "sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz",
+      "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -332,44 +283,165 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz",
-      "integrity": "sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz",
+      "integrity": "sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.16",
-        "@babel/helper-function-name": "^7.12.13",
+        "@babel/generator": "^7.14.2",
+        "@babel/helper-function-name": "^7.14.2",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.16",
-        "@babel/types": "^7.13.17",
+        "@babel/parser": "^7.14.2",
+        "@babel/types": "^7.14.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz",
-      "integrity": "sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz",
+      "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "to-fast-properties": "^2.0.0"
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
-      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
+      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@nano-sql/core": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/@nano-sql/core/-/core-2.3.7.tgz",
+      "integrity": "sha512-B9nniPPRhPf5Hf2cyvy72SNEg4iKQEW6pig9nwrM4DJlmOMZudifOMPBoJuK6JcTaLATIOGRPkclfosNUALnLQ==",
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^2.0.1",
+        "levenshtein-edit-distance": "^2.0.4",
+        "really-small-events": "^1.1.0",
+        "snap-db": "^1.1.1"
+      },
+      "bin": {
+        "nsql": "lib/cli.js"
+      },
+      "optionalDependencies": {
+        "chalk": "^2.4.2",
+        "chokidar": "^3.0.2",
+        "command-line-args": "^5.1.1"
+      }
+    },
+    "node_modules/@nativescript-community/typeorm": {
+      "version": "0.2.28-1",
+      "resolved": "https://registry.npmjs.org/@nativescript-community/typeorm/-/typeorm-0.2.28-1.tgz",
+      "integrity": "sha512-2/SlK8c1SR6to6zryysGSKBSczhiXFziccWOU6R00nyjsQj3fJbxLfKDJIZyNefpHvrnpHy3VjWLsXmDXBwCbQ==",
+      "peer": true,
+      "dependencies": {
+        "@sqltools/formatter": "1.2.2",
+        "app-root-path": "^3.0.0",
+        "buffer": "^5.5.0",
+        "chalk": "^4.1.0",
+        "cli-highlight": "^2.1.4",
+        "debug": "^4.1.1",
+        "dotenv": "^8.2.0",
+        "glob": "^7.1.6",
+        "js-yaml": "^3.14.0",
+        "mkdirp": "^1.0.4",
+        "reflect-metadata": "^0.1.13",
+        "sha.js": "^2.4.11",
+        "tslib": "^1.13.0",
+        "xml2js": "^0.4.23",
+        "yargonaut": "^1.1.2",
+        "yargs": "^16.0.3"
+      },
+      "bin": {
+        "typeorm": "cli.js"
+      },
+      "funding": {
+        "url": "https://opencollective.com/typeorm"
+      }
+    },
+    "node_modules/@nativescript-community/typeorm/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "peer": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@nativescript-community/typeorm/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "peer": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@nativescript-community/typeorm/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "peer": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@nativescript-community/typeorm/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "peer": true
+    },
+    "node_modules/@nativescript-community/typeorm/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nativescript-community/typeorm/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@nativescript-community/ui-collectionview": {
       "version": "4.0.29",
       "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz",
-      "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg=="
+      "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg==",
+      "license": "Apache-2.0"
     },
     "node_modules/@nativescript/android": {
       "version": "8.0.0",
@@ -378,9 +450,9 @@
       "dev": true
     },
     "node_modules/@nativescript/core": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.2.tgz",
-      "integrity": "sha512-g4WvY7DMj3wN7CkWCkgXMloe2hTZbMKumtCO/4HhhGkvHoYa3Udm6HIwf6o88ekNOKrMwWsUzOcOXBFFT4AguQ==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.5.tgz",
+      "integrity": "sha512-61u5zo8I5XK6agqrAS2d0JAfOiVJ1kyAMi7VqkyXQohSsjOAK4CAfCAeIvaZf4vd3yeAnUWiL6UvCYt/Ot5srQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@nativescript/hook": "~2.0.0",
@@ -389,6 +461,11 @@
         "tslib": "~2.0.0"
       }
     },
+    "node_modules/@nativescript/core/node_modules/tslib": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+    },
     "node_modules/@nativescript/hook": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@nativescript/hook/-/hook-2.0.0.tgz",
@@ -398,6 +475,14 @@
         "mkdirp": "^1.0.4"
       }
     },
+    "node_modules/@nativescript/local-notifications": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@nativescript/local-notifications/-/local-notifications-5.0.3.tgz",
+      "integrity": "sha512-zIynr7kbac1/XZZ14NGnRro7eocdj+T5G3GqPtoJnlCNF2Lfwdr9KcbshhOsRiW/gszi5wkUli7QuFm0T3j5Dg==",
+      "dependencies": {
+        "@nativescript/shared-notification-delegate": "~1.0.0"
+      }
+    },
     "node_modules/@nativescript/localize": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@nativescript/localize/-/localize-5.0.4.tgz",
@@ -410,16 +495,37 @@
         "sprintf-js": "^1.1.1"
       }
     },
+    "node_modules/@nativescript/shared-notification-delegate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@nativescript/shared-notification-delegate/-/shared-notification-delegate-1.0.2.tgz",
+      "integrity": "sha512-Wh6F1WH9Aj23K+nyolA5MrA6MXku/5rSPt9r20ekbyx2FkRpBr0stjg4uD6KSyUvWY8YT+KQ9WlOUzhq7g7Ycw=="
+    },
+    "node_modules/@nativescript/types": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@nativescript/types/-/types-8.0.1.tgz",
+      "integrity": "sha512-D+tiui/HAgeLyJI62KdDEcXotXIG/MS1SkTK5PkP0GqakqsXJom4piggexg9sUv1zecHSefeA+Fpg0XBPRVOZQ==",
+      "dev": true,
+      "dependencies": {
+        "@nativescript/types-android": "8.0.1",
+        "@nativescript/types-ios": "8.0.1"
+      }
+    },
     "node_modules/@nativescript/types-android": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/@nativescript/types-android/-/types-android-8.0.1.tgz",
       "integrity": "sha512-+j+AgxOADDQrq/LZRGB8cznCad8dbGqD68KbkTxKwtUGdMFl2wlwcZEYgrv/N3JCOScEmQHJogAjixHCgnlnrA==",
       "dev": true
     },
+    "node_modules/@nativescript/types-ios": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@nativescript/types-ios/-/types-ios-8.0.1.tgz",
+      "integrity": "sha512-j8g/FbaQQsZlHEVEU2EUnX3SJvo3SI8ZhmPBzKoq1xTwnG3XvG3txU+yXQ95mZOT0YoaPdyo53ROEMNDOEDtMQ==",
+      "dev": true
+    },
     "node_modules/@nativescript/webpack": {
-      "version": "5.0.0-beta.9",
-      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.9.tgz",
-      "integrity": "sha512-DbsPLX7IYxeq6wtzOKNdLBVWakQCYF16UuFKTnQWfmPqRAHANn+Cpn48qhVmrLXp3u/BxHHdoPmDx5080j+Kvg==",
+      "version": "5.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.10.tgz",
+      "integrity": "sha512-j/NlhVCZi/8N5IQQbPjSRWPc3a7zSW8NTc0LsxbidsBPqeTiX1wUq5ajmNv/ctmbiNRsjmB9wTDwDxowormr2Q==",
       "dev": true,
       "dependencies": {
         "@babel/core": "7.13.15",
@@ -470,6 +576,64 @@
         }
       }
     },
+    "node_modules/@nativescript/webpack/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@nativescript/webpack/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@nativescript/webpack/node_modules/sass": {
       "version": "1.32.8",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
@@ -485,6 +649,18 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/@nativescript/webpack/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -573,16 +749,17 @@
       "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
       "dev": true
     },
+    "node_modules/@sqltools/formatter": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz",
+      "integrity": "sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==",
+      "peer": true
+    },
     "node_modules/@triniwiz/nativescript-accelerometer": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz",
       "integrity": "sha512-LKwlNaIWJPEbFKsPwA5vndqrKBUqE9dK9wdi/LsHs0Nl6pfMI7fPkBPoGW7UvVSMqy4s4d35Q0FDbKXR1t796A=="
     },
-    "node_modules/@triniwiz/nativescript-couchbase": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-couchbase/-/nativescript-couchbase-1.2.3.tgz",
-      "integrity": "sha512-E9BS1+DZn2xy3jSYjafFG6lAr4uYxxsLmc3pLmDjchK8H5oURzZgB9ubWwOn2ElGoLAaDaXv2ZFhHVIgFMmdwg=="
-    },
     "node_modules/@types/eslint": {
       "version": "7.2.10",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
@@ -616,9 +793,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "14.14.41",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
-      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
+      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -646,68 +823,6 @@
         "prettier": "^1.18.2"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@vue/component-compiler-utils/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
       "version": "7.0.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -894,9 +1009,9 @@
       }
     },
     "node_modules/@webpack-cli/configtest": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz",
-      "integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
+      "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
       "dev": true,
       "peerDependencies": {
         "webpack": "4.x.x || 5.x.x",
@@ -904,9 +1019,9 @@
       }
     },
     "node_modules/@webpack-cli/info": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.3.tgz",
-      "integrity": "sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz",
+      "integrity": "sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==",
       "dev": true,
       "dependencies": {
         "envinfo": "^7.7.3"
@@ -916,9 +1031,9 @@
       }
     },
     "node_modules/@webpack-cli/serve": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz",
-      "integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
+      "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
       "dev": true,
       "peerDependencies": {
         "webpack-cli": "4.x.x"
@@ -942,9 +1057,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
-      "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
+      "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1028,9 +1143,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.2.tgz",
-      "integrity": "sha512-+bpA9MJsHdZ4bgfDcpk0ozQyhhVct7rzOmO0s1IIr0AGGgKBljss8n2zp11rRP2wid5VGeh04CgeKzgat5/25A==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
+      "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -1061,6 +1176,12 @@
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/ajv/node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -1086,37 +1207,32 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
       "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "devOptional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1125,11 +1241,45 @@
         "node": ">= 8"
       }
     },
+    "node_modules/app-root-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
+      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
+      "peer": true,
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/argparse/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "peer": true
+    },
+    "node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -1250,7 +1400,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -1293,7 +1443,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -1302,14 +1452,14 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.16.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz",
-      "integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==",
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001214",
+        "caniuse-lite": "^1.0.30001219",
         "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.719",
+        "electron-to-chromium": "^1.3.723",
         "escalade": "^3.1.1",
         "node-releases": "^1.1.71"
       },
@@ -1324,6 +1474,30 @@
         "url": "https://opencollective.com/browserslist"
       }
     },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peer": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -1351,32 +1525,34 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001214",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
-      "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==",
-      "dev": true
+      "version": "1.0.30001228",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
+      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
     },
     "node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "devOptional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -1406,7 +1582,6 @@
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
       "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "highlight.js": "^10.7.1",
@@ -1423,11 +1598,74 @@
         "npm": ">=5.0.0"
       }
     },
+    "node_modules/cli-highlight/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/cli-highlight/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -1449,22 +1687,19 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "devOptional": true,
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "color-name": "1.1.3"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "devOptional": true
     },
     "node_modules/colorette": {
       "version": "1.2.2",
@@ -1472,6 +1707,22 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
+    "node_modules/command-line-args": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
+      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "array-back": "^3.0.1",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -1745,7 +1996,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1797,12 +2047,11 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
-      "dev": true,
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
     "node_modules/dotenv-defaults": {
@@ -1836,16 +2085,15 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.720",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz",
-      "integrity": "sha512-B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw==",
+      "version": "1.3.728",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
+      "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
       "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -1934,7 +2182,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -1943,7 +2190,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -1961,6 +2207,19 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "peer": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -2024,10 +2283,10 @@
       }
     },
     "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "peer": true
     },
     "node_modules/fast-glob": {
       "version": "3.2.5",
@@ -2067,11 +2326,20 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/figlet": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
+      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww==",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2096,6 +2364,19 @@
         "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
+    "node_modules/find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "array-back": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -2133,6 +2414,64 @@
         "yarn": ">=1.0.0"
       }
     },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -2178,6 +2517,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -2214,7 +2565,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -2243,7 +2593,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -2261,9 +2610,9 @@
       }
     },
     "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -2283,7 +2632,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -2359,13 +2708,34 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "peer": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "devOptional": true,
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hash-sum": {
@@ -2387,7 +2757,6 @@
       "version": "10.7.2",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
       "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
-      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -2419,6 +2788,26 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peer": true
+    },
     "node_modules/ignore": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -2493,7 +2882,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -2502,9 +2891,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
-      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -2517,7 +2906,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2526,7 +2915,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2535,7 +2923,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -2547,7 +2935,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -2614,12 +3002,46 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "peer": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -2695,6 +3117,19 @@
         "node": ">= 8"
       }
     },
+    "node_modules/levenshtein-edit-distance": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/levenshtein-edit-distance/-/levenshtein-edit-distance-2.0.5.tgz",
+      "integrity": "sha512-Yuraz7QnMX/JENJU1HA6UtdsbhRzoSFnGpVGVryjQgHtl2s/YmVgmNYkVs5yzVZ9aAvQR9wPBUH3lG755ylxGA==",
+      "peer": true,
+      "bin": {
+        "levenshtein-edit-distance": "cli.js"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -2742,6 +3177,13 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -2927,14 +3369,12 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -2942,9 +3382,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.1.22",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
-      "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
       "dev": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
@@ -2985,6 +3425,7 @@
       "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.9.0.tgz",
       "integrity": "sha512-7E8MizLk4PCI/9biTf31o2hLaXcXwQJLmIn4gCU2QHgwRN9NlqkvJ+oGoi7rPBAM8Lqv9CFKq9jH07ZNHXQNbg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"
@@ -2997,16 +3438,16 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "version": "1.1.72",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
+      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
       "dev": true
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3027,7 +3468,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3127,6 +3567,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/parent-require": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz",
+      "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -3148,14 +3597,12 @@
     "node_modules/parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-      "dev": true
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-      "dev": true,
       "dependencies": {
         "parse5": "^6.0.1"
       }
@@ -3163,8 +3610,7 @@
     "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
@@ -3211,7 +3657,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
       "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -3419,9 +3865,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
-      "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -3599,7 +4045,7 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -3607,6 +4053,12 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/really-small-events": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/really-small-events/-/really-small-events-1.1.0.tgz",
+      "integrity": "sha512-iyh4pULyDYBMecekEYcP3ToJD3ZUdIPfZV9nx1C1lJfMguElkDAZvEMJegy8uE7eIROCuLsqh5r44fVro9nKFg==",
+      "peer": true
+    },
     "node_modules/rechoir": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -3633,11 +4085,16 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
       "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
     },
+    "node_modules/reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "peer": true
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3721,13 +4178,12 @@
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/sass": {
-      "version": "1.32.11",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.11.tgz",
-      "integrity": "sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw==",
+      "version": "1.32.13",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
+      "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -3776,8 +4232,7 @@
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
@@ -3815,6 +4270,19 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "peer": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -3895,6 +4363,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/snap-db": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/snap-db/-/snap-db-1.1.6.tgz",
+      "integrity": "sha512-KxsO5RnY70J48f6poy0qVm2WS8ZbqG0PUVP2fjd7dvlaCMZ/DxtDv5fhhIVwkP2lOmNQ9QsTFfDuCA7N+TF3qg==",
+      "peer": true
+    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -3969,7 +4443,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -3983,7 +4456,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.0"
       },
@@ -4001,15 +4473,15 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "devOptional": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/tapable": {
@@ -4022,9 +4494,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
-      "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
+      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
       "dev": true,
       "dependencies": {
         "commander": "^2.20.0",
@@ -4099,7 +4571,6 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "dev": true,
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -4108,7 +4579,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-      "dev": true,
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -4129,7 +4599,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4175,6 +4645,64 @@
         "webpack": "*"
       }
     },
+    "node_modules/ts-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/ts-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ts-loader/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -4202,6 +4730,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/ts-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ts-loader/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -4234,15 +4774,15 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "peer": true
     },
     "node_modules/typescript": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
       "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
-      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4251,6 +4791,16 @@
         "node": ">=4.2.0"
       }
     },
+    "node_modules/typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -4284,8 +4834,7 @@
     "node_modules/vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
-      "dev": true
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
     },
     "node_modules/vue-hot-reload-api": {
       "version": "2.3.4",
@@ -4476,6 +5025,55 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/webpack-bundle-analyzer/node_modules/commander": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
@@ -4485,6 +5083,27 @@
         "node": ">= 6"
       }
     },
+    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/webpack-chain": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
@@ -4594,9 +5213,9 @@
       "dev": true
     },
     "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz",
-      "integrity": "sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==",
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
+      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -4658,7 +5277,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -4671,6 +5289,36 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -4697,6 +5345,28 @@
         }
       }
     },
+    "node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "peer": true,
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/xmlbuilder": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
@@ -4717,7 +5387,6 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -4737,11 +5406,76 @@
         "node": ">= 6"
       }
     },
+    "node_modules/yargonaut": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
+      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
+      "peer": true,
+      "dependencies": {
+        "chalk": "^1.1.1",
+        "figlet": "^1.1.1",
+        "parent-require": "^1.0.0"
+      }
+    },
+    "node_modules/yargonaut/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/yargonaut/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/yargonaut/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "peer": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/yargonaut/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "peer": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/yargonaut/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -4759,7 +5493,6 @@
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
       "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -4786,6 +5519,14 @@
     }
   },
   "dependencies": {
+    "@akylas/nativescript-sqlite": {
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/@akylas/nativescript-sqlite/-/nativescript-sqlite-3.3.12.tgz",
+      "integrity": "sha512-wu8zoLfw9OJP6UYQ0BAUsnf7rEsLY4gC+X71r7ga7zZcTqwNmmU+9E6so2eZlAdzzYIwUMIeTrxRm/VB129DRA==",
+      "requires": {
+        "@nativescript/hook": "~2.0.0"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
@@ -4796,9 +5537,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz",
-      "integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
+      "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==",
       "dev": true
     },
     "@babel/core": {
@@ -4833,12 +5574,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.13.16",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz",
-      "integrity": "sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz",
+      "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.13.16",
+        "@babel/types": "^7.14.2",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -4864,14 +5605,14 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz",
+      "integrity": "sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==",
       "dev": true,
       "requires": {
         "@babel/helper-get-function-arity": "^7.12.13",
         "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.14.2"
       }
     },
     "@babel/helper-get-function-arity": {
@@ -4902,19 +5643,19 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
-      "integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz",
+      "integrity": "sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.13.12",
         "@babel/helper-replace-supers": "^7.13.12",
         "@babel/helper-simple-access": "^7.13.12",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.13",
-        "@babel/types": "^7.13.14"
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -4957,9 +5698,9 @@
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+      "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
       "dev": true
     },
     "@babel/helper-validator-option": {
@@ -4969,83 +5710,31 @@
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.17.tgz",
-      "integrity": "sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+      "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.17",
-        "@babel/types": "^7.13.17"
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
-      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+      "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@babel/parser": {
-      "version": "7.13.16",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz",
-      "integrity": "sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz",
+      "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==",
       "dev": true
     },
     "@babel/template": {
@@ -5060,37 +5749,127 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz",
-      "integrity": "sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz",
+      "integrity": "sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.16",
-        "@babel/helper-function-name": "^7.12.13",
+        "@babel/generator": "^7.14.2",
+        "@babel/helper-function-name": "^7.14.2",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.16",
-        "@babel/types": "^7.13.17",
+        "@babel/parser": "^7.14.2",
+        "@babel/types": "^7.14.2",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.13.17",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz",
-      "integrity": "sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz",
+      "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "to-fast-properties": "^2.0.0"
       }
     },
     "@discoveryjs/json-ext": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
-      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
+      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true
     },
+    "@nano-sql/core": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/@nano-sql/core/-/core-2.3.7.tgz",
+      "integrity": "sha512-B9nniPPRhPf5Hf2cyvy72SNEg4iKQEW6pig9nwrM4DJlmOMZudifOMPBoJuK6JcTaLATIOGRPkclfosNUALnLQ==",
+      "peer": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "chokidar": "^3.0.2",
+        "command-line-args": "^5.1.1",
+        "fast-deep-equal": "^2.0.1",
+        "levenshtein-edit-distance": "^2.0.4",
+        "really-small-events": "^1.1.0",
+        "snap-db": "^1.1.1"
+      }
+    },
+    "@nativescript-community/typeorm": {
+      "version": "0.2.28-1",
+      "resolved": "https://registry.npmjs.org/@nativescript-community/typeorm/-/typeorm-0.2.28-1.tgz",
+      "integrity": "sha512-2/SlK8c1SR6to6zryysGSKBSczhiXFziccWOU6R00nyjsQj3fJbxLfKDJIZyNefpHvrnpHy3VjWLsXmDXBwCbQ==",
+      "peer": true,
+      "requires": {
+        "@sqltools/formatter": "1.2.2",
+        "app-root-path": "^3.0.0",
+        "buffer": "^5.5.0",
+        "chalk": "^4.1.0",
+        "cli-highlight": "^2.1.4",
+        "debug": "^4.1.1",
+        "dotenv": "^8.2.0",
+        "glob": "^7.1.6",
+        "js-yaml": "^3.14.0",
+        "mkdirp": "^1.0.4",
+        "reflect-metadata": "^0.1.13",
+        "sha.js": "^2.4.11",
+        "tslib": "^1.13.0",
+        "xml2js": "^0.4.23",
+        "yargonaut": "^1.1.2",
+        "yargs": "^16.0.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "peer": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "peer": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "peer": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "peer": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "peer": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "peer": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "@nativescript-community/ui-collectionview": {
       "version": "4.0.29",
       "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz",
@@ -5103,14 +5882,21 @@
       "dev": true
     },
     "@nativescript/core": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.2.tgz",
-      "integrity": "sha512-g4WvY7DMj3wN7CkWCkgXMloe2hTZbMKumtCO/4HhhGkvHoYa3Udm6HIwf6o88ekNOKrMwWsUzOcOXBFFT4AguQ==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.5.tgz",
+      "integrity": "sha512-61u5zo8I5XK6agqrAS2d0JAfOiVJ1kyAMi7VqkyXQohSsjOAK4CAfCAeIvaZf4vd3yeAnUWiL6UvCYt/Ot5srQ==",
       "requires": {
         "@nativescript/hook": "~2.0.0",
         "css-tree": "^1.1.2",
         "reduce-css-calc": "^2.1.7",
         "tslib": "~2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+        }
       }
     },
     "@nativescript/hook": {
@@ -5122,6 +5908,14 @@
         "mkdirp": "^1.0.4"
       }
     },
+    "@nativescript/local-notifications": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@nativescript/local-notifications/-/local-notifications-5.0.3.tgz",
+      "integrity": "sha512-zIynr7kbac1/XZZ14NGnRro7eocdj+T5G3GqPtoJnlCNF2Lfwdr9KcbshhOsRiW/gszi5wkUli7QuFm0T3j5Dg==",
+      "requires": {
+        "@nativescript/shared-notification-delegate": "~1.0.0"
+      }
+    },
     "@nativescript/localize": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@nativescript/localize/-/localize-5.0.4.tgz",
@@ -5133,16 +5927,37 @@
         "sprintf-js": "^1.1.1"
       }
     },
+    "@nativescript/shared-notification-delegate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@nativescript/shared-notification-delegate/-/shared-notification-delegate-1.0.2.tgz",
+      "integrity": "sha512-Wh6F1WH9Aj23K+nyolA5MrA6MXku/5rSPt9r20ekbyx2FkRpBr0stjg4uD6KSyUvWY8YT+KQ9WlOUzhq7g7Ycw=="
+    },
+    "@nativescript/types": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@nativescript/types/-/types-8.0.1.tgz",
+      "integrity": "sha512-D+tiui/HAgeLyJI62KdDEcXotXIG/MS1SkTK5PkP0GqakqsXJom4piggexg9sUv1zecHSefeA+Fpg0XBPRVOZQ==",
+      "dev": true,
+      "requires": {
+        "@nativescript/types-android": "8.0.1",
+        "@nativescript/types-ios": "8.0.1"
+      }
+    },
     "@nativescript/types-android": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/@nativescript/types-android/-/types-android-8.0.1.tgz",
       "integrity": "sha512-+j+AgxOADDQrq/LZRGB8cznCad8dbGqD68KbkTxKwtUGdMFl2wlwcZEYgrv/N3JCOScEmQHJogAjixHCgnlnrA==",
       "dev": true
     },
+    "@nativescript/types-ios": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@nativescript/types-ios/-/types-ios-8.0.1.tgz",
+      "integrity": "sha512-j8g/FbaQQsZlHEVEU2EUnX3SJvo3SI8ZhmPBzKoq1xTwnG3XvG3txU+yXQ95mZOT0YoaPdyo53ROEMNDOEDtMQ==",
+      "dev": true
+    },
     "@nativescript/webpack": {
-      "version": "5.0.0-beta.9",
-      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.9.tgz",
-      "integrity": "sha512-DbsPLX7IYxeq6wtzOKNdLBVWakQCYF16UuFKTnQWfmPqRAHANn+Cpn48qhVmrLXp3u/BxHHdoPmDx5080j+Kvg==",
+      "version": "5.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.10.tgz",
+      "integrity": "sha512-j/NlhVCZi/8N5IQQbPjSRWPc3a7zSW8NTc0LsxbidsBPqeTiX1wUq5ajmNv/ctmbiNRsjmB9wTDwDxowormr2Q==",
       "dev": true,
       "requires": {
         "@babel/core": "7.13.15",
@@ -5182,6 +5997,46 @@
         "webpack-virtual-modules": "0.4.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "sass": {
           "version": "1.32.8",
           "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
@@ -5190,6 +6045,15 @@
           "requires": {
             "chokidar": ">=2.0.0 <4.0.0"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -5239,16 +6103,17 @@
       "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
       "dev": true
     },
+    "@sqltools/formatter": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz",
+      "integrity": "sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==",
+      "peer": true
+    },
     "@triniwiz/nativescript-accelerometer": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz",
       "integrity": "sha512-LKwlNaIWJPEbFKsPwA5vndqrKBUqE9dK9wdi/LsHs0Nl6pfMI7fPkBPoGW7UvVSMqy4s4d35Q0FDbKXR1t796A=="
     },
-    "@triniwiz/nativescript-couchbase": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-couchbase/-/nativescript-couchbase-1.2.3.tgz",
-      "integrity": "sha512-E9BS1+DZn2xy3jSYjafFG6lAr4uYxxsLmc3pLmDjchK8H5oURzZgB9ubWwOn2ElGoLAaDaXv2ZFhHVIgFMmdwg=="
-    },
     "@types/eslint": {
       "version": "7.2.10",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
@@ -5282,9 +6147,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.41",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
-      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
+      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
       "dev": true
     },
     "@types/parse-json": {
@@ -5310,58 +6175,6 @@
         "vue-template-es2015-compiler": "^1.9.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
         "postcss": {
           "version": "7.0.35",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -5537,25 +6350,27 @@
       }
     },
     "@webpack-cli/configtest": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz",
-      "integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
+      "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.3.tgz",
-      "integrity": "sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz",
+      "integrity": "sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==",
       "dev": true,
       "requires": {
         "envinfo": "^7.7.3"
       }
     },
     "@webpack-cli/serve": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz",
-      "integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==",
-      "dev": true
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
+      "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -5570,9 +6385,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
-      "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
+      "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
       "dev": true
     },
     "acorn-class-fields": {
@@ -5588,7 +6403,8 @@
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-0.2.7.tgz",
       "integrity": "sha512-+GZH2wOKNZOBI4OOPmzpo4cs6mW297sn6fgIk1dUI08jGjhAaEwvC39mN2gJAg2lmAQJ1rBkFqKWonL3Zz6PVA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-private-methods": {
       "version": "0.3.3",
@@ -5620,9 +6436,9 @@
       }
     },
     "acorn-walk": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.2.tgz",
-      "integrity": "sha512-+bpA9MJsHdZ4bgfDcpk0ozQyhhVct7rzOmO0s1IIr0AGGgKBljss8n2zp11rRP2wid5VGeh04CgeKzgat5/25A==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
+      "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==",
       "dev": true
     },
     "ajv": {
@@ -5635,13 +6451,22 @@
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
+      },
+      "dependencies": {
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        }
       }
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ansi-colors": {
       "version": "4.1.1",
@@ -5658,39 +6483,67 @@
     "ansi-regex": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
     },
     "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "devOptional": true,
       "requires": {
-        "color-convert": "^2.0.1"
+        "color-convert": "^1.9.0"
       }
     },
     "any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
     },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
+    "app-root-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
+      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
+      "peer": true
+    },
     "arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "peer": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+          "peer": true
+        }
+      }
+    },
+    "array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "optional": true,
+      "peer": true
+    },
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -5768,7 +6621,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true
+      "devOptional": true
     },
     "bluebird": {
       "version": "3.7.2",
@@ -5805,24 +6658,34 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
     },
     "browserslist": {
-      "version": "4.16.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz",
-      "integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==",
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001214",
+        "caniuse-lite": "^1.0.30001219",
         "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.719",
+        "electron-to-chromium": "^1.3.723",
         "escalade": "^3.1.1",
         "node-releases": "^1.1.71"
       }
     },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "peer": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -5841,26 +6704,27 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001214",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz",
-      "integrity": "sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==",
+      "version": "1.0.30001228",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
+      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
       "dev": true
     },
     "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "devOptional": true,
       "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
     "chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -5882,7 +6746,6 @@
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
       "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
-      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "highlight.js": "^10.7.1",
@@ -5890,13 +6753,57 @@
         "parse5": "^5.1.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.0",
         "yargs": "^16.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -5915,19 +6822,19 @@
       }
     },
     "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "devOptional": true,
       "requires": {
-        "color-name": "~1.1.4"
+        "color-name": "1.1.3"
       }
     },
     "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "devOptional": true
     },
     "colorette": {
       "version": "1.2.2",
@@ -5935,6 +6842,19 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
+    "command-line-args": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
+      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "array-back": "^3.0.1",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      }
+    },
     "commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -6146,7 +7066,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -6178,10 +7097,9 @@
       }
     },
     "dotenv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
-      "dev": true
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
     },
     "dotenv-defaults": {
       "version": "2.0.1",
@@ -6208,16 +7126,15 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.720",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz",
-      "integrity": "sha512-B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw==",
+      "version": "1.3.728",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
+      "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
       "dev": true
     },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -6287,14 +7204,12 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint-scope": {
       "version": "5.1.1",
@@ -6306,6 +7221,12 @@
         "estraverse": "^4.1.1"
       }
     },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "peer": true
+    },
     "esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -6353,10 +7274,10 @@
       }
     },
     "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "peer": true
     },
     "fast-glob": {
       "version": "3.2.5",
@@ -6393,11 +7314,17 @@
         "reusify": "^1.0.4"
       }
     },
+    "figlet": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
+      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww==",
+      "peer": true
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -6413,6 +7340,16 @@
         "pkg-dir": "^4.1.0"
       }
     },
+    "find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "array-back": "^3.0.1"
+      }
+    },
     "find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -6443,6 +7380,46 @@
         "tapable": "^1.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -6472,6 +7449,15 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -6507,7 +7493,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -6525,8 +7510,7 @@
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
     "get-stream": {
       "version": "6.0.1",
@@ -6535,9 +7519,9 @@
       "dev": true
     },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6551,7 +7535,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -6606,11 +7590,28 @@
         "function-bind": "^1.1.1"
       }
     },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "peer": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "peer": true
+        }
+      }
+    },
     "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "devOptional": true
     },
     "hash-sum": {
       "version": "1.0.2",
@@ -6627,8 +7628,7 @@
     "highlight.js": {
       "version": "10.7.2",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
-      "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
-      "dev": true
+      "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="
     },
     "html-entities": {
       "version": "1.4.0",
@@ -6646,7 +7646,14 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "peer": true
     },
     "ignore": {
       "version": "5.1.8",
@@ -6704,15 +7711,15 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
     },
     "is-core-module": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
-      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -6722,19 +7729,18 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
+      "devOptional": true
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -6743,7 +7749,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
+      "devOptional": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -6793,6 +7799,23 @@
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "js-tokens": {
@@ -6801,6 +7824,16 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "peer": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -6856,6 +7889,12 @@
       "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
       "dev": true
     },
+    "levenshtein-edit-distance": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/levenshtein-edit-distance/-/levenshtein-edit-distance-2.0.5.tgz",
+      "integrity": "sha512-Yuraz7QnMX/JENJU1HA6UtdsbhRzoSFnGpVGVryjQgHtl2s/YmVgmNYkVs5yzVZ9aAvQR9wPBUH3lG755ylxGA==",
+      "peer": true
+    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -6894,6 +7933,13 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "optional": true,
+      "peer": true
+    },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -7036,14 +8082,12 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
       "requires": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -7051,9 +8095,9 @@
       }
     },
     "nanoid": {
-      "version": "3.1.22",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
-      "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
       "dev": true
     },
     "native-url": {
@@ -7100,16 +8144,16 @@
       "dev": true
     },
     "node-releases": {
-      "version": "1.1.71",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
-      "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+      "version": "1.1.72",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
+      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
       "dev": true
     },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
+      "devOptional": true
     },
     "npm-run-path": {
       "version": "4.0.1",
@@ -7123,8 +8167,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "once": {
       "version": "1.4.0",
@@ -7193,6 +8236,12 @@
         "callsites": "^3.0.0"
       }
     },
+    "parent-require": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz",
+      "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=",
+      "peer": true
+    },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -7208,14 +8257,12 @@
     "parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-      "dev": true
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
     },
     "parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-      "dev": true,
       "requires": {
         "parse5": "^6.0.1"
       },
@@ -7223,8 +8270,7 @@
         "parse5": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-          "dev": true
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
         }
       }
     },
@@ -7261,7 +8307,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
       "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-      "dev": true
+      "devOptional": true
     },
     "pify": {
       "version": "2.3.0",
@@ -7372,7 +8418,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -7404,9 +8451,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
-      "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -7528,11 +8575,17 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
     },
+    "really-small-events": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/really-small-events/-/really-small-events-1.1.0.tgz",
+      "integrity": "sha512-iyh4pULyDYBMecekEYcP3ToJD3ZUdIPfZV9nx1C1lJfMguElkDAZvEMJegy8uE7eIROCuLsqh5r44fVro9nKFg==",
+      "peer": true
+    },
     "rechoir": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -7558,11 +8611,16 @@
         }
       }
     },
+    "reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "peer": true
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "resolve": {
       "version": "1.20.0",
@@ -7615,13 +8673,12 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "sass": {
-      "version": "1.32.11",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.11.tgz",
-      "integrity": "sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw==",
+      "version": "1.32.13",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
+      "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -7640,8 +8697,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "schema-utils": {
       "version": "2.7.1",
@@ -7669,6 +8725,16 @@
         "randombytes": "^2.1.0"
       }
     },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "peer": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -7731,6 +8797,12 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
+    "snap-db": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/snap-db/-/snap-db-1.1.6.tgz",
+      "integrity": "sha512-KxsO5RnY70J48f6poy0qVm2WS8ZbqG0PUVP2fjd7dvlaCMZ/DxtDv5fhhIVwkP2lOmNQ9QsTFfDuCA7N+TF3qg==",
+      "peer": true
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -7798,7 +8870,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -7809,7 +8880,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.0"
       }
@@ -7821,12 +8891,12 @@
       "dev": true
     },
     "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "devOptional": true,
       "requires": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "tapable": {
@@ -7836,9 +8906,9 @@
       "dev": true
     },
     "terser": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
-      "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
+      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -7891,7 +8961,6 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "dev": true,
       "requires": {
         "any-promise": "^1.0.0"
       }
@@ -7900,7 +8969,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-      "dev": true,
       "requires": {
         "thenify": ">= 3.1.0 < 4"
       }
@@ -7915,7 +8983,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -7945,6 +9013,46 @@
         "semver": "^7.3.4"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -7963,6 +9071,15 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -7985,15 +9102,22 @@
       }
     },
     "tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "peer": true
     },
     "typescript": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
-      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
-      "dev": true
+      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="
+    },
+    "typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "optional": true,
+      "peer": true
     },
     "universalify": {
       "version": "2.0.0",
@@ -8025,8 +9149,7 @@
     "vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
-      "dev": true
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
@@ -8110,7 +9233,8 @@
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+      "requires": {}
     },
     "watchpack": {
       "version": "2.1.1",
@@ -8154,9 +9278,9 @@
       },
       "dependencies": {
         "enhanced-resolve": {
-          "version": "5.8.0",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz",
-          "integrity": "sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==",
+          "version": "5.8.2",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
+          "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.4",
@@ -8199,11 +9323,60 @@
         "ws": "^7.3.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
         "commander": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
           "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -8300,11 +9473,33 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        }
       }
     },
     "wrappy": {
@@ -8316,7 +9511,26 @@
       "version": "7.4.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
       "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
+    },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "peer": true,
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "dependencies": {
+        "xmlbuilder": {
+          "version": "11.0.1",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+          "peer": true
+        }
+      }
     },
     "xmlbuilder": {
       "version": "9.0.7",
@@ -8331,8 +9545,7 @@
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yallist": {
       "version": "2.1.2",
@@ -8346,11 +9559,63 @@
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
+    "yargonaut": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
+      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
+      "peer": true,
+      "requires": {
+        "chalk": "^1.1.1",
+        "figlet": "^1.1.1",
+        "parent-require": "^1.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "peer": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "peer": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "peer": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "peer": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "peer": true
+        }
+      }
+    },
     "yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -8364,8 +9629,7 @@
     "yargs-parser": {
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-      "dev": true
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
     },
     "yn": {
       "version": "3.1.1",
diff --git a/package.json b/package.json
index f76cc892..c5fe4d58 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "enrecipes",
   "main": "./app/main.ts",
-  "version": "1.0.0",
-  "description": "A native application built with NativeScript-Vue",
+  "version": "2.0.0",
+  "description": "EnRecipes is an open source, privacy-friendly digital cookbook that lets you create, manage and share your recipes.",
   "homepage": "https://enrecipes.vercel.app/",
   "bugs": {
     "url": "https://github.com/vishnuraghavb/EnRecipes/issues"
@@ -18,23 +18,24 @@
   },
   "private": "true",
   "dependencies": {
+    "@akylas/nativescript-sqlite": "^3.3.12",
     "@nativescript-community/ui-collectionview": "^4.0.29",
-    "@nativescript/core": "~8.0.1",
+    "@nativescript/core": "^8.0.5",
+    "@nativescript/local-notifications": "^5.0.3",
     "@nativescript/localize": "^5.0.4",
     "@triniwiz/nativescript-accelerometer": "^4.0.3",
-    "@triniwiz/nativescript-couchbase": "^1.2.2",
     "nativescript-imagecropper": "^4.0.1",
     "nativescript-intl": "^4.0.2",
-    "nativescript-vue": "~2.9.0",
+    "nativescript-vue": "^2.9.0",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
     "@nativescript/android": "8.0.0",
-    "@nativescript/types-android": "^8.0.0",
+    "@nativescript/types": "^8.0.1",
     "@nativescript/webpack": "beta",
-    "@types/node": "^14.14.37",
+    "@types/node": "^15.3.0",
     "nativescript-vue-template-compiler": "~2.9.0",
-    "sass": "^1.32.8",
+    "sass": "^1.32.13",
     "typescript": "^4.2.4",
     "vue": "^2.6.12"
   }
diff --git a/types/references.d.ts b/types/references.d.ts
index d5b01651..dedd7934 100644
--- a/types/references.d.ts
+++ b/types/references.d.ts
@@ -1 +1 @@
-/// <reference path="../node_modules/@nativescript/types-android/index.d.ts" />
+/// <reference path="../node_modules/@nativescript/types/index.d.ts" />

From dbd08f2eb369b97844377bb3a17fccf8348824c1 Mon Sep 17 00:00:00 2001
From: vishnuraghavb <design@vishnuraghav.com>
Date: Tue, 25 May 2021 20:02:53 +0530
Subject: [PATCH 2/4] implementing foreground service

---
 app/ForegroundService.js                      |   51 +
 app/components/CookingTimer.vue               |   97 +-
 app/components/EditRecipe.vue                 |   57 +-
 app/components/EnRecipes.vue                  |   28 +-
 app/components/GroceryList.vue                |    5 +-
 app/components/MealPlanner.vue                |   33 +-
 app/components/Settings.vue                   |  106 -
 app/components/Settings/CTSettings.vue        |  139 -
 app/components/Settings/MPSettings.vue        |   75 -
 app/components/Settings/Options.vue           |  109 -
 app/components/ViewRecipe.vue                 |   28 +-
 .../ActionDialog.vue => modals/Action.vue}    |    4 +-
 .../ActionWithSearch.vue}                     |    0
 .../ConfirmDialog.vue => modals/Confirm.vue}  |    0
 .../{modal/Filters.vue => modals/Filter.vue}  |    0
 .../PromptDialog.vue => modals/Prompt.vue}    |    0
 .../TimePickerHM.vue}                         |    0
 .../TimePickerHMS.vue}                        |    0
 .../{Settings => settings}/About.vue          |   11 +-
 app/components/settings/AppSettings.vue       |   82 +
 app/components/settings/CTSettings.vue        |  134 +
 .../{Settings => settings}/Database.vue       |   70 +-
 .../{Settings => settings}/Interface.vue      |   56 +-
 app/components/settings/MPSettings.vue        |   45 +
 app/components/settings/Options.vue           |   69 +
 .../{Settings => settings}/Reset.vue          |   74 +-
 app/components/sub/OptionsList.vue            |   62 +
 app/components/sub/SnackBar.vue               |   23 +
 .../{SingleTimer.vue => sub/Timer.vue}        |    6 +-
 app/components/sub/Toast.vue                  |   20 +
 app/i18n/en-GB.default.json                   |    3 +-
 app/main.ts                                   |   24 +-
 .../Android/src/main/AndroidManifest.xml      |   10 +-
 .../src/main/res/values-ar/strings.xml        |    2 +
 .../src/main/res/values-ca/strings.xml        |    4 +-
 .../src/main/res/values-da/strings.xml        |    2 +
 .../src/main/res/values-de/strings.xml        |    2 +
 .../src/main/res/values-en-rIN/strings.xml    |    2 +
 .../src/main/res/values-en-rUS/strings.xml    |    2 +
 .../src/main/res/values-es-rAR/strings.xml    |    4 +-
 .../src/main/res/values-es/strings.xml        |    2 +
 .../src/main/res/values-fi/strings.xml        |    4 +-
 .../src/main/res/values-fr-rBE/strings.xml    |    2 +
 .../src/main/res/values-fr-rCA/strings.xml    |    2 +
 .../src/main/res/values-fr-rCH/strings.xml    |    2 +
 .../src/main/res/values-fr/strings.xml        |    2 +
 .../src/main/res/values-hi/strings.xml        |    2 +
 .../src/main/res/values-id/strings.xml        |    2 +
 .../src/main/res/values-it/strings.xml        |    2 +
 .../src/main/res/values-ja/strings.xml        |    4 +-
 .../src/main/res/values-kn/strings.xml        |    4 +-
 .../src/main/res/values-ml/strings.xml        |    4 +-
 .../src/main/res/values-nb-rNO/strings.xml    |    4 +-
 .../src/main/res/values-nl/strings.xml        |    2 +
 .../src/main/res/values-pt-rBR/strings.xml    |    2 +
 .../src/main/res/values-pt/strings.xml        |    2 +
 .../src/main/res/values-ru/strings.xml        |    2 +
 .../src/main/res/values-ta/strings.xml        |    4 +-
 .../src/main/res/values-te/strings.xml        |    4 +-
 .../Android/src/main/res/values/strings.xml   |    4 +-
 app/shared/{mixins.js => mixins.ts}           |    2 +
 app/shared/{utils.js => utils.ts}             |  107 +-
 app/store.ts                                  |    7 +-
 package-lock.json                             | 2253 ++++-------------
 tsconfig.json                                 |    2 +-
 webpack.config.js                             |   14 +
 66 files changed, 1391 insertions(+), 2489 deletions(-)
 create mode 100644 app/ForegroundService.js
 delete mode 100644 app/components/Settings.vue
 delete mode 100644 app/components/Settings/CTSettings.vue
 delete mode 100644 app/components/Settings/MPSettings.vue
 delete mode 100644 app/components/Settings/Options.vue
 rename app/components/{modal/ActionDialog.vue => modals/Action.vue} (97%)
 rename app/components/{modal/ActionDialogWithSearch.vue => modals/ActionWithSearch.vue} (100%)
 rename app/components/{modal/ConfirmDialog.vue => modals/Confirm.vue} (100%)
 rename app/components/{modal/Filters.vue => modals/Filter.vue} (100%)
 rename app/components/{modal/PromptDialog.vue => modals/Prompt.vue} (100%)
 rename app/components/{modal/TimePicker.vue => modals/TimePickerHM.vue} (100%)
 rename app/components/{modal/CookingTimePicker.vue => modals/TimePickerHMS.vue} (100%)
 rename app/components/{Settings => settings}/About.vue (92%)
 create mode 100644 app/components/settings/AppSettings.vue
 create mode 100644 app/components/settings/CTSettings.vue
 rename app/components/{Settings => settings}/Database.vue (87%)
 rename app/components/{Settings => settings}/Interface.vue (71%)
 create mode 100644 app/components/settings/MPSettings.vue
 create mode 100644 app/components/settings/Options.vue
 rename app/components/{Settings => settings}/Reset.vue (54%)
 create mode 100644 app/components/sub/OptionsList.vue
 create mode 100644 app/components/sub/SnackBar.vue
 rename app/components/{SingleTimer.vue => sub/Timer.vue} (96%)
 create mode 100644 app/components/sub/Toast.vue
 rename app/shared/{mixins.js => mixins.ts} (96%)
 rename app/shared/{utils.js => utils.ts} (86%)

diff --git a/app/ForegroundService.js b/app/ForegroundService.js
new file mode 100644
index 00000000..dad1177b
--- /dev/null
+++ b/app/ForegroundService.js
@@ -0,0 +1,51 @@
+var ForegroundService = /** @class */ (function(_super) {
+  __extends(ForegroundService, _super)
+  function ForegroundService() {
+    return (_super !== null && _super.apply(this, arguments)) || this
+  }
+  ForegroundService.prototype.onStartCommand = function(
+    intent,
+    flags,
+    startId
+  ) {
+    console.log('onStartCommand')
+    _super.prototype.onStartCommand.call(this, intent, flags, startId)
+    return android.app.Service.START_STICKY
+  }
+  ForegroundService.prototype.onCreate = function() {
+    console.log('onCreate')
+    _super.prototype.onCreate.call(this)
+    this.startForeground(1, this.getNotification())
+  }
+  ForegroundService.prototype.onBind = function(intent) {
+    return _super.prototype.onBind.call(this, intent)
+  }
+  ForegroundService.prototype.onUnbind = function(intent) {
+    return _super.prototype.onUnbind.call(this, intent)
+  }
+  ForegroundService.prototype.onDestroy = function() {
+    console.log('onDestroy')
+    this.stopForeground(true)
+  }
+  ForegroundService.prototype.getNotification = function() {
+    var channel = new android.app.NotificationChannel(
+      'channel_01',
+      'ForegroundService Channel',
+      android.app.NotificationManager.IMPORTANCE_DEFAULT
+    )
+    var notificationManager = this.getSystemService(
+      android.content.Context.NOTIFICATION_SERVICE
+    )
+    notificationManager.createNotificationChannel(channel)
+    var builder = new android.app.Notification.Builder(
+      this.getApplicationContext(),
+      'channel_01'
+    )
+    return builder.build()
+  }
+  ForegroundService = __decorate(
+    [JavaProxy('com.tns.ForegroundService')],
+    ForegroundService
+  )
+  return ForegroundService
+})(android.app.Service)
diff --git a/app/components/CookingTimer.vue b/app/components/CookingTimer.vue
index af2d1054..c7367ff3 100644
--- a/app/components/CookingTimer.vue
+++ b/app/components/CookingTimer.vue
@@ -16,7 +16,7 @@
               @tap="$navigateTo(CTSettings)"
             />
           </GridLayout>
-          <SingleTimer
+          <Timer
             v-for="(timer, i) in activeTimers"
             :key="timer.id"
             ref="singleTimer"
@@ -41,22 +41,19 @@
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
         <Button class="ico fab" :text="icon.plus" @tap="addTimer" col="2" />
       </GridLayout>
-      <GridLayout
-        row="1"
-        class="appbar snackBar"
-        :hidden="!showUndo"
-        columns="auto, *, auto"
-        @swipe="hideUndoBar"
-      >
-        <Button :text="countdown" class="ico countdown tb" />
-        <Label class="title" col="1" :text="snackMsg | L" />
-        <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
-      </GridLayout>
+      <SnackBar
+        :hidden="!showUndo || toast"
+        :count="countdown"
+        :msg="snackMsg"
+        :undo="undoDel"
+        :action="hideBar"
+      />
+      <Toast :toast="toast" :action="hideBar" />
     </GridLayout>
   </Page>
 </template>
 
-<script>
+<script lang="ts">
 import { localize } from "@nativescript/localize";
 import {
   Observable,
@@ -64,20 +61,25 @@ import {
   Application,
   ApplicationSettings,
   AndroidApplication,
+  Utils,
 } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
-import CTSettings from "./Settings/CTSettings.vue";
-import ActionDialog from "./modal/ActionDialog.vue";
-import CookingTimePicker from "./modal/CookingTimePicker.vue";
-import CookingTimer from "./CookingTimer.vue";
-import SingleTimer from "./SingleTimer.vue";
-import * as utils from "~/shared/utils";
 
+import Action from "./modals/Action.vue";
+import CookingTimer from "./CookingTimer.vue";
+import CTSettings from "./settings/CTSettings.vue";
+import TimePickerHMS from "./modals/TimePickerHMS.vue";
+import Timer from "./sub/Timer.vue";
+import Toast from "./sub/Toast.vue";
+import SnackBar from "./sub/SnackBar.vue";
+
+import * as utils from "~/shared/utils";
+// import { fgs } from "~/foreground.android";
 import { EventBus } from "~/main";
 let undoTimer;
 
 export default {
-  components: { SingleTimer },
+  components: { Timer, Toast, SnackBar },
   props: ["recipeID"],
   data() {
     return {
@@ -88,6 +90,7 @@ export default {
       showUndo: false,
       undo: false,
       CTSettings: CTSettings,
+      toast: null,
     };
   },
   computed: {
@@ -111,9 +114,8 @@ export default {
       "addTimerPreset",
       "updateActiveTimer",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.setComponent("CookingTimer");
     },
     onAppBarLoad({ object }) {
@@ -170,17 +172,17 @@ export default {
       let pausedCount = this.activeTimers.filter((e) => e.isPaused).length;
       let ongoingCount = activeCount - pausedCount;
       console.log("notifying");
-      utils.TimerNotification.show({
+      utils.TimerNotif.show({
         bID: "bringToFront",
-        cID: "CookingTimer",
-        cName: "Cooking Timer",
+        cID: "cti",
+        cName: "Cooking Timer info",
         description: `${ongoingCount} ongoing, ${pausedCount} paused`,
         nID: 999,
-        priority: 0,
+        priority: -2,
         sound: null,
         title: localize("timer"),
       });
-      if (activeCount <= 0) utils.TimerNotification.clear(999);
+      if (activeCount <= 0) utils.TimerNotif.clear(999);
     },
     intentListener({ intent, android }) {
       let ct = "CookingTimer";
@@ -191,10 +193,11 @@ export default {
         let openTimer = setInterval(() => {
           if (comp == ct) clearInterval(openTimer);
           else {
-            this.$navigateTo(CookingTimer);
+            if (comp == "CTSettings") this.$navigateBack();
+            else this.$navigateTo(CookingTimer);
             comp = ct;
           }
-          // Application.off(Application.launchEvent, this.intentListener);
+          Application.off(Application.launchEvent, this.intentListener);
           Application.android.off(
             AndroidApplication.activityNewIntentEvent,
             this.intentListener
@@ -210,11 +213,11 @@ export default {
       let title = timer.label;
       let time = this.formattedTime(timer.time);
       let bID = "timer" + timer.id;
-      utils.TimerNotification.show({
+      utils.TimerNotif.show({
         actions: true,
         bID,
-        cID: "FiringTimers",
-        cName: "Firing timers",
+        cID: "cta",
+        cName: "Cooking Timer alerts",
         description: time,
         nID: timer.id,
         priority: 1,
@@ -228,10 +231,18 @@ export default {
         EventBus.$emit(bID, action);
       });
     },
+    startForegroundService() {
+      const ctx = Utils.ad.getApplicationContext();
+      const intent = new android.content.Intent();
+      intent.setClassName(ctx, "com.tns.ForegroundService");
+      ctx.startService(intent);
+    },
 
     // DATA HANDLERS
     addTimer() {
-      this.$showModal(CookingTimePicker, {
+      // fgs.class
+      this.startForegroundService();
+      this.$showModal(TimePickerHMS, {
         props: {
           title: "ntmr",
           label: `${localize("tmr", this.activeTimers.length + 1)}`,
@@ -244,7 +255,7 @@ export default {
             let list = this.timerPresets.map(
               (e) => `${e.label} - ${this.formattedTime(e.time)}`
             );
-            this.$showModal(ActionDialog, {
+            this.$showModal(Action, {
               props: {
                 title: "tmrPrsts",
                 list,
@@ -285,7 +296,7 @@ export default {
     removeTimer(id, index, noUndo) {
       let temp = this.activeTimers[index];
       this.removeActiveTimer(index);
-      utils.TimerNotification.clear(id);
+      utils.TimerNotif.clear(id);
       if (!noUndo) {
         this.showUndoBar("tmrClr")
           .then(() => {
@@ -306,6 +317,7 @@ export default {
       timer.recipeID = timer.timerInterval = null;
       timer.preset = 1;
       this.addTimerPreset(timer);
+      this.showToast("aTPrst");
     },
     togglePause(timer, bool) {
       if (typeof bool === "boolean") timer.isPaused = bool;
@@ -313,6 +325,12 @@ export default {
       this.updateActiveTimer(timer);
       this.notifyTimers();
     },
+    showToast(data) {
+      this.toast = localize(data);
+      utils.timer(5, (val) => {
+        if (!val) this.toast = val;
+      });
+    },
     showUndoBar(message) {
       return new Promise((resolve, reject) => {
         clearTimeout(undoTimer);
@@ -335,7 +353,8 @@ export default {
         }, 100);
       });
     },
-    hideUndoBar({ object }) {
+    hideBar({ object }) {
+      this.appbar.translateY = 64;
       object
         .animate({
           opacity: 0,
@@ -345,7 +364,7 @@ export default {
         })
         .then(() => {
           this.showUndo = false;
-          this.appbar.translateY = 64;
+          this.toast = null;
           this.appbar.animate({
             translate: { x: 0, y: 0 },
             duration: 250,
@@ -366,7 +385,7 @@ export default {
     },
   },
   created() {
-    // Application.on(Application.launchEvent, this.intentListener);
+    Application.on(Application.launchEvent, this.intentListener);
     Application.android.on(
       AndroidApplication.activityNewIntentEvent,
       this.intentListener
diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue
index c6512332..516b4c76 100644
--- a/app/components/EditRecipe.vue
+++ b/app/components/EditRecipe.vue
@@ -267,7 +267,15 @@
         />
         <ActivityIndicator col="2" v-if="saving" :busy="saving" />
       </GridLayout>
-      <GridLayout
+      <SnackBar
+        :hidden="!showUndo"
+        colSpan="2"
+        :count="countdown"
+        :msg="snackMsg"
+        :undo="undoDel"
+        :action="hideUndoBar"
+      />
+      <!-- <GridLayout
         row="1"
         class="appbar snackBar"
         :hidden="!showUndo"
@@ -278,7 +286,7 @@
         <Button :text="countdown" class="ico countdown tb" />
         <Label class="title" col="1" :text="snackMsg | L" />
         <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
-      </GridLayout>
+      </GridLayout> -->
     </GridLayout>
   </Page>
 </template>
@@ -300,14 +308,18 @@ import {
 import { localize } from "@nativescript/localize";
 import { ImageCropper } from "nativescript-imagecropper";
 import { mapState, mapActions } from "vuex";
-import ActionDialog from "./modal/ActionDialog.vue";
-import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
-import ConfirmDialog from "./modal/ConfirmDialog.vue";
-import PromptDialog from "./modal/PromptDialog.vue";
-import TimePicker from "./modal/TimePicker.vue";
+import Action from "./modals/Action";
+import ActionWithSearch from "./modals/ActionWithSearch";
+import Confirm from "./modals/Confirm";
+import Prompt from "./modals/Prompt";
+import TimePickerHM from "./modals/TimePickerHM";
 import * as utils from "~/shared/utils";
+import SnackBar from "./sub/SnackBar";
 let undoTimer;
 export default {
+  components: {
+    SnackBar,
+  },
   props: [
     "recipeID",
     "filterFavourites",
@@ -384,9 +396,8 @@ export default {
       "addListItemAction",
       "unSyncCombinationsAction",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.hijackBackEvent();
     },
     onPageUnload() {
@@ -424,7 +435,7 @@ export default {
       this.clearEmptyFields(true);
       if (this.recipe.image) {
         this.modalOpen = true;
-        this.$showModal(ActionDialog, {
+        this.$showModal(Action, {
           props: {
             title: "recPic",
             list: ["aap", "rp"],
@@ -488,7 +499,7 @@ export default {
     // DATA LIST
     showCuisine(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "cui",
           list: this.cuisines,
@@ -496,7 +507,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "newCui",
               action: "aBtn",
@@ -526,7 +537,7 @@ export default {
     },
     showCategories(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "cat",
           list: this.categories,
@@ -534,7 +545,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "nwCat",
               action: "aBtn",
@@ -564,7 +575,7 @@ export default {
     },
     showYieldUnits(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "yieldU",
           list: this.yieldUnits,
@@ -572,7 +583,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "nwYiU",
               action: "aBtn",
@@ -602,7 +613,7 @@ export default {
     },
     showDifficultyLevel(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "Difficulty level",
           list: this.difficultyLevels,
@@ -620,7 +631,7 @@ export default {
     },
     showUnits(e, focus, index) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "Unit",
           list: this.units,
@@ -628,7 +639,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "newUnit",
               action: "aBtn",
@@ -662,7 +673,7 @@ export default {
       let filteredRecipes = this.recipes.filter(
         (e) => !existingCombinations.includes(e.id)
       );
-      this.$showModal(ActionDialogWithSearch, {
+      this.$showModal(ActionWithSearch, {
         props: {
           title: "selRec",
           recipes: filteredRecipes,
@@ -923,7 +934,7 @@ export default {
       let t = this.recipe[time].split(":");
       let hr = t[0];
       let min = t[1];
-      this.$showModal(TimePicker, {
+      this.$showModal(TimePickerHM, {
         props: {
           title: `${time == "prepTime" ? "prepT" : "cookT"}`,
           action: "SET",
@@ -975,7 +986,7 @@ export default {
     navigateBack() {
       if (this.hasChanges) {
         this.modalOpen = true;
-        this.$showModal(ConfirmDialog, {
+        this.$showModal(Confirm, {
           props: {
             title: "unsaved",
             description: localize("disc"),
diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue
index 795e85e6..780248a0 100644
--- a/app/components/EnRecipes.vue
+++ b/app/components/EnRecipes.vue
@@ -18,7 +18,7 @@
                 col="1"
                 class="ico"
                 :text="icon.cog"
-                @tap="navigateTo(Settings, 'Settings', true)"
+                @tap="navigateTo(AppSettings, 'Settings', true)"
               />
             </GridLayout>
           </v-template>
@@ -432,10 +432,10 @@ import EditRecipe from "./EditRecipe";
 import MealPlanner from "./MealPlanner";
 import CookingTimer from "./CookingTimer";
 import GroceryList from "./GroceryList";
-import Settings from "./Settings";
-import ActionDialog from "./modal/ActionDialog.vue";
-import ConfirmDialog from "./modal/ConfirmDialog.vue";
-import Filters from "./modal/Filters.vue";
+import AppSettings from "./settings/AppSettings";
+import Action from "./modals/Action";
+import Confirm from "./modals/Confirm";
+import Filters from "./modals/Filter";
 import * as utils from "~/shared/utils";
 let lastTime = 0;
 let lastShake = 0;
@@ -456,7 +456,7 @@ export default {
       scrollPos: 1,
       filterFavourites: false,
       filterTrylater: false,
-      Settings: Settings,
+      AppSettings: AppSettings,
       MealPlanner: MealPlanner,
       CookingTimer: CookingTimer,
       GroceryList: GroceryList,
@@ -603,9 +603,8 @@ export default {
             : View.SYSTEM_UI_FLAG_DARK_STATUS_BAR
         );
     },
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.filterFavourites
         ? this.setComponent("favourites")
         : this.filterTrylater
@@ -685,7 +684,7 @@ export default {
     openSort() {
       this.showTools = false;
       this.releaseBackEvent();
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "srt",
           list: [
@@ -748,7 +747,7 @@ export default {
               this.recipes.findIndex((e) => e.id === this.selection[0])
             ].title
           }"`;
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: localize("conf"),
           description: `${localize(
@@ -1080,7 +1079,12 @@ export default {
     if (!this.recipes.length) this.initRecipes();
     this.initMealPlans();
     this.initListItems();
-    if (!this.timerSound.title) this.setTimerSound(utils.getTones()[0]);
+    if (!this.timerSound.title) {
+      let hasTimerSound = ApplicationSettings.getString("timerSound", 0);
+      this.setTimerSound(
+        hasTimerSound ? JSON.parse(hasTimerSound) : utils.getTones().defaultTone
+      );
+    }
   },
 };
 </script>
diff --git a/app/components/GroceryList.vue b/app/components/GroceryList.vue
index 1ca66b4e..83dab81f 100644
--- a/app/components/GroceryList.vue
+++ b/app/components/GroceryList.vue
@@ -28,9 +28,8 @@ export default {
   },
   methods: {
     ...mapActions(["setComponent"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.setComponent("GroceryList");
     },
     // HELPERS
diff --git a/app/components/MealPlanner.vue b/app/components/MealPlanner.vue
index 1a4d2aa5..fc79faab 100644
--- a/app/components/MealPlanner.vue
+++ b/app/components/MealPlanner.vue
@@ -120,17 +120,13 @@
           col="3"
         />
       </GridLayout>
-      <GridLayout
-        row="1"
-        class="appbar snackBar"
+      <SnackBar
         :hidden="!showUndo"
-        columns="auto, *, auto"
-        @swipe="hideUndoBar"
-      >
-        <Button :text="countdown" class="ico countdown tb" />
-        <Label class="title" col="1" :text="snackMsg | L" />
-        <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
-      </GridLayout>
+        :count="countdown"
+        :msg="snackMsg"
+        :undo="undoDel"
+        :action="hideUndoBar"
+      />
     </GridLayout>
   </Page>
 </template>
@@ -138,12 +134,16 @@
 <script>
 import { Observable, CoreTypes } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
-import ViewRecipe from "./ViewRecipe.vue";
-import MPSettings from "./Settings/MPSettings.vue";
-import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
+import ViewRecipe from "./ViewRecipe";
+import MPSettings from "./settings/MPSettings";
+import ActionWithSearch from "./modals/ActionWithSearch";
+import SnackBar from "./sub/SnackBar";
 let undoTimer;
 
 export default {
+  components: {
+    SnackBar,
+  },
   data() {
     return {
       mealTimes: ["breakfast", "lunch", "dinner", "snacks"],
@@ -227,9 +227,8 @@ export default {
       "addMealPlanAction",
       "deleteMealPlanAction",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.setComponent("MealPlanner");
       if (!this.today || this.today === new Date().getDate()) this.goToToday();
     },
@@ -342,7 +341,7 @@ export default {
       let filteredRecipes = this.recipes.filter((e) =>
         this.getRecipes[type] ? !this.getRecipes[type].includes(e.id) : true
       );
-      this.$showModal(ActionDialogWithSearch, {
+      this.$showModal(ActionWithSearch, {
         props: {
           title: "selRec",
           recipes: filteredRecipes,
diff --git a/app/components/Settings.vue b/app/components/Settings.vue
deleted file mode 100644
index ce61445d..00000000
--- a/app/components/Settings.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'Settings' | L" />
-        </v-template>
-        <v-template if="$index == 6">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.view)"
-          >
-            <Label
-              verticalAlignment="center"
-              class="ico"
-              :text="icon[item.icon]"
-            />
-            <Label verticalAlignment="center" col="1" :text="item.title | L" />
-          </GridLayout>
-        </v-template>
-      </ListView>
-      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-import Interface from "./Settings/Interface.vue";
-import Options from "./Settings/Options.vue";
-import Database from "./Settings/Database.vue";
-import Reset from "./Settings/Reset.vue";
-import About from "./Settings/About.vue";
-export default {
-  data() {
-    return {
-      items: [
-        {},
-        {
-          icon: "interface",
-          title: "intf",
-          view: Interface,
-        },
-        {
-          icon: "opts",
-          title: "opts",
-          view: Options,
-        },
-        {
-          icon: "db",
-          title: "db",
-          view: Database,
-        },
-        {
-          icon: "reset",
-          title: "rest",
-          view: Reset,
-        },
-        {
-          icon: "info",
-          title: "About",
-          view: About,
-        },
-        {},
-      ],
-    };
-  },
-  computed: {
-    ...mapState(["icon"]),
-  },
-  methods: {
-    ...mapActions(["setComponent"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-      this.setComponent("Settings");
-    },
-    // HELPERS
-    navigateTo(view) {
-      this.$navigateTo(view, {
-        transition: {
-          name: "slide",
-          duration: 200,
-          curve: "easeOut",
-        },
-      });
-    },
-    touch({ object, action }, view) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") this.navigateTo(view);
-    },
-  },
-};
-</script>
diff --git a/app/components/Settings/CTSettings.vue b/app/components/Settings/CTSettings.vue
deleted file mode 100644
index 0a78eb33..00000000
--- a/app/components/Settings/CTSettings.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'Settings' | L" />
-        </v-template>
-        <v-template if="item.type == 'switch'">
-          <GridLayout columns="auto, *, auto" class="option">
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label
-                v-if="item.subTitle"
-                :text="item.subTitle | L"
-                class="sub"
-              />
-            </StackLayout>
-            <Switch
-              :color="item.checked ? '#ff5200' : '#adb5bd'"
-              col="2"
-              :checked="item.checked"
-              @checkedChange="item.action"
-            />
-          </GridLayout>
-        </v-template>
-        <v-template if="item.type == 'list'">
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.action)"
-          >
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1">
-              <Label :text="item.title | L" class="info" />
-              <Label :text="item.subTitle" class="sub" />
-            </StackLayout>
-          </GridLayout>
-        </v-template>
-        <v-template>
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-      </ListView>
-      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable, Device } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-import { localize } from "@nativescript/localize";
-import ActionDialog from "../modal/ActionDialog.vue";
-import * as utils from "~/shared/utils";
-
-export default {
-  computed: {
-    ...mapState(["icon", "timerDelay", "timerSound", "timerVibrate"]),
-    items() {
-      return [
-        {},
-        {
-          type: "list",
-          icon: "delay",
-          title: "dlyDur",
-          subTitle: this.timerDelay,
-          action: this.showDelayList,
-        },
-        {
-          type: "list",
-          icon: "sound",
-          title: "tmrSnd",
-          subTitle: this.timerSound.title,
-          action: this.showSoundsList,
-        },
-        {
-          type: "switch",
-          icon: "vibrate",
-          title: "tmrvbrt",
-          checked: this.timerVibrate,
-          action: this.toggleTimerVibrate,
-        },
-        {},
-      ];
-    },
-  },
-  methods: {
-    ...mapActions(["setTimerDelay", "setTimerSound", "setTimerVibrate"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-    },
-    toggleTimerVibrate({ object }) {
-      this.setTimerVibrate(object.checked);
-    },
-    showDelayList() {
-      let list = [
-        ...Array.from(Array(4), (_, x) => x + 1),
-        ...Array.from(Array(6), (_, x) => (x + 1) * 5),
-      ].map(
-        (e, i) => `${e} ${i == 0 ? localize("minute") : localize("minutes")}`
-      );
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "dlyDur",
-          list,
-        },
-      }).then((dur) => dur && this.setTimerDelay(dur));
-    },
-    showSoundsList() {
-      let tones = utils.getTones();
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "tmrSnd",
-          list: tones.map((e) => e.title),
-        },
-      }).then(
-        (tone) =>
-          tone &&
-          tone !== this.timerSound.title &&
-          this.setTimerSound(tones.filter((e) => e.title === tone)[0])
-      );
-    },
-
-    // HELPERS
-    touch({ object, action }, method) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") method();
-    },
-  },
-};
-</script>
diff --git a/app/components/Settings/MPSettings.vue b/app/components/Settings/MPSettings.vue
deleted file mode 100644
index 44f39648..00000000
--- a/app/components/Settings/MPSettings.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'Settings' | L" />
-        </v-template>
-        <v-template if="item.type == 'switch'">
-          <GridLayout columns="auto, *, auto" class="option">
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label
-                v-if="item.subTitle"
-                :text="item.subTitle | L"
-                class="sub"
-              />
-            </StackLayout>
-            <Switch
-              :color="item.checked ? '#ff5200' : '#adb5bd'"
-              col="2"
-              :checked="item.checked"
-              @checkedChange="item.action"
-            />
-          </GridLayout>
-        </v-template>
-        <v-template>
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-      </ListView>
-      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-
-export default {
-  computed: {
-    ...mapState(["icon", "mondayFirst"]),
-    items() {
-      return [
-        {},
-        {
-          type: "switch",
-          icon: "week",
-          title: "swm",
-          checked: this.mondayFirst,
-          action: this.toggleFirstDay,
-        },
-        {},
-      ];
-    },
-  },
-  methods: {
-    ...mapActions(["setFirstDay"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-    },
-    toggleFirstDay({ object }) {
-      this.setFirstDay(object.checked);
-    },
-  },
-};
-</script>
diff --git a/app/components/Settings/Options.vue b/app/components/Settings/Options.vue
deleted file mode 100644
index 242540bb..00000000
--- a/app/components/Settings/Options.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'opts' | L" />
-        </v-template>
-        <v-template if="item.type == 'switch'">
-          <GridLayout columns="auto, *, auto" class="option">
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label
-                v-if="item.subTitle"
-                :text="item.subTitle | L"
-                class="sub"
-              />
-            </StackLayout>
-            <Switch
-              :color="item.checked ? '#ff5200' : '#adb5bd'"
-              col="2"
-              :checked="item.checked"
-              @checkedChange="item.action"
-            />
-          </GridLayout>
-        </v-template>
-        <v-template>
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-      </ListView>
-      <GridLayout
-        v-show="!toast"
-        row="1"
-        class="appbar"
-        rows="*"
-        columns="auto, *"
-      >
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        colSpan="2"
-        class="appbar snackBar"
-        columns="*"
-        @tap="toast = null"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-import { localize } from "@nativescript/localize";
-import * as utils from "~/shared/utils";
-
-export default {
-  data() {
-    return {
-      toast: null,
-    };
-  },
-  computed: {
-    ...mapState(["icon", "shakeEnabled"]),
-    items() {
-      return [
-        {},
-        {
-          type: "switch",
-          icon: "shuf",
-          title: "sVw",
-          subTitle: "sVwInfo",
-          checked: this.shakeEnabled,
-          action: this.toggleShake,
-        },
-        {},
-      ];
-    },
-  },
-  methods: {
-    ...mapActions(["setShake"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-    },
-    // SHAKE VIEW RANDOM RECIPE
-    toggleShake({ object }) {
-      let checked = object.checked;
-      if (checked && !utils.hasAccelerometer()) {
-        object.checked = false;
-        this.toast = localize("noAccSensor");
-        utils.timer(5, (val) => {
-          if (!val) this.toast = val;
-        });
-      } else this.setShake(checked);
-    },
-  },
-};
-</script>
diff --git a/app/components/ViewRecipe.vue b/app/components/ViewRecipe.vue
index 39cdbdb5..5742d458 100644
--- a/app/components/ViewRecipe.vue
+++ b/app/components/ViewRecipe.vue
@@ -232,17 +232,7 @@
           @tap="shareHandler"
         />
       </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        class="appbar snackBar"
-        columns="*"
-        @swipe="hideLastTried"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
+      <Toast :toast="toast" :action="hideLastTried" />
       <AbsoluteLayout rowSpan="2">
         <Image
           @tap="({ object }) => (object.cancel = true)"
@@ -269,17 +259,18 @@ import {
   Observable,
   Screen,
   CoreTypes,
-  Color,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 const intl = require("nativescript-intl");
 import { mapActions, mapState } from "vuex";
 import CookingTimer from "./CookingTimer.vue";
 import EditRecipe from "./EditRecipe.vue";
-import ActionDialog from "./modal/ActionDialog.vue";
-import PromptDialog from "./modal/PromptDialog.vue";
+import Action from "./modals/Action.vue";
+import Toast from "./sub/Toast.vue";
+import Prompt from "./modals/Prompt.vue";
 import * as utils from "~/shared/utils";
 export default {
+  components: { Toast },
   props: ["filterTrylater", "recipeID"],
   data() {
     return {
@@ -337,9 +328,8 @@ export default {
       "setRatingAction",
       "toggleCartAction",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.busy = this.photoOpen = false;
       this.setComponent("ViewRecipe");
       if (this.yieldMultiplier == this.recipe.yieldQuantity)
@@ -462,7 +452,7 @@ export default {
       return localize(title) + text;
     },
     changeYield() {
-      this.$showModal(PromptDialog, {
+      this.$showModal(Prompt, {
         props: {
           title: `${localize("req", localize(this.recipe.yieldUnit))}`,
           placeholder: Math.abs(parseFloat(this.yieldMultiplier)),
@@ -694,7 +684,7 @@ export default {
     // SHARE ACTION
     shareHandler() {
       if (this.recipe.image) {
-        this.$showModal(ActionDialog, {
+        this.$showModal(Action, {
           props: {
             title: "shr",
             list: ["rec", "pht"],
diff --git a/app/components/modal/ActionDialog.vue b/app/components/modals/Action.vue
similarity index 97%
rename from app/components/modal/ActionDialog.vue
rename to app/components/modals/Action.vue
index ee69d937..5ec66390 100644
--- a/app/components/modal/ActionDialog.vue
+++ b/app/components/modals/Action.vue
@@ -50,7 +50,7 @@
 import { Screen } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
-import ConfirmDialog from "./ConfirmDialog.vue";
+import Confirm from "./Confirm.vue";
 
 interface IData {
   newList: unknown[];
@@ -92,7 +92,7 @@ export default {
       this.$modal.close(item);
     },
     deletionConfirmation(description: string): void {
-      return this.$showModal(ConfirmDialog, {
+      return this.$showModal(Confirm, {
         props: {
           title: "conf",
           description,
diff --git a/app/components/modal/ActionDialogWithSearch.vue b/app/components/modals/ActionWithSearch.vue
similarity index 100%
rename from app/components/modal/ActionDialogWithSearch.vue
rename to app/components/modals/ActionWithSearch.vue
diff --git a/app/components/modal/ConfirmDialog.vue b/app/components/modals/Confirm.vue
similarity index 100%
rename from app/components/modal/ConfirmDialog.vue
rename to app/components/modals/Confirm.vue
diff --git a/app/components/modal/Filters.vue b/app/components/modals/Filter.vue
similarity index 100%
rename from app/components/modal/Filters.vue
rename to app/components/modals/Filter.vue
diff --git a/app/components/modal/PromptDialog.vue b/app/components/modals/Prompt.vue
similarity index 100%
rename from app/components/modal/PromptDialog.vue
rename to app/components/modals/Prompt.vue
diff --git a/app/components/modal/TimePicker.vue b/app/components/modals/TimePickerHM.vue
similarity index 100%
rename from app/components/modal/TimePicker.vue
rename to app/components/modals/TimePickerHM.vue
diff --git a/app/components/modal/CookingTimePicker.vue b/app/components/modals/TimePickerHMS.vue
similarity index 100%
rename from app/components/modal/CookingTimePicker.vue
rename to app/components/modals/TimePickerHMS.vue
diff --git a/app/components/Settings/About.vue b/app/components/settings/About.vue
similarity index 92%
rename from app/components/Settings/About.vue
rename to app/components/settings/About.vue
index cb25541a..d7cd9afe 100644
--- a/app/components/Settings/About.vue
+++ b/app/components/settings/About.vue
@@ -12,11 +12,7 @@
         </v-template>
         <v-template if="$index == 1">
           <StackLayout class="app-info">
-            <Image
-              class="icon"
-              src="res://logo"
-              stretch="none"
-            />
+            <Image class="icon" src="res://logo" stretch="none" />
             <Label class="name tb tac" :text="'EnRecipes' | L" />
             <Label :text="getVersion" class="version tb tac" />
 
@@ -99,9 +95,8 @@ export default {
     },
   },
   methods: {
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
     },
     // HELPERS
     openURL(url) {
diff --git a/app/components/settings/AppSettings.vue b/app/components/settings/AppSettings.vue
new file mode 100644
index 00000000..1cd499db
--- /dev/null
+++ b/app/components/settings/AppSettings.vue
@@ -0,0 +1,82 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="Settings" :items="items" :action="navigateTo" />
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script lang="ts">
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import Interface from "./Interface.vue";
+import Options from "./Options.vue";
+import Database from "./Database.vue";
+import Reset from "./Reset.vue";
+import About from "./About.vue";
+import OptionsList from "../sub/OptionsList.vue";
+export default {
+  components: { OptionsList },
+  data() {
+    return {
+      items: [
+        {},
+        {
+          type: "list",
+          icon: "interface",
+          title: "intf",
+          data: Interface,
+        },
+        {
+          type: "list",
+          icon: "opts",
+          title: "opts",
+          data: Options,
+        },
+        {
+          type: "list",
+          icon: "db",
+          title: "db",
+          data: Database,
+        },
+        {
+          type: "list",
+          icon: "reset",
+          title: "rest",
+          data: Reset,
+        },
+        {
+          type: "list",
+          icon: "info",
+          title: "About",
+          data: About,
+        },
+        {},
+      ],
+    };
+  },
+  computed: {
+    ...mapState(["icon"]),
+  },
+  methods: {
+    ...mapActions(["setComponent"]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+      this.setComponent("Settings");
+    },
+    // HELPERS
+    navigateTo(view) {
+      this.$navigateTo(view, {
+        transition: {
+          name: "slide",
+          duration: 200,
+          curve: "easeOut",
+        },
+      });
+    },
+  },
+};
+</script>
diff --git a/app/components/settings/CTSettings.vue b/app/components/settings/CTSettings.vue
new file mode 100644
index 00000000..2f94fb4c
--- /dev/null
+++ b/app/components/settings/CTSettings.vue
@@ -0,0 +1,134 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="Settings" :items="items" />
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable, Device, Application, Utils } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import { localize } from "@nativescript/localize";
+import OptionsList from "../sub/OptionsList";
+import Action from "../modals/Action";
+import * as utils from "~/shared/utils";
+
+export default {
+  components: { OptionsList },
+  computed: {
+    ...mapState(["icon", "timerDelay", "timerSound", "timerVibrate"]),
+    items() {
+      let options = [
+        {
+          type: "list",
+          icon: "sound",
+          title: "tmrSnd",
+          subTitle: this.timerSound.title,
+          action: this.showSoundsList,
+        },
+        {
+          type: "switch",
+          icon: "vibrate",
+          title: "tmrvbrt",
+          checked: this.timerVibrate,
+          action: this.toggleTimerVibrate,
+        },
+      ];
+      let openSettings = [
+        {
+          type: "list",
+          icon: "sound",
+          title: "notifSetg",
+          subTitle: null,
+          action: this.openNotificationChannelSettings,
+        },
+      ];
+      let list = this.channelExists() ? openSettings : options;
+      return [
+        {},
+        {
+          type: "list",
+          icon: "delay",
+          title: "dlyDur",
+          subTitle: this.timerDelay,
+          action: this.showDelayList,
+        },
+        ...list,
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions([
+      "setTimerDelay",
+      "setTimerSound",
+      "setTimerVibrate",
+      "setComponent",
+    ]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+      this.setComponent("CTSettings");
+    },
+    showDelayList() {
+      let list = [
+        ...Array.from(Array(4), (_, x) => x + 1),
+        ...Array.from(Array(6), (_, x) => (x + 1) * 5),
+      ].map(
+        (e, i) => `${e} ${i == 0 ? localize("minute") : localize("minutes")}`
+      );
+      this.$showModal(Action, {
+        props: {
+          title: "dlyDur",
+          list,
+        },
+      }).then((dur) => dur && this.setTimerDelay(dur));
+    },
+    showSoundsList() {
+      let getTones = utils.getTones();
+      this.$showModal(Action, {
+        props: {
+          title: "tmrSnd",
+          list: getTones.tones.map((e) => e.title),
+        },
+      }).then(
+        (tone) =>
+          tone &&
+          tone !== this.timerSound.title &&
+          this.setTimerSound(getTones.tones.filter((e) => e.title === tone)[0])
+      );
+    },
+    toggleTimerVibrate() {
+      this.setTimerVibrate(!this.timerVibrate);
+    },
+    openNotificationChannelSettings() {
+      const ctx = Application.android.context;
+      const Settings = android.provider.Settings;
+      const Intent = android.content.Intent;
+      let intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
+      intent.putExtra(
+        Settings.EXTRA_APP_PACKAGE,
+        Application.android.packageName
+      );
+      intent.putExtra(Settings.EXTRA_CHANNEL_ID, "cta");
+      intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
+      ctx.startActivity(intent);
+    },
+
+    // HELPERS
+    channelExists() {
+      if (Device.sdkVersion * 1 >= 26) {
+        const ctx = Utils.ad.getApplicationContext();
+        const NotifySrv = ctx.getSystemService(
+          android.content.Context.NOTIFICATION_SERVICE
+        );
+        return NotifySrv.getNotificationChannel("cta");
+      }
+      return null;
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Database.vue b/app/components/settings/Database.vue
similarity index 87%
rename from app/components/Settings/Database.vue
rename to app/components/settings/Database.vue
index 75dd6938..0bebcdac 100644
--- a/app/components/Settings/Database.vue
+++ b/app/components/settings/Database.vue
@@ -1,32 +1,7 @@
 <template>
   <Page @loaded="onPageLoad" actionBarHidden="true">
     <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'db' | L" />
-        </v-template>
-        <v-template if="$index == 4">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.action)"
-          >
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label v-if="item.subTitle" :text="item.subTitle" class="sub" />
-            </StackLayout>
-          </GridLayout>
-        </v-template>
-      </ListView>
+      <OptionsList title="db" :items="items" />
       <GridLayout
         v-show="!toast && !progress"
         row="1"
@@ -36,18 +11,7 @@
       >
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
       </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        colSpan="2"
-        class="appbar snackBar"
-        columns="*"
-        @tap="toast = null"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
+      <Toast :toast="toast" :action="hideToast" />
       <GridLayout
         v-show="progress"
         row="1"
@@ -75,12 +39,15 @@ import {
   getFileAccess,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
-import ConfirmDialog from "../modal/ConfirmDialog.vue";
+import Confirm from "../modals/Confirm";
+import OptionsList from "../sub/OptionsList";
+import Toast from "../sub/Toast";
 import { mapState, mapActions } from "vuex";
 import { openOrCreate } from "@akylas/nativescript-sqlite";
 import * as utils from "~/shared/utils";
 
 export default {
+  components: { OptionsList, Toast },
   data() {
     return {
       backupFolder: null,
@@ -103,18 +70,21 @@ export default {
       return [
         {},
         {
+          type: "list",
           icon: "folder",
           title: "buFol",
           subTitle: this.backupFolder,
           action: this.setBackupFolder,
         },
         {
+          type: "list",
           icon: "exp",
           title: "expBu",
           subTitle: localize("buInfo"),
           action: this.exportCheck,
         },
         {
+          type: "list",
           icon: "imp",
           title: "impBu",
           subTitle: localize("impInfo"),
@@ -134,9 +104,8 @@ export default {
       "unlinkBrokenImages",
       "clearImportSummary",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       const ContentResolver = Application.android.nativeApp.getContentResolver();
       this.backupFolder = ApplicationSettings.getString("backupFolder");
       if (
@@ -227,7 +196,7 @@ export default {
       this.progress = null;
       this.releaseBackEvent();
       let description = localize("buto", `"${filename}"`);
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: "expSuc",
           description,
@@ -240,6 +209,7 @@ export default {
     openZipFile() {
       utils.getBackupFile().then((uri) => {
         if (uri) {
+          knownFolders.temp().clear();
           let dest = knownFolders.temp().path;
           utils.Zip.unzip(uri, dest)
             .then((res) => res && this.validateZipContent(res, uri))
@@ -346,7 +316,7 @@ export default {
       this.progress = null;
       this.releaseBackEvent();
       knownFolders.temp().clear();
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: "impFail",
           description,
@@ -366,7 +336,7 @@ export default {
       const db = openOrCreate(recipesDB);
 
       // Import recipes
-      db.select(`SELECT * FROM recipes`).then((res) => {
+      db.select("SELECT * FROM recipes").then((res) => {
         this.importRecipesFromDB(res);
       });
 
@@ -426,7 +396,7 @@ export default {
       Folder.fromPath(destPath);
       utils.Zip.unzip(uri, destPath).then((res) => {
         if (res) {
-          // delete unzipped json files
+          // delete unzipped data files
           Folder.fromPath(path.join(destPath, "EnRecipes"))
             .getEntities()
             .then((entities) => {
@@ -444,13 +414,12 @@ export default {
     showImportSummary() {
       this.progress = null;
       this.releaseBackEvent();
-      knownFolders.temp().clear();
       let { found, imported, updated } = this.importSummary;
       let exists = Math.abs(found - imported - updated) + updated;
       let importedNote = `\n${localize("recI")} ${imported}`;
       let existsNote = `\n${localize("recE")} ${exists}`;
       let updatedNote = `\n${localize("recU")} ${updated}`;
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: "impSuc",
           description: `${found} ${localize(
@@ -479,9 +448,8 @@ export default {
     },
 
     // HELPERS
-    touch({ object, action }, method) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") method();
+    hideToast() {
+      this.toast = null;
     },
   },
 };
diff --git a/app/components/Settings/Interface.vue b/app/components/settings/Interface.vue
similarity index 71%
rename from app/components/Settings/Interface.vue
rename to app/components/settings/Interface.vue
index 38caf114..be65f6eb 100644
--- a/app/components/Settings/Interface.vue
+++ b/app/components/settings/Interface.vue
@@ -1,32 +1,7 @@
 <template>
   <Page @loaded="onPageLoad" actionBarHidden="true">
     <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'intf' | L" />
-        </v-template>
-        <v-template if="$index == 4">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.action)"
-          >
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1">
-              <Label :text="item.title | L" class="info" />
-              <Label :text="item.subTitle" class="sub" />
-            </StackLayout>
-          </GridLayout>
-        </v-template>
-      </ListView>
+      <OptionsList title="intf" :items="items" />
       <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
       </GridLayout>
@@ -42,12 +17,14 @@ import {
   Frame,
 } from "@nativescript/core";
 import { localize, overrideLocale } from "@nativescript/localize";
-import ActionDialog from "../modal/ActionDialog.vue";
-import ConfirmDialog from "../modal/ConfirmDialog.vue";
+import Action from "../modals/Action";
+import Confirm from "../modals/Confirm";
+import OptionsList from "../sub/OptionsList";
 import { mapState, mapActions } from "vuex";
 import * as utils from "~/shared/utils";
 
 export default {
+  components: { OptionsList },
   data() {
     return {
       appLanguage: "English",
@@ -59,12 +36,14 @@ export default {
       return [
         {},
         {
+          type: "list",
           icon: "lang",
           title: "lang",
           subTitle: this.appLanguage,
           action: this.selectAppLanguage,
         },
         {
+          type: "list",
           icon: "theme",
           title: "Theme",
           subTitle: localize(
@@ -73,6 +52,7 @@ export default {
           action: this.selectThemes,
         },
         {
+          type: "list",
           icon: "layout",
           title: "listVM",
           subTitle: localize(this.layout),
@@ -84,14 +64,13 @@ export default {
   },
   methods: {
     ...mapActions(["setTheme", "setLayout"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
     },
     // LANGUAGE SELECTION
     selectAppLanguage() {
       let languages = this.language.map((e) => e.title);
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "lang",
           list: [...languages],
@@ -102,7 +81,7 @@ export default {
           let locale = this.language.filter((e) => e.title === action)[0]
             .locale;
           if (currentLocale !== locale) {
-            this.$showModal(ConfirmDialog, {
+            this.$showModal(Confirm, {
               props: {
                 title: "appRst",
                 description: localize("nLangInfo"),
@@ -123,7 +102,7 @@ export default {
     },
     // THEME SELECTION
     selectThemes() {
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "Theme",
           list: ["Light", "Dark", "Black", "sysDef", "sysDefB"],
@@ -142,7 +121,7 @@ export default {
     },
     // LAYOUT MODE
     setLayoutMode() {
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "listVM",
           list: ["detailed", "grid", "photogrid", "simple", "minimal"],
@@ -155,13 +134,8 @@ export default {
         }
       });
     },
-    // HELPERS
-    touch({ object, action }, method) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") method();
-    },
   },
-  mounted() {
+  created() {
     this.appLanguage = ApplicationSettings.getString(
       "appLanguage",
       localize("sysDef")
diff --git a/app/components/settings/MPSettings.vue b/app/components/settings/MPSettings.vue
new file mode 100644
index 00000000..ce164690
--- /dev/null
+++ b/app/components/settings/MPSettings.vue
@@ -0,0 +1,45 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="Settings" :items="items" />
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import OptionsList from "../sub/OptionsList";
+
+export default {
+  components: { OptionsList },
+  computed: {
+    ...mapState(["icon", "mondayFirst"]),
+    items() {
+      return [
+        {},
+        {
+          type: "switch",
+          icon: "week",
+          title: "swm",
+          checked: this.mondayFirst,
+          action: this.toggleFirstDay,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setFirstDay"]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+    },
+    toggleFirstDay() {
+      this.setFirstDay(!this.mondayFirst);
+    },
+  },
+};
+</script>
diff --git a/app/components/settings/Options.vue b/app/components/settings/Options.vue
new file mode 100644
index 00000000..ed75b272
--- /dev/null
+++ b/app/components/settings/Options.vue
@@ -0,0 +1,69 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="opts" :items="items" />
+      <GridLayout
+        v-show="!toast"
+        row="1"
+        class="appbar"
+        rows="*"
+        columns="auto, *"
+      >
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+      <Toast :toast="toast" :action="(toast = null)" />
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import { localize } from "@nativescript/localize";
+import OptionsList from "../sub/OptionsList";
+import Toast from "../sub/Toast";
+import * as utils from "~/shared/utils";
+
+export default {
+  components: { OptionsList, Toast },
+  data() {
+    return {
+      toast: null,
+    };
+  },
+  computed: {
+    ...mapState(["icon", "shakeEnabled"]),
+    items() {
+      return [
+        {},
+        {
+          type: "switch",
+          icon: "shuf",
+          title: "sVw",
+          subTitle: "sVwInfo",
+          checked: this.shakeEnabled,
+          action: this.toggleShake,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setShake"]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+    },
+
+    // SHAKE VIEW RANDOM RECIPE
+    toggleShake() {
+      let checked = this.shakeEnabled;
+      if (checked && !utils.hasAccelerometer()) {
+        this.toast = localize("noAccSensor");
+        utils.timer(5, (val) => {
+          if (!val) this.toast = val;
+        });
+      } else this.setShake(!checked);
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Reset.vue b/app/components/settings/Reset.vue
similarity index 54%
rename from app/components/Settings/Reset.vue
rename to app/components/settings/Reset.vue
index 5c6547b4..fb5b4429 100644
--- a/app/components/Settings/Reset.vue
+++ b/app/components/settings/Reset.vue
@@ -1,34 +1,9 @@
 <template>
   <Page @loaded="onPageLoad" actionBarHidden="true">
     <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'rest' | L" />
-        </v-template>
-        <v-template if="$index == 5">
-          <Label class="group-info sub tw" :text="'restInfo' | L" />
-        </v-template>
-        <v-template if="$index == 6">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.type)"
-          >
-            <Label class="ico" :text="icon.reset" />
-            <Label col="1" :text="item.title | L" class="info" />
-          </GridLayout>
-        </v-template>
-      </ListView>
+      <OptionsList title="rest" :items="items" :action="resetListItems" />
       <GridLayout
-        v-show="!toast"
+        :hidden="toast"
         row="1"
         class="appbar"
         @loaded="onAppBarLoad"
@@ -36,18 +11,7 @@
       >
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
       </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        colSpan="2"
-        class="appbar snackBar"
-        columns="*"
-        @swipe="hideToast"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
+      <Toast :toast="toast" :action="hideToast" />
     </GridLayout>
   </Page>
 </template>
@@ -57,7 +21,10 @@ import { Observable, CoreTypes } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
 import * as utils from "~/shared/utils";
+import OptionsList from "../sub/OptionsList";
+import Toast from "../sub/Toast";
 export default {
+  components: { OptionsList, Toast },
   data() {
     return {
       toast: null,
@@ -70,20 +37,28 @@ export default {
       return [
         {},
         {
-          type: "cuisines",
+          type: "list",
+          icon: "reset",
           title: "restCuiL",
+          data: "cuisines",
         },
         {
-          type: "categories",
+          type: "list",
+          icon: "reset",
           title: "restCatL",
+          data: "categories",
         },
         {
-          type: "yieldUnits",
+          type: "list",
+          icon: "reset",
           title: "restYUL",
+          data: "yieldUnits",
         },
         {
-          type: "units",
+          type: "list",
+          icon: "reset",
           title: "restUL",
+          data: "units",
         },
         {},
         {},
@@ -92,9 +67,8 @@ export default {
   },
   methods: {
     ...mapActions(["resetListItemsAction"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
     },
     onAppBarLoad({ object }) {
       this.appbar = object;
@@ -111,6 +85,7 @@ export default {
       });
     },
     hideToast({ object }) {
+      this.appbar.translateY = 64;
       object
         .animate({
           opacity: 0,
@@ -120,7 +95,7 @@ export default {
         })
         .then(() => {
           this.showUndo = false;
-          this.appbar.translateY = 64;
+          this.toast = null;
           this.appbar.animate({
             translate: { x: 0, y: 0 },
             duration: 250,
@@ -128,13 +103,8 @@ export default {
           });
           object.opacity = 1;
           object.translateY = 0;
-          this.toast = null;
         });
     },
-    touch({ object, action }, type) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") this.resetListItems(type);
-    },
   },
 };
 </script>
diff --git a/app/components/sub/OptionsList.vue b/app/components/sub/OptionsList.vue
new file mode 100644
index 00000000..99b1f752
--- /dev/null
+++ b/app/components/sub/OptionsList.vue
@@ -0,0 +1,62 @@
+<template>
+  <ListView colSpan="2" rowSpan="2" class="options-list" for="item in items">
+    <v-template if="$index == 0">
+      <Label class="pageTitle" :text="title | L" />
+    </v-template>
+    <v-template if="item.type == 'switch'">
+      <GridLayout
+        columns="auto, *, auto"
+        class="option"
+        @touch="touch($event, item.data, item.action)"
+      >
+        <Label class="ico" :text="icon[item.icon]" />
+        <StackLayout col="1" verticalAlignment="center">
+          <Label :text="item.title | L" class="info" />
+          <Label v-if="item.subTitle" :text="item.subTitle | L" class="sub" />
+        </StackLayout>
+        <Switch
+          isUserInteractionEnabled="false"
+          :color="item.checked ? '#ff5200' : '#adb5bd'"
+          col="2"
+          :checked="item.checked"
+        />
+      </GridLayout>
+    </v-template>
+    <v-template if="item.type == 'list'">
+      <GridLayout
+        columns="auto, *"
+        class="option"
+        @touch="touch($event, item.data, item.action)"
+      >
+        <Label class="ico" :text="icon[item.icon]" />
+        <StackLayout col="1">
+          <Label :text="item.title | L" class="info" />
+          <Label v-if="item.subTitle" :text="item.subTitle" class="sub" />
+        </StackLayout>
+      </GridLayout>
+    </v-template>
+    <v-template if="item.type == 'info'">
+      <Label class="group-info sub tw" :text="item.title | L" />
+    </v-template>
+    <v-template>
+      <StackLayout class="listSpace"> </StackLayout>
+    </v-template>
+  </ListView>
+</template>
+
+<script>
+import { mapState } from "vuex";
+
+export default {
+  props: ["title", "items", "action"],
+  computed: {
+    ...mapState(["icon"]),
+  },
+  methods: {
+    touch({ object, action }, data, localAction) {
+      object.className = action.match(/down|move/) ? "option fade" : "option";
+      if (action == "up") localAction ? localAction(data) : this.action(data);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/app/components/sub/SnackBar.vue b/app/components/sub/SnackBar.vue
new file mode 100644
index 00000000..096106a9
--- /dev/null
+++ b/app/components/sub/SnackBar.vue
@@ -0,0 +1,23 @@
+<template>
+  <GridLayout
+    row="1"
+    class="appbar snackBar"
+    columns="auto, *, auto"
+    @swipe="action"
+  >
+    <Button :text="count" class="ico countdown tb" />
+    <Label class="title" col="1" :text="msg | L" />
+    <Button class="ico fab" :text="icon.undo" @tap="undo" col="3" />
+  </GridLayout>
+</template>
+
+<script>
+import { mapState } from "vuex";
+
+export default {
+  props: ["count", "msg", "undo", "action"],
+  computed: {
+    ...mapState(["icon"]),
+  },
+};
+</script>
\ No newline at end of file
diff --git a/app/components/SingleTimer.vue b/app/components/sub/Timer.vue
similarity index 96%
rename from app/components/SingleTimer.vue
rename to app/components/sub/Timer.vue
index c238da96..aa58df67 100644
--- a/app/components/SingleTimer.vue
+++ b/app/components/sub/Timer.vue
@@ -48,7 +48,7 @@
 import { ApplicationSettings, Application } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
-import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
+import ActionWithSearch from "../modals/ActionWithSearch";
 import * as utils from "~/shared/utils";
 import { EventBus } from "~/main";
 
@@ -92,7 +92,7 @@ export default {
   methods: {
     ...mapActions(["removeActiveTimer", "updateActiveTimer", "addTimerPreset"]),
     attachRecipe() {
-      this.$showModal(ActionDialogWithSearch, {
+      this.$showModal(ActionWithSearch, {
         props: {
           title: "selRec",
           recipes: this.recipes,
@@ -140,7 +140,7 @@ export default {
     },
     clearNotification() {
       Application.android.unregisterBroadcastReceiver("timer" + this.timer.id);
-      utils.TimerNotification.clear(this.timer.id);
+      utils.TimerNotif.clear(this.timer.id);
     },
     toggleProgress(bool) {
       this.togglePause(this.timer, bool);
diff --git a/app/components/sub/Toast.vue b/app/components/sub/Toast.vue
new file mode 100644
index 00000000..4c54cef6
--- /dev/null
+++ b/app/components/sub/Toast.vue
@@ -0,0 +1,20 @@
+<template>
+  <GridLayout
+    v-show="toast"
+    row="1"
+    colSpan="2"
+    class="appbar snackBar"
+    columns="*"
+    @swipe="action"
+  >
+    <FlexboxLayout minHeight="48" alignItems="center">
+      <Label class="title msg" :text="toast" />
+    </FlexboxLayout>
+  </GridLayout>
+</template>
+
+<script>
+export default {
+  props: ["toast", "action"],
+};
+</script>
\ No newline at end of file
diff --git a/app/i18n/en-GB.default.json b/app/i18n/en-GB.default.json
index caa44806..2c8da6f3 100644
--- a/app/i18n/en-GB.default.json
+++ b/app/i18n/en-GB.default.json
@@ -309,5 +309,6 @@
   "hour": "hour",
   "hours": "hours",
   "seconds": "seconds",
-  "tmrClr": "Timer cleared"
+  "tmrRm": "Timer removed",
+  "notifSetg": "Notification settings"
 }
diff --git a/app/main.ts b/app/main.ts
index 4476a03b..dff0a56c 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -2,9 +2,27 @@ import {
   localize,
   androidLaunchEventLocalizationHandler,
 } from '@nativescript/localize'
-import { on, launchEvent } from '@nativescript/core/application'
+import { Application, AndroidApplication, Utils } from '@nativescript/core'
 
-on(launchEvent, ({ android }) => {
+const keepScreenOn = () => {
+  let ctx = Utils.ad.getApplicationContext()
+  const pm = ctx.getSystemService(android.content.Context.POWER_SERVICE)
+  let isScreenOff = !pm.isInteractive()
+  if (isScreenOff) {
+    console.log('keepScreenOn')
+    const window = Application.android.startActivity.getWindow()
+    const windowMgr = android.view.WindowManager
+    window.addFlags(
+      windowMgr.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+        windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
+        windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
+    )
+  }
+}
+Application.on(Application.resumeEvent, keepScreenOn)
+
+Application.on(Application.launchEvent, ({ android }) => {
+  console.log('launching')
   if (android) androidLaunchEventLocalizationHandler()
 })
 
@@ -17,7 +35,7 @@ export const EventBus = new Vue()
 import CollectionView from '@nativescript-community/ui-collectionview/vue'
 Vue.use(CollectionView)
 
-import { lvMixin } from './shared/mixins.js'
+import { lvMixin } from './shared/mixins'
 Vue.mixin(lvMixin)
 
 Vue.config.silent = false
diff --git a/app/resources/Android/src/main/AndroidManifest.xml b/app/resources/Android/src/main/AndroidManifest.xml
index 62af1b2c..3956f81d 100644
--- a/app/resources/Android/src/main/AndroidManifest.xml
+++ b/app/resources/Android/src/main/AndroidManifest.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="__PACKAGE__" android:versionCode="10000" android:versionName="1.0">
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.CAMERA" tools:node="remove" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
-	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove" />
 	<uses-permission android:name="android.permission.INTERNET" tools:node="remove" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
 	<application android:extractNativeLibs="true" 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">
-		<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:launchMode="singleTop" android:screenOrientation="userPortrait" 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:launchMode="singleInstance" 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" />
@@ -19,6 +20,7 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="com.tns.ErrorReportActivity" />
+		<service android:name="com.tns.ForegroundService" android:enabled="true" android:exported="false" />
 		<provider android:name="androidx.core.content.FileProvider" android:exported="false" android:authorities="${applicationId}.provider" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider" />
 		</provider>
diff --git a/app/resources/Android/src/main/res/values-ar/strings.xml b/app/resources/Android/src/main/res/values-ar/strings.xml
index 5ae6f254..08840dd5 100644
--- a/app/resources/Android/src/main/res/values-ar/strings.xml
+++ b/app/resources/Android/src/main/res/values-ar/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"أضف"</string>
   <string name="About">"حول"</string>
   <string name="aap">"ألحق صورة"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ca/strings.xml b/app/resources/Android/src/main/res/values-ca/strings.xml
index fcae9396..8931d5d7 100644
--- a/app/resources/Android/src/main/res/values-ca/strings.xml
+++ b/app/resources/Android/src/main/res/values-ca/strings.xml
@@ -90,7 +90,8 @@
   <string name="allTs">"Totes les etiquetes"</string>
   <string name="allCats">"Totes les categories"</string>
   <string name="About">"Quant a"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="aD">"All done!"</string>
   <string name="aBtn">"ADD"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-da/strings.xml b/app/resources/Android/src/main/res/values-da/strings.xml
index f4017783..f0da2471 100644
--- a/app/resources/Android/src/main/res/values-da/strings.xml
+++ b/app/resources/Android/src/main/res/values-da/strings.xml
@@ -313,4 +313,6 @@
   <string name="American">"American"</string>
   <string name="aD">"Fuldendt!"</string>
   <string name="About">"Om"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-de/strings.xml b/app/resources/Android/src/main/res/values-de/strings.xml
index 26285ab6..4b6c6923 100644
--- a/app/resources/Android/src/main/res/values-de/strings.xml
+++ b/app/resources/Android/src/main/res/values-de/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"HINZUFÜGEN"</string>
   <string name="About">"Über"</string>
   <string name="aap">"Foto anhängen"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-en-rIN/strings.xml b/app/resources/Android/src/main/res/values-en-rIN/strings.xml
index b583ec4c..c40b78ae 100644
--- a/app/resources/Android/src/main/res/values-en-rIN/strings.xml
+++ b/app/resources/Android/src/main/res/values-en-rIN/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-en-rUS/strings.xml b/app/resources/Android/src/main/res/values-en-rUS/strings.xml
index 10aa5e77..8abaf9d7 100644
--- a/app/resources/Android/src/main/res/values-en-rUS/strings.xml
+++ b/app/resources/Android/src/main/res/values-en-rUS/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-es-rAR/strings.xml b/app/resources/Android/src/main/res/values-es-rAR/strings.xml
index 2b3f6afb..6ee9f9b3 100644
--- a/app/resources/Android/src/main/res/values-es-rAR/strings.xml
+++ b/app/resources/Android/src/main/res/values-es-rAR/strings.xml
@@ -20,7 +20,8 @@
   <string name="aStpBtn">"AGREGAR PASO"</string>
   <string name="August">"Agosto"</string>
   <string name="sec">"s"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="title_activity_kimera">"EnRecipes"</string>
   <string name="allTs">"All Tags"</string>
   <string name="allCuis">"All Cuisines"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-es/strings.xml b/app/resources/Android/src/main/res/values-es/strings.xml
index cb0422f4..f2acde4a 100644
--- a/app/resources/Android/src/main/res/values-es/strings.xml
+++ b/app/resources/Android/src/main/res/values-es/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AÑADIR"</string>
   <string name="About">"Acerca de"</string>
   <string name="aap">"Adjuntar una foto"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fi/strings.xml b/app/resources/Android/src/main/res/values-fi/strings.xml
index dbb04b14..dcd130d5 100644
--- a/app/resources/Android/src/main/res/values-fi/strings.xml
+++ b/app/resources/Android/src/main/res/values-fi/strings.xml
@@ -309,8 +309,10 @@
   <string name="aBtn">"LISÄÄ"</string>
   <string name="About">"Tietoja"</string>
   <string name="aap">"Liitä valokuva"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="tmrvbrt">"Timer vibrate"</string>
   <string name="delay">"Delay"</string>
   <string name="strtBtn">"START"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rBE/strings.xml b/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
index b040193e..1b1f01f6 100644
--- a/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rCA/strings.xml b/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
index c29559c6..a38eaa2c 100644
--- a/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rCH/strings.xml b/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
index 7a0d42b5..36631328 100644
--- a/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr/strings.xml b/app/resources/Android/src/main/res/values-fr/strings.xml
index 0f02331e..333240ba 100644
--- a/app/resources/Android/src/main/res/values-fr/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-hi/strings.xml b/app/resources/Android/src/main/res/values-hi/strings.xml
index 3727273b..edf58ac0 100644
--- a/app/resources/Android/src/main/res/values-hi/strings.xml
+++ b/app/resources/Android/src/main/res/values-hi/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"जोड़ें"</string>
   <string name="About">"तकरीबन"</string>
   <string name="aap">"एक तस्वीर लगाओ"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-id/strings.xml b/app/resources/Android/src/main/res/values-id/strings.xml
index 5b9776e9..0f6571b1 100644
--- a/app/resources/Android/src/main/res/values-id/strings.xml
+++ b/app/resources/Android/src/main/res/values-id/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"Tambah"</string>
   <string name="About">"Tentang"</string>
   <string name="aap">"Lampirkan foto"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-it/strings.xml b/app/resources/Android/src/main/res/values-it/strings.xml
index 0addf598..3fc11eab 100644
--- a/app/resources/Android/src/main/res/values-it/strings.xml
+++ b/app/resources/Android/src/main/res/values-it/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AGGIUNGI"</string>
   <string name="About">"Informazioni"</string>
   <string name="aap">"Allega una foto"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ja/strings.xml b/app/resources/Android/src/main/res/values-ja/strings.xml
index 3c98214e..8295639c 100644
--- a/app/resources/Android/src/main/res/values-ja/strings.xml
+++ b/app/resources/Android/src/main/res/values-ja/strings.xml
@@ -289,7 +289,8 @@
   <string name="aBtn">"追加"</string>
   <string name="About">"アプリについて"</string>
   <string name="aap">"写真を添付"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="_app_name_1k3Sbz">"EnRecipes"</string>
   <string name="app_name">"EnRecipes"</string>
   <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-kn/strings.xml b/app/resources/Android/src/main/res/values-kn/strings.xml
index 00104094..d91f9e1d 100644
--- a/app/resources/Android/src/main/res/values-kn/strings.xml
+++ b/app/resources/Android/src/main/res/values-kn/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ml/strings.xml b/app/resources/Android/src/main/res/values-ml/strings.xml
index 3f79d599..d1e54ef9 100644
--- a/app/resources/Android/src/main/res/values-ml/strings.xml
+++ b/app/resources/Android/src/main/res/values-ml/strings.xml
@@ -293,7 +293,8 @@
   <string name="aBtn">"ചേർക്കുക"</string>
   <string name="About">"കുറിച്ച്"</string>
   <string name="aap">"ഒരു ഫോട്ടോ അറ്റാച്ചുചെയ്യുക"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
   <string name="sec">"sec"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-nb-rNO/strings.xml b/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
index 6fad27d7..8f15b3f7 100644
--- a/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
+++ b/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
@@ -294,7 +294,8 @@
   <string name="aBtn">"Legg til"</string>
   <string name="About">"Om"</string>
   <string name="aap">"Legg ved et bilde"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="strtBtn">"START"</string>
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-nl/strings.xml b/app/resources/Android/src/main/res/values-nl/strings.xml
index eefee2b7..0eac0b0e 100644
--- a/app/resources/Android/src/main/res/values-nl/strings.xml
+++ b/app/resources/Android/src/main/res/values-nl/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"TOEVOEGEN"</string>
   <string name="About">"Over"</string>
   <string name="aap">"Foto bijvoegen"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-pt-rBR/strings.xml b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
index 9cc2f3fc..51aca148 100644
--- a/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
@@ -313,4 +313,6 @@
   <string name="aD">"Tudo feito!"</string>
   <string name="aBtn">"ADICIONAR"</string>
   <string name="About">"Sobre"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-pt/strings.xml b/app/resources/Android/src/main/res/values-pt/strings.xml
index d8d3f7b9..5b9a1e06 100644
--- a/app/resources/Android/src/main/res/values-pt/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt/strings.xml
@@ -313,4 +313,6 @@
   <string name="American">"Americana"</string>
   <string name="About">"Sobre"</string>
   <string name="aap">"Anexar uma fotografia"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ru/strings.xml b/app/resources/Android/src/main/res/values-ru/strings.xml
index f6ea48c8..a4e703a1 100644
--- a/app/resources/Android/src/main/res/values-ru/strings.xml
+++ b/app/resources/Android/src/main/res/values-ru/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"ДОБАВИТЬ"</string>
   <string name="About">"О приложении"</string>
   <string name="aap">"Прикрепить фото"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ta/strings.xml b/app/resources/Android/src/main/res/values-ta/strings.xml
index 1bf92994..a58630a4 100644
--- a/app/resources/Android/src/main/res/values-ta/strings.xml
+++ b/app/resources/Android/src/main/res/values-ta/strings.xml
@@ -293,7 +293,8 @@
   <string name="aBtn">"சேர்"</string>
   <string name="About">"பற்றி"</string>
   <string name="aap">"புகைப்படத்தை இணைக்கவும்"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
   <string name="sec">"sec"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-te/strings.xml b/app/resources/Android/src/main/res/values-te/strings.xml
index 8d6d0171..3dd25ff9 100644
--- a/app/resources/Android/src/main/res/values-te/strings.xml
+++ b/app/resources/Android/src/main/res/values-te/strings.xml
@@ -293,7 +293,8 @@
   <string name="aBtn">"చేర్చు"</string>
   <string name="About">"గురించి"</string>
   <string name="aap">"ఫోటోను అటాచ్ చేయండి"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
   <string name="sec">"sec"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values/strings.xml b/app/resources/Android/src/main/res/values/strings.xml
index 00104094..d91f9e1d 100644
--- a/app/resources/Android/src/main/res/values/strings.xml
+++ b/app/resources/Android/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/shared/mixins.js b/app/shared/mixins.ts
similarity index 96%
rename from app/shared/mixins.js
rename to app/shared/mixins.ts
index b317bc85..39d041f0 100644
--- a/app/shared/mixins.js
+++ b/app/shared/mixins.ts
@@ -1,3 +1,5 @@
+declare const android: any
+
 export const lvMixin = {
   methods: {
     transparentPage({ object }) {
diff --git a/app/shared/utils.js b/app/shared/utils.ts
similarity index 86%
rename from app/shared/utils.js
rename to app/shared/utils.ts
index 608839af..6623897d 100644
--- a/app/shared/utils.js
+++ b/app/shared/utils.ts
@@ -8,6 +8,8 @@ import {
   knownFolders,
 } from '@nativescript/core'
 let timerOne
+declare const global, android, androidx, com, java, Array: any
+
 export const restartApp = () => {
   const ctx = Utils.ad.getApplicationContext()
   let mStartActivity = new android.content.Intent(
@@ -93,11 +95,12 @@ export const getRecipePhoto = () => {
     android.content.Intent.ACTION_GET_CONTENT
   )
   intent.setType('image/*')
-  return callIntent(ctx, intent, 'Select photo', DIR_CODE).then((res) => {
-    if (res.resultCode === android.app.Activity.RESULT_OK)
-      if (res.intent != null && res.intent.getData())
-        return res.intent.getData()
-  })
+  return callIntent(ctx, intent, 'Select photo', DIR_CODE).then(
+    ({ resultCode, intent }: any) => {
+      if (resultCode === android.app.Activity.RESULT_OK)
+        if (intent != null && intent.getData()) return intent.getData()
+    }
+  )
 }
 export const copyPhotoToCache = (uri, filepath) => {
   const ContentResolver = Application.android.nativeApp.getContentResolver()
@@ -129,7 +132,7 @@ export const copyDBToExport = () => {
   const input = new java.io.FileInputStream(src)
   try {
     const output = new java.io.FileOutputStream(dst)
-    let len
+    let len: number
     let buffer = Array.create('byte', 1024)
     while ((len = input.read(buffer)) > 0) output.write(buffer, 0, len)
   } catch (error) {
@@ -147,11 +150,12 @@ export const getBackupFolder = () => {
   const intent = new android.content.Intent(
     android.content.Intent.ACTION_OPEN_DOCUMENT_TREE
   )
-  return callIntent(ctx, intent, 'Select folder', DIR_CODE).then((res) => {
-    if (res.resultCode === android.app.Activity.RESULT_OK)
-      if (res.intent != null && res.intent.getData())
-        return res.intent.getData()
-  })
+  return callIntent(ctx, intent, 'Select folder', DIR_CODE).then(
+    ({ resultCode, intent }: any) => {
+      if (resultCode === android.app.Activity.RESULT_OK)
+        if (intent != null && intent.getData()) return intent.getData()
+    }
+  )
 }
 
 // BACKUP FILE PICKER
@@ -165,10 +169,9 @@ export const getBackupFile = () => {
   intent.addCategory(android.content.Intent.CATEGORY_OPENABLE)
   intent.setType('application/zip')
   return callIntent(ctx, intent, 'Select file to import', DIR_CODE).then(
-    (res) => {
-      if (res.resultCode === android.app.Activity.RESULT_OK) {
-        if (res.intent != null && res.intent.getData())
-          return res.intent.getData()
+    ({ resultCode, intent }: any) => {
+      if (resultCode === android.app.Activity.RESULT_OK) {
+        if (intent != null && intent.getData()) return intent.getData()
       }
     }
   )
@@ -176,7 +179,7 @@ export const getBackupFile = () => {
 
 // ZIP OPERATIONS
 export class Zip {
-  static getSubFiles(src, isRootFolder) {
+  static getSubFiles(src: string, isRootFolder?: boolean) {
     const fileList = new java.util.ArrayList()
     const sourceFile = new java.io.File(src)
     let tempList = sourceFile.listFiles()
@@ -301,8 +304,8 @@ export const shareImage = (image, subject) => {
 }
 
 // TIMER NOTIFICATION
-export class TimerNotification {
-  static getResource(ctx, icon) {
+export class TimerNotif {
+  static getIcon(ctx, icon) {
     const packageName = ctx.getApplicationInfo().packageName
     let resources = ctx.getResources()
     return (
@@ -328,36 +331,33 @@ export class TimerNotification {
     sound,
     title,
     vibrate,
+  }: {
+    actions?: boolean
+    bID: string
+    cID: string
+    cName: string
+    description: string
+    nID: number
+    priority: number
+    sound: string
+    title: string
+    vibrate?: number
   }) {
-    let sdkv = Device.sdkVersion * 1
-    let soundUri
+    let sdkv: number = parseInt(Device.sdkVersion)
+    let soundUri: any
     if (sound) soundUri = new android.net.Uri.parse(sound)
     const NotifyMgr = android.app.NotificationManager
     let ctx = Utils.ad.getApplicationContext()
     const NotifySrv = ctx.getSystemService(
       android.content.Context.NOTIFICATION_SERVICE
     )
-
-    if (priority) {
-      // Show over lock screen
-      Application.android.on(AndroidApplication.activityResumedEvent, () => {
-        const window = Application.android.startActivity.getWindow()
-        const windowMgr = android.view.WindowManager
-        window.addFlags(
-          windowMgr.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
-            windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
-            windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
-        )
-      })
-    }
-
     if (sdkv >= 26) {
-      const importance = priority
-        ? NotifyMgr.IMPORTANCE_HIGH
-        : NotifyMgr.IMPORTANCE_DEFAULT
+      const importance =
+        priority > 0 ? NotifyMgr.IMPORTANCE_HIGH : NotifyMgr.IMPORTANCE_MIN
+      console.log(priority, importance)
       const AudioAttributes = android.media.AudioAttributes
       const audioAttributes = new AudioAttributes.Builder()
-        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
         .setUsage(AudioAttributes.USAGE_ALARM)
         .build()
       const Channel = new android.app.NotificationChannel(
@@ -409,7 +409,8 @@ export class TimerNotification {
 
     // CREATE NOTIFICATION
     const NotificationCompat = androidx.core.app.NotificationCompat
-    let icon = TimerNotification.getResource(ctx, 'ic_stat_notify_silhouette')
+    const AudioManager = android.media.AudioManager
+    let icon = TimerNotif.getIcon(ctx, 'ic_stat_notify_silhouette')
     let builder = new NotificationCompat.Builder(ctx, cID)
       .setColor(new Color('#ff5200').android)
       .setContentIntent(mainPInt)
@@ -418,9 +419,10 @@ export class TimerNotification {
       .setPriority(priority)
       .setShowWhen(actions)
       .setSmallIcon(icon)
-      .setSound(sound ? soundUri : null)
       .setTicker(title)
       .setAutoCancel(false)
+    if (sound) builder.setSound(soundUri, AudioManager.STREAM_ALARM)
+    else builder.setSound(null)
     if (description) builder.setContentText(description)
     if (vibrate) builder.setVibrate([500, 1000])
     if (actions) {
@@ -430,19 +432,20 @@ export class TimerNotification {
       builder.addAction(null, 'Stop', actionPInt2)
     }
     let notification = builder.build()
-    notification.flags = NotificationCompat.FLAG_INSISTENT
+    notification.flags =
+      NotificationCompat.FLAG_INSISTENT | NotificationCompat.FLAG_ONGOING_EVENT
     NotifySrv.notify(nID, notification)
   }
 }
 
 // GET RINGTONES LIST
 export const getTones = () => {
-  let ctx = Utils.ad.getApplicationContext()
-  let tones = []
   const RingtoneManager = android.media.RingtoneManager
+  let ctx = Utils.ad.getApplicationContext()
   const ringtonesMgr = new RingtoneManager(ctx)
   ringtonesMgr.setType(RingtoneManager.TYPE_ALARM)
   const cursor = ringtonesMgr.getCursor()
+  let tones = []
   while (cursor.moveToNext()) {
     tones.push({
       title: cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX),
@@ -452,5 +455,21 @@ export const getTones = () => {
         cursor.getString(RingtoneManager.ID_COLUMN_INDEX),
     })
   }
-  return tones
+
+  let defaultToneUri = RingtoneManager.getActualDefaultRingtoneUri(
+    ctx,
+    RingtoneManager.TYPE_ALARM
+  )
+  let defaultTone
+  if (defaultToneUri) {
+    let uriString = defaultToneUri.toString()
+    let tonesAvailable = tones.filter((e) => e.uri == uriString)
+    let toneExist = tonesAvailable.length
+    defaultTone = {
+      title: toneExist ? tonesAvailable[0].title : tones[0].title,
+      uri: toneExist ? uriString : tones[0].uri,
+    }
+  }
+
+  return { tones, defaultTone: defaultToneUri ? defaultTone : tones[0] }
 }
diff --git a/app/store.ts b/app/store.ts
index b900312d..f27a76bc 100644
--- a/app/store.ts
+++ b/app/store.ts
@@ -387,8 +387,7 @@ export default new Vuex.Store({
         title: sound.title,
         uri: sound.uri,
       }
-      ApplicationSettings.setString('timerSoundTitle', sound.title)
-      ApplicationSettings.setString('timerSoundUri', sound.uri)
+      ApplicationSettings.setString('timerSound', JSON.stringify(sound))
     },
     setTimerVibrate(state, bool) {
       state.timerVibrate = bool
@@ -626,9 +625,7 @@ export default new Vuex.Store({
         )
         if (partition[0].length) createDocuments(partition[0])
         if (partition[1].length) updateDocuments(partition[1])
-      } else {
-        createDocuments(recipes)
-      }
+      } else createDocuments(recipes)
       state.importSummary.found = recipes.length
       state.importSummary.imported = imported
       state.importSummary.updated = updated
diff --git a/package-lock.json b/package-lock.json
index 16de09fc..e86c34aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,9 +98,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz",
-      "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
+      "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.14.2",
@@ -196,15 +196,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
-      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz",
+      "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-member-expression-to-functions": "^7.13.12",
         "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.12"
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "node_modules/@babel/helper-simple-access": {
@@ -259,10 +259,72 @@
         "js-tokens": "^4.0.0"
       }
     },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/parser": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz",
-      "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz",
+      "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -317,131 +379,10 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@nano-sql/core": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@nano-sql/core/-/core-2.3.7.tgz",
-      "integrity": "sha512-B9nniPPRhPf5Hf2cyvy72SNEg4iKQEW6pig9nwrM4DJlmOMZudifOMPBoJuK6JcTaLATIOGRPkclfosNUALnLQ==",
-      "peer": true,
-      "dependencies": {
-        "fast-deep-equal": "^2.0.1",
-        "levenshtein-edit-distance": "^2.0.4",
-        "really-small-events": "^1.1.0",
-        "snap-db": "^1.1.1"
-      },
-      "bin": {
-        "nsql": "lib/cli.js"
-      },
-      "optionalDependencies": {
-        "chalk": "^2.4.2",
-        "chokidar": "^3.0.2",
-        "command-line-args": "^5.1.1"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm": {
-      "version": "0.2.28-1",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/typeorm/-/typeorm-0.2.28-1.tgz",
-      "integrity": "sha512-2/SlK8c1SR6to6zryysGSKBSczhiXFziccWOU6R00nyjsQj3fJbxLfKDJIZyNefpHvrnpHy3VjWLsXmDXBwCbQ==",
-      "peer": true,
-      "dependencies": {
-        "@sqltools/formatter": "1.2.2",
-        "app-root-path": "^3.0.0",
-        "buffer": "^5.5.0",
-        "chalk": "^4.1.0",
-        "cli-highlight": "^2.1.4",
-        "debug": "^4.1.1",
-        "dotenv": "^8.2.0",
-        "glob": "^7.1.6",
-        "js-yaml": "^3.14.0",
-        "mkdirp": "^1.0.4",
-        "reflect-metadata": "^0.1.13",
-        "sha.js": "^2.4.11",
-        "tslib": "^1.13.0",
-        "xml2js": "^0.4.23",
-        "yargonaut": "^1.1.2",
-        "yargs": "^16.0.3"
-      },
-      "bin": {
-        "typeorm": "cli.js"
-      },
-      "funding": {
-        "url": "https://opencollective.com/typeorm"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "peer": true
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@nativescript-community/ui-collectionview": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz",
-      "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg==",
-      "license": "Apache-2.0"
+      "version": "4.0.31",
+      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.31.tgz",
+      "integrity": "sha512-kWtupfe+zr2Vj5hLfie/xxlFYLtLbBS6WrDBUD9z1cJYIZRf9KQxwl8z4wJ2dtQ51dlt1r8CJZgpgRbMTk5xQA=="
     },
     "node_modules/@nativescript/android": {
       "version": "8.0.0",
@@ -450,9 +391,9 @@
       "dev": true
     },
     "node_modules/@nativescript/core": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.5.tgz",
-      "integrity": "sha512-61u5zo8I5XK6agqrAS2d0JAfOiVJ1kyAMi7VqkyXQohSsjOAK4CAfCAeIvaZf4vd3yeAnUWiL6UvCYt/Ot5srQ==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.6.tgz",
+      "integrity": "sha512-w9fmuzUrKUblHbkmApMNWExgFZewZCnwf8A2ymcdLsftvljXrDhztbIgQD4aDis61OaqE1N42UToYPpUkaw5pw==",
       "hasInstallScript": true,
       "dependencies": {
         "@nativescript/hook": "~2.0.0",
@@ -461,11 +402,6 @@
         "tslib": "~2.0.0"
       }
     },
-    "node_modules/@nativescript/core/node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-    },
     "node_modules/@nativescript/hook": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@nativescript/hook/-/hook-2.0.0.tgz",
@@ -576,64 +512,6 @@
         }
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@nativescript/webpack/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@nativescript/webpack/node_modules/sass": {
       "version": "1.32.8",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
@@ -649,18 +527,6 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -744,26 +610,20 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
-      "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
+      "version": "1.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
+      "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
       "dev": true
     },
-    "node_modules/@sqltools/formatter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz",
-      "integrity": "sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==",
-      "peer": true
-    },
     "node_modules/@triniwiz/nativescript-accelerometer": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz",
       "integrity": "sha512-LKwlNaIWJPEbFKsPwA5vndqrKBUqE9dK9wdi/LsHs0Nl6pfMI7fPkBPoGW7UvVSMqy4s4d35Q0FDbKXR1t796A=="
     },
     "node_modules/@types/eslint": {
-      "version": "7.2.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
-      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "version": "7.2.11",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.11.tgz",
+      "integrity": "sha512-WYhv//5K8kQtsSc9F1Kn2vHzhYor6KpwPbARH7hwYe3C3ETD0EVx/3P5qQybUoaBEuUa9f/02JjBiXFWalYUmw==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -793,9 +653,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
-      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
+      "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -823,6 +683,68 @@
         "prettier": "^1.18.2"
       }
     },
+    "node_modules/@vue/component-compiler-utils/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
       "version": "7.0.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -1176,12 +1098,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/ajv/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -1207,32 +1123,37 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
       "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "devOptional": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1241,45 +1162,11 @@
         "node": ">= 8"
       }
     },
-    "node_modules/app-root-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
-      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
-      "peer": true,
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "peer": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/argparse/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "peer": true
-    },
-    "node_modules/array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -1400,7 +1287,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1443,7 +1330,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -1474,30 +1361,6 @@
         "url": "https://opencollective.com/browserslist"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peer": true,
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -1535,24 +1398,26 @@
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "devOptional": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -1582,6 +1447,7 @@
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
       "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "highlight.js": "^10.7.1",
@@ -1598,74 +1464,11 @@
         "npm": ">=5.0.0"
       }
     },
-    "node_modules/cli-highlight/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/cli-highlight/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -1687,19 +1490,22 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "devOptional": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "devOptional": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/colorette": {
       "version": "1.2.2",
@@ -1707,22 +1513,6 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "node_modules/command-line-args": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
-      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "array-back": "^3.0.1",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -1996,6 +1786,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -2050,6 +1841,7 @@
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
       "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -2085,15 +1877,16 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.728",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
-      "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
+      "version": "1.3.738",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
+      "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
       "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -2182,6 +1975,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -2190,6 +1984,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -2207,19 +2002,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "peer": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -2283,10 +2065,10 @@
       }
     },
     "node_modules/fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "peer": true
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.2.5",
@@ -2326,20 +2108,11 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/figlet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
-      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww==",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2364,19 +2137,6 @@
         "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "array-back": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -2414,64 +2174,6 @@
         "yarn": ">=1.0.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -2517,18 +2219,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -2565,6 +2255,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -2593,6 +2284,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -2632,7 +2324,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -2708,34 +2400,13 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "devOptional": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/hash-sum": {
@@ -2757,6 +2428,7 @@
       "version": "10.7.2",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
       "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -2788,26 +2460,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peer": true
-    },
     "node_modules/ignore": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -2882,7 +2534,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -2906,7 +2558,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2915,6 +2567,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2923,7 +2576,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -2935,7 +2588,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -3002,46 +2655,12 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "peer": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3117,19 +2736,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/levenshtein-edit-distance": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/levenshtein-edit-distance/-/levenshtein-edit-distance-2.0.5.tgz",
-      "integrity": "sha512-Yuraz7QnMX/JENJU1HA6UtdsbhRzoSFnGpVGVryjQgHtl2s/YmVgmNYkVs5yzVZ9aAvQR9wPBUH3lG755ylxGA==",
-      "peer": true,
-      "bin": {
-        "levenshtein-edit-distance": "cli.js"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -3177,13 +2783,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -3369,12 +2968,14 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -3425,7 +3026,6 @@
       "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.9.0.tgz",
       "integrity": "sha512-7E8MizLk4PCI/9biTf31o2hLaXcXwQJLmIn4gCU2QHgwRN9NlqkvJ+oGoi7rPBAM8Lqv9CFKq9jH07ZNHXQNbg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"
@@ -3447,7 +3047,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3468,6 +3068,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3567,15 +3168,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parent-require": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz",
-      "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -3597,12 +3189,14 @@
     "node_modules/parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
       "dependencies": {
         "parse5": "^6.0.1"
       }
@@ -3610,7 +3204,8 @@
     "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
@@ -3639,9 +3234,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "node_modules/path-type": {
@@ -3654,10 +3249,10 @@
       }
     },
     "node_modules/picomatch": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-      "devOptional": true,
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -4045,7 +3640,7 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -4053,12 +3648,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/really-small-events": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/really-small-events/-/really-small-events-1.1.0.tgz",
-      "integrity": "sha512-iyh4pULyDYBMecekEYcP3ToJD3ZUdIPfZV9nx1C1lJfMguElkDAZvEMJegy8uE7eIROCuLsqh5r44fVro9nKFg==",
-      "peer": true
-    },
     "node_modules/rechoir": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -4085,16 +3674,11 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
       "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
     },
-    "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "peer": true
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4178,12 +3762,13 @@
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/sass": {
-      "version": "1.32.13",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
-      "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
+      "version": "1.34.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
+      "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -4232,7 +3817,8 @@
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
@@ -4270,19 +3856,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "peer": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -4341,12 +3914,12 @@
       }
     },
     "node_modules/sirv": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
-      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
+      "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
       "dev": true,
       "dependencies": {
-        "@polka/url": "^1.0.0-next.9",
+        "@polka/url": "^1.0.0-next.15",
         "mime": "^2.3.1",
         "totalist": "^1.0.0"
       },
@@ -4363,12 +3936,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/snap-db": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/snap-db/-/snap-db-1.1.6.tgz",
-      "integrity": "sha512-KxsO5RnY70J48f6poy0qVm2WS8ZbqG0PUVP2fjd7dvlaCMZ/DxtDv5fhhIVwkP2lOmNQ9QsTFfDuCA7N+TF3qg==",
-      "peer": true
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -4443,6 +4010,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -4456,6 +4024,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.0"
       },
@@ -4473,15 +4042,15 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "devOptional": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/tapable": {
@@ -4571,6 +4140,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -4579,6 +4149,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -4599,7 +4170,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4645,64 +4216,6 @@
         "webpack": "*"
       }
     },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ts-loader/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -4730,18 +4243,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ts-loader/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -4774,15 +4275,15 @@
       }
     },
     "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "peer": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
     },
     "node_modules/typescript": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
       "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4791,16 +4292,6 @@
         "node": ">=4.2.0"
       }
     },
-    "node_modules/typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -4834,7 +4325,8 @@
     "node_modules/vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
+      "dev": true
     },
     "node_modules/vue-hot-reload-api": {
       "version": "2.3.4",
@@ -4944,9 +4436,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
-      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
+      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -5025,55 +4517,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/webpack-bundle-analyzer/node_modules/commander": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
@@ -5083,27 +4526,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/webpack-chain": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
@@ -5277,6 +4699,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -5289,36 +4712,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5345,28 +4738,6 @@
         }
       }
     },
-    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "peer": true,
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/xml2js/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "peer": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/xmlbuilder": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
@@ -5387,6 +4758,7 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -5406,76 +4778,11 @@
         "node": ">= 6"
       }
     },
-    "node_modules/yargonaut": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
-      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
-      "peer": true,
-      "dependencies": {
-        "chalk": "^1.1.1",
-        "figlet": "^1.1.1",
-        "parent-require": "^1.0.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -5493,6 +4800,7 @@
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
       "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -5574,9 +4882,9 @@
       }
     },
     "@babel/generator": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz",
-      "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
+      "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.14.2",
@@ -5668,15 +4976,15 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
-      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz",
+      "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==",
       "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.13.12",
         "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.12"
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "@babel/helper-simple-access": {
@@ -5729,12 +5037,64 @@
         "@babel/helper-validator-identifier": "^7.14.0",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/parser": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz",
-      "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz",
+      "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==",
       "dev": true
     },
     "@babel/template": {
@@ -5780,100 +5140,10 @@
       "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true
     },
-    "@nano-sql/core": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@nano-sql/core/-/core-2.3.7.tgz",
-      "integrity": "sha512-B9nniPPRhPf5Hf2cyvy72SNEg4iKQEW6pig9nwrM4DJlmOMZudifOMPBoJuK6JcTaLATIOGRPkclfosNUALnLQ==",
-      "peer": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "chokidar": "^3.0.2",
-        "command-line-args": "^5.1.1",
-        "fast-deep-equal": "^2.0.1",
-        "levenshtein-edit-distance": "^2.0.4",
-        "really-small-events": "^1.1.0",
-        "snap-db": "^1.1.1"
-      }
-    },
-    "@nativescript-community/typeorm": {
-      "version": "0.2.28-1",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/typeorm/-/typeorm-0.2.28-1.tgz",
-      "integrity": "sha512-2/SlK8c1SR6to6zryysGSKBSczhiXFziccWOU6R00nyjsQj3fJbxLfKDJIZyNefpHvrnpHy3VjWLsXmDXBwCbQ==",
-      "peer": true,
-      "requires": {
-        "@sqltools/formatter": "1.2.2",
-        "app-root-path": "^3.0.0",
-        "buffer": "^5.5.0",
-        "chalk": "^4.1.0",
-        "cli-highlight": "^2.1.4",
-        "debug": "^4.1.1",
-        "dotenv": "^8.2.0",
-        "glob": "^7.1.6",
-        "js-yaml": "^3.14.0",
-        "mkdirp": "^1.0.4",
-        "reflect-metadata": "^0.1.13",
-        "sha.js": "^2.4.11",
-        "tslib": "^1.13.0",
-        "xml2js": "^0.4.23",
-        "yargonaut": "^1.1.2",
-        "yargs": "^16.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "peer": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "peer": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "peer": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "peer": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "@nativescript-community/ui-collectionview": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz",
-      "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg=="
+      "version": "4.0.31",
+      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.31.tgz",
+      "integrity": "sha512-kWtupfe+zr2Vj5hLfie/xxlFYLtLbBS6WrDBUD9z1cJYIZRf9KQxwl8z4wJ2dtQ51dlt1r8CJZgpgRbMTk5xQA=="
     },
     "@nativescript/android": {
       "version": "8.0.0",
@@ -5882,21 +5152,14 @@
       "dev": true
     },
     "@nativescript/core": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.5.tgz",
-      "integrity": "sha512-61u5zo8I5XK6agqrAS2d0JAfOiVJ1kyAMi7VqkyXQohSsjOAK4CAfCAeIvaZf4vd3yeAnUWiL6UvCYt/Ot5srQ==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.6.tgz",
+      "integrity": "sha512-w9fmuzUrKUblHbkmApMNWExgFZewZCnwf8A2ymcdLsftvljXrDhztbIgQD4aDis61OaqE1N42UToYPpUkaw5pw==",
       "requires": {
         "@nativescript/hook": "~2.0.0",
         "css-tree": "^1.1.2",
         "reduce-css-calc": "^2.1.7",
         "tslib": "~2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-        }
       }
     },
     "@nativescript/hook": {
@@ -5997,46 +5260,6 @@
         "webpack-virtual-modules": "0.4.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "sass": {
           "version": "1.32.8",
           "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
@@ -6045,15 +5268,6 @@
           "requires": {
             "chokidar": ">=2.0.0 <4.0.0"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -6098,26 +5312,20 @@
       }
     },
     "@polka/url": {
-      "version": "1.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
-      "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
+      "version": "1.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
+      "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
       "dev": true
     },
-    "@sqltools/formatter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz",
-      "integrity": "sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==",
-      "peer": true
-    },
     "@triniwiz/nativescript-accelerometer": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz",
       "integrity": "sha512-LKwlNaIWJPEbFKsPwA5vndqrKBUqE9dK9wdi/LsHs0Nl6pfMI7fPkBPoGW7UvVSMqy4s4d35Q0FDbKXR1t796A=="
     },
     "@types/eslint": {
-      "version": "7.2.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
-      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "version": "7.2.11",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.11.tgz",
+      "integrity": "sha512-WYhv//5K8kQtsSc9F1Kn2vHzhYor6KpwPbARH7hwYe3C3ETD0EVx/3P5qQybUoaBEuUa9f/02JjBiXFWalYUmw==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -6147,9 +5355,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
-      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
+      "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
       "dev": true
     },
     "@types/parse-json": {
@@ -6175,6 +5383,58 @@
         "vue-template-es2015-compiler": "^1.9.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "postcss": {
           "version": "7.0.35",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -6353,8 +5613,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -6369,8 +5628,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -6403,8 +5661,7 @@
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-0.2.7.tgz",
       "integrity": "sha512-+GZH2wOKNZOBI4OOPmzpo4cs6mW297sn6fgIk1dUI08jGjhAaEwvC39mN2gJAg2lmAQJ1rBkFqKWonL3Zz6PVA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-private-methods": {
       "version": "0.3.3",
@@ -6451,22 +5708,13 @@
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
-      },
-      "dependencies": {
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        }
       }
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ansi-colors": {
       "version": "4.1.1",
@@ -6483,67 +5731,39 @@
     "ansi-regex": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "devOptional": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       }
     },
     "any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
     },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
-    "app-root-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
-      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
-      "peer": true
-    },
     "arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "peer": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      },
-      "dependencies": {
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-          "peer": true
-        }
-      }
-    },
-    "array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
-      "optional": true,
-      "peer": true
-    },
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -6621,7 +5841,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true
+      "dev": true
     },
     "bluebird": {
       "version": "3.7.2",
@@ -6658,7 +5878,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -6676,16 +5896,6 @@
         "node-releases": "^1.1.71"
       }
     },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "peer": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -6710,21 +5920,20 @@
       "dev": true
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "devOptional": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       }
     },
     "chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -6746,6 +5955,7 @@
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
       "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "highlight.js": "^10.7.1",
@@ -6753,57 +5963,13 @@
         "parse5": "^5.1.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.0",
         "yargs": "^16.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -6822,19 +5988,19 @@
       }
     },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "devOptional": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "devOptional": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "colorette": {
       "version": "1.2.2",
@@ -6842,19 +6008,6 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "command-line-args": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
-      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "array-back": "^3.0.1",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
-      }
-    },
     "commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -7066,6 +6219,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -7099,7 +6253,8 @@
     "dotenv": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+      "dev": true
     },
     "dotenv-defaults": {
       "version": "2.0.1",
@@ -7126,15 +6281,16 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.728",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
-      "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
+      "version": "1.3.738",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
+      "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
       "dev": true
     },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -7204,12 +6360,14 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
     },
     "eslint-scope": {
       "version": "5.1.1",
@@ -7221,12 +6379,6 @@
         "estraverse": "^4.1.1"
       }
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "peer": true
-    },
     "esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -7274,10 +6426,10 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "peer": true
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "fast-glob": {
       "version": "3.2.5",
@@ -7314,17 +6466,11 @@
         "reusify": "^1.0.4"
       }
     },
-    "figlet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
-      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww==",
-      "peer": true
-    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -7340,16 +6486,6 @@
         "pkg-dir": "^4.1.0"
       }
     },
-    "find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "array-back": "^3.0.1"
-      }
-    },
     "find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -7380,46 +6516,6 @@
         "tapable": "^1.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -7449,15 +6545,6 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -7493,6 +6580,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -7510,7 +6598,8 @@
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
     },
     "get-stream": {
       "version": "6.0.1",
@@ -7535,7 +6624,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -7590,28 +6679,11 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "peer": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "peer": true
-        }
-      }
-    },
     "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "devOptional": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
     },
     "hash-sum": {
       "version": "1.0.2",
@@ -7628,7 +6700,8 @@
     "highlight.js": {
       "version": "10.7.2",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
-      "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="
+      "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+      "dev": true
     },
     "html-entities": {
       "version": "1.4.0",
@@ -7646,14 +6719,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "peer": true
+      "dev": true
     },
     "ignore": {
       "version": "5.1.8",
@@ -7711,7 +6777,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -7729,18 +6795,19 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "devOptional": true
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
     },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -7749,7 +6816,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true
+      "dev": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -7799,23 +6866,6 @@
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "js-tokens": {
@@ -7824,16 +6874,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "peer": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -7889,12 +6929,6 @@
       "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
       "dev": true
     },
-    "levenshtein-edit-distance": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/levenshtein-edit-distance/-/levenshtein-edit-distance-2.0.5.tgz",
-      "integrity": "sha512-Yuraz7QnMX/JENJU1HA6UtdsbhRzoSFnGpVGVryjQgHtl2s/YmVgmNYkVs5yzVZ9aAvQR9wPBUH3lG755ylxGA==",
-      "peer": true
-    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -7933,13 +6967,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "optional": true,
-      "peer": true
-    },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -8082,12 +7109,14 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
       "requires": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -8153,7 +7182,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "devOptional": true
+      "dev": true
     },
     "npm-run-path": {
       "version": "4.0.1",
@@ -8167,7 +7196,8 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
     },
     "once": {
       "version": "1.4.0",
@@ -8236,12 +7266,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parent-require": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz",
-      "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=",
-      "peer": true
-    },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -8257,12 +7281,14 @@
     "parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
     },
     "parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
       "requires": {
         "parse5": "^6.0.1"
       },
@@ -8270,7 +7296,8 @@
         "parse5": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
         }
       }
     },
@@ -8292,9 +7319,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "path-type": {
@@ -8304,10 +7331,10 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-      "devOptional": true
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true
     },
     "pify": {
       "version": "2.3.0",
@@ -8418,8 +7445,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -8575,17 +7601,11 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
     },
-    "really-small-events": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/really-small-events/-/really-small-events-1.1.0.tgz",
-      "integrity": "sha512-iyh4pULyDYBMecekEYcP3ToJD3ZUdIPfZV9nx1C1lJfMguElkDAZvEMJegy8uE7eIROCuLsqh5r44fVro9nKFg==",
-      "peer": true
-    },
     "rechoir": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -8611,16 +7631,11 @@
         }
       }
     },
-    "reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "peer": true
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
     },
     "resolve": {
       "version": "1.20.0",
@@ -8673,12 +7688,13 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "sass": {
-      "version": "1.32.13",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
-      "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
+      "version": "1.34.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
+      "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -8697,7 +7713,8 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "schema-utils": {
       "version": "2.7.1",
@@ -8725,16 +7742,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "peer": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -8781,12 +7788,12 @@
       }
     },
     "sirv": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
-      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
+      "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
       "dev": true,
       "requires": {
-        "@polka/url": "^1.0.0-next.9",
+        "@polka/url": "^1.0.0-next.15",
         "mime": "^2.3.1",
         "totalist": "^1.0.0"
       }
@@ -8797,12 +7804,6 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
-    "snap-db": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/snap-db/-/snap-db-1.1.6.tgz",
-      "integrity": "sha512-KxsO5RnY70J48f6poy0qVm2WS8ZbqG0PUVP2fjd7dvlaCMZ/DxtDv5fhhIVwkP2lOmNQ9QsTFfDuCA7N+TF3qg==",
-      "peer": true
-    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -8870,6 +7871,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -8880,6 +7882,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.0"
       }
@@ -8891,12 +7894,12 @@
       "dev": true
     },
     "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "devOptional": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       }
     },
     "tapable": {
@@ -8961,6 +7964,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
       "requires": {
         "any-promise": "^1.0.0"
       }
@@ -8969,6 +7973,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
       "requires": {
         "thenify": ">= 3.1.0 < 4"
       }
@@ -8983,7 +7988,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -9013,46 +8018,6 @@
         "semver": "^7.3.4"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -9071,15 +8036,6 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -9102,22 +8058,15 @@
       }
     },
     "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "peer": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
     },
     "typescript": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
-      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="
-    },
-    "typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
+      "dev": true
     },
     "universalify": {
       "version": "2.0.0",
@@ -9149,7 +8098,8 @@
     "vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
+      "dev": true
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
@@ -9233,13 +8183,12 @@
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-      "requires": {}
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
     "watchpack": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
-      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
+      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
       "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
@@ -9323,60 +8272,11 @@
         "ws": "^7.3.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
         "commander": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
           "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
           "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -9473,33 +8373,11 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
       }
     },
     "wrappy": {
@@ -9511,26 +8389,7 @@
       "version": "7.4.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
       "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
-      "dev": true,
-      "requires": {}
-    },
-    "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "peer": true,
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "dependencies": {
-        "xmlbuilder": {
-          "version": "11.0.1",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-          "peer": true
-        }
-      }
+      "dev": true
     },
     "xmlbuilder": {
       "version": "9.0.7",
@@ -9545,7 +8404,8 @@
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
     },
     "yallist": {
       "version": "2.1.2",
@@ -9559,63 +8419,11 @@
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
-    "yargonaut": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
-      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
-      "peer": true,
-      "requires": {
-        "chalk": "^1.1.1",
-        "figlet": "^1.1.1",
-        "parent-require": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "peer": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "peer": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "peer": true
-        }
-      }
-    },
     "yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -9629,7 +8437,8 @@
     "yargs-parser": {
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true
     },
     "yn": {
       "version": "3.1.1",
diff --git a/tsconfig.json b/tsconfig.json
index c0ea2af0..d381e021 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
     "lib": ["dom", "es2017"],
     "sourceMap": true,
     "noEmitHelpers": true,
-    "importHelpers": true,
+    "importHelpers": false, // Must be false to create custom android componentt
     "baseUrl": ".",
     "paths": {
       "~/*": ["app/*"],
diff --git a/webpack.config.js b/webpack.config.js
index c31f14bb..bc678552 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,20 @@
 const webpack = require('@nativescript/webpack')
+const path = require('path')
 
 module.exports = (env) => {
   webpack.init(env)
+  const platform = webpack.Utils.platform.getPlatformName()
+  webpack.chainWebpack((config) => {
+    if (platform === 'android') {
+      const appComponents = [
+        '@nativescript/core/ui/frame',
+        '@nativescript/core/ui/frame/activity',
+        path.resolve(__dirname, 'app/ForegroundService.js'),
+      ]
+      appComponents.map((component) => {
+        config.entry('bundle').add(component)
+      })
+    }
+  })
   return webpack.resolveConfig()
 }

From e3d690e42d46e2bce674adbf43f6d635a0056a68 Mon Sep 17 00:00:00 2001
From: vishnuraghavb <design@vishnuraghav.com>
Date: Wed, 26 May 2021 21:14:50 +0530
Subject: [PATCH 3/4] implemented foreground service for timer alerts

---
 app/ForegroundService.js                      | 78 ++++++++-----------
 app/components/CookingTimer.vue               | 73 +++++++++--------
 app/components/sub/Timer.vue                  |  2 +-
 app/main.ts                                   | 58 ++++++++++++--
 .../Android/src/main/AndroidManifest.xml      |  4 +-
 app/shared/utils.ts                           | 78 +++++++++++--------
 package-lock.json                             | 36 ++++-----
 7 files changed, 189 insertions(+), 140 deletions(-)

diff --git a/app/ForegroundService.js b/app/ForegroundService.js
index dad1177b..3f2ac675 100644
--- a/app/ForegroundService.js
+++ b/app/ForegroundService.js
@@ -1,51 +1,39 @@
-var ForegroundService = /** @class */ (function(_super) {
-  __extends(ForegroundService, _super)
-  function ForegroundService() {
-    return (_super !== null && _super.apply(this, arguments)) || this
-  }
-  ForegroundService.prototype.onStartCommand = function(
-    intent,
-    flags,
-    startId
-  ) {
+import { TimerNotif } from './shared/utils'
+const superProto = android.app.Service.prototype
+android.app.Service.extend('com.tns.ForegroundService', {
+  onStartCommand: function(intent, flags, startId) {
     console.log('onStartCommand')
-    _super.prototype.onStartCommand.call(this, intent, flags, startId)
+    superProto.onStartCommand.call(this, intent, flags, startId)
     return android.app.Service.START_STICKY
-  }
-  ForegroundService.prototype.onCreate = function() {
+  },
+  onCreate: function() {
     console.log('onCreate')
-    _super.prototype.onCreate.call(this)
-    this.startForeground(1, this.getNotification())
-  }
-  ForegroundService.prototype.onBind = function(intent) {
-    return _super.prototype.onBind.call(this, intent)
-  }
-  ForegroundService.prototype.onUnbind = function(intent) {
-    return _super.prototype.onUnbind.call(this, intent)
-  }
-  ForegroundService.prototype.onDestroy = function() {
+    superProto.onCreate.call(this)
+    this.startForeground(777, this.getNotification())
+  },
+  onBind: function(intent) {
+    return superProto.onBind.call(this, intent)
+  },
+  onUnbind: function(intent) {
+    return superProto.onUnbind.call(this, intent)
+  },
+  onDestroy: function() {
     console.log('onDestroy')
     this.stopForeground(true)
-  }
-  ForegroundService.prototype.getNotification = function() {
-    var channel = new android.app.NotificationChannel(
-      'channel_01',
-      'ForegroundService Channel',
-      android.app.NotificationManager.IMPORTANCE_DEFAULT
+  },
+  getNotification: function() {
+    return TimerNotif.getNotification(
+      {
+        bID: 'bringToFront',
+        cID: 'cti',
+        cName: 'Cooking Timer info',
+        description: `0 ongoing, 0 paused`,
+        nID: 777,
+        priority: -2,
+        sound: null,
+        title: 'EnRecipes is running',
+      },
+      this.getApplicationContext()
     )
-    var notificationManager = this.getSystemService(
-      android.content.Context.NOTIFICATION_SERVICE
-    )
-    notificationManager.createNotificationChannel(channel)
-    var builder = new android.app.Notification.Builder(
-      this.getApplicationContext(),
-      'channel_01'
-    )
-    return builder.build()
-  }
-  ForegroundService = __decorate(
-    [JavaProxy('com.tns.ForegroundService')],
-    ForegroundService
-  )
-  return ForegroundService
-})(android.app.Service)
+  },
+})
diff --git a/app/components/CookingTimer.vue b/app/components/CookingTimer.vue
index c7367ff3..1f70c6a7 100644
--- a/app/components/CookingTimer.vue
+++ b/app/components/CookingTimer.vue
@@ -19,7 +19,6 @@
           <Timer
             v-for="(timer, i) in activeTimers"
             :key="timer.id"
-            ref="singleTimer"
             :timer="timer"
             :timerIndex="i"
             :formattedTime="formattedTime"
@@ -62,21 +61,23 @@ import {
   ApplicationSettings,
   AndroidApplication,
   Utils,
+  Device,
 } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
 
 import Action from "./modals/Action.vue";
-import CookingTimer from "./CookingTimer.vue";
 import CTSettings from "./settings/CTSettings.vue";
 import TimePickerHMS from "./modals/TimePickerHMS.vue";
+import TimerReminder from "./modals/TimerReminder.vue";
 import Timer from "./sub/Timer.vue";
 import Toast from "./sub/Toast.vue";
 import SnackBar from "./sub/SnackBar.vue";
 
 import * as utils from "~/shared/utils";
-// import { fgs } from "~/foreground.android";
 import { EventBus } from "~/main";
-let undoTimer;
+let undoTimer,
+  firingTimers = [];
+declare const com: any;
 
 export default {
   components: { Timer, Toast, SnackBar },
@@ -177,33 +178,12 @@ export default {
         cID: "cti",
         cName: "Cooking Timer info",
         description: `${ongoingCount} ongoing, ${pausedCount} paused`,
-        nID: 999,
+        nID: 777,
         priority: -2,
         sound: null,
         title: localize("timer"),
       });
-      if (activeCount <= 0) utils.TimerNotif.clear(999);
-    },
-    intentListener({ intent, android }) {
-      let ct = "CookingTimer";
-      let action = (intent || android).getStringExtra("action");
-      console.log("calling: ", action);
-      let comp = this.currentComponent;
-      if (action == "open_timer" && this.currentComponent != ct) {
-        let openTimer = setInterval(() => {
-          if (comp == ct) clearInterval(openTimer);
-          else {
-            if (comp == "CTSettings") this.$navigateBack();
-            else this.$navigateTo(CookingTimer);
-            comp = ct;
-          }
-          Application.off(Application.launchEvent, this.intentListener);
-          Application.android.off(
-            AndroidApplication.activityNewIntentEvent,
-            this.intentListener
-          );
-        }, 250);
-      }
+      if (activeCount <= 0) this.foregroundService(false);
     },
     fireTimer(timer) {
       console.log("firing");
@@ -230,18 +210,39 @@ export default {
         console.log(action, "firing");
         EventBus.$emit(bID, action);
       });
+      firingTimers.push(timer);
+      // if (firingTimers.length == 1) {
+      //   this.$showModal(TimerReminder, {
+      //     fullscreen: true,
+      //     props: {
+      //       timers: firingTimers,
+      //       stop: this.stopFiringTimers,
+      //       formattedTime: this.formattedTime,
+      //     },
+      //   });
+      // }
     },
-    startForegroundService() {
+    stopFiringTimers() {
+      firingTimers.forEach((e) => utils.TimerNotif.clear(e.id));
+      firingTimers = [];
+    },
+    openReminder() {},
+    foregroundService(bool) {
       const ctx = Utils.ad.getApplicationContext();
-      const intent = new android.content.Intent();
-      intent.setClassName(ctx, "com.tns.ForegroundService");
-      ctx.startService(intent);
+      const intent = new android.content.Intent(
+        ctx,
+        com.tns.ForegroundService.class
+      );
+      if (bool)
+        parseInt(Device.sdkVersion) < 26
+          ? ctx.startService(intent)
+          : ctx.startForegroundService(intent);
+      else ctx.stopService(intent);
     },
 
     // DATA HANDLERS
     addTimer() {
-      // fgs.class
-      this.startForegroundService();
+      this.foregroundService(true);
       this.$showModal(TimePickerHMS, {
         props: {
           title: "ntmr",
@@ -300,6 +301,7 @@ export default {
       if (!noUndo) {
         this.showUndoBar("tmrClr")
           .then(() => {
+            this.foregroundService(true);
             this.addActiveTimer({
               timer: temp,
               index,
@@ -385,11 +387,6 @@ export default {
     },
   },
   created() {
-    Application.on(Application.launchEvent, this.intentListener);
-    Application.android.on(
-      AndroidApplication.activityNewIntentEvent,
-      this.intentListener
-    );
     this.clearTimerInterval();
   },
 };
diff --git a/app/components/sub/Timer.vue b/app/components/sub/Timer.vue
index aa58df67..d1f5f912 100644
--- a/app/components/sub/Timer.vue
+++ b/app/components/sub/Timer.vue
@@ -4,9 +4,9 @@
     columns="auto, *, auto, auto, auto"
     class="singleTimer"
   >
+      <!-- :class="{ blink: done }" -->
     <Button
       class="ico"
-      :class="{ blink: done }"
       :text="done ? icon.ring : timer.isPaused ? icon.start : icon.pause"
       @tap="!done && toggleProgress()"
     />
diff --git a/app/main.ts b/app/main.ts
index dff0a56c..633e14e6 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -12,22 +12,38 @@ const keepScreenOn = () => {
     console.log('keepScreenOn')
     const window = Application.android.startActivity.getWindow()
     const windowMgr = android.view.WindowManager
-    window.addFlags(
+    const flags =
       windowMgr.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
-        windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
-        windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
+      windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
+      windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
+    window.addFlags(flags)
+    function clearFlags(args) {
+      args.cancel = true
+      window.clearFlags(flags)
+      Application.android.off(
+        AndroidApplication.activityBackPressedEvent,
+        clearFlags
+      )
+    }
+    Application.android.on(
+      AndroidApplication.activityBackPressedEvent,
+      clearFlags
     )
   }
 }
 Application.on(Application.resumeEvent, keepScreenOn)
 
-Application.on(Application.launchEvent, ({ android }) => {
+Application.on(Application.launchEvent, (args) => {
   console.log('launching')
-  if (android) androidLaunchEventLocalizationHandler()
+  if (args.android) {
+    androidLaunchEventLocalizationHandler()
+    intentListener(args)
+  }
 })
 
 import Vue from 'nativescript-vue'
 import EnRecipes from './components/EnRecipes.vue'
+import CookingTimer from './components/CookingTimer.vue'
 import store from './store'
 
 export const EventBus = new Vue()
@@ -46,3 +62,35 @@ new Vue({
   store,
   render: (h) => h(EnRecipes),
 }).$start()
+
+const intentListener = ({ intent, android }: any) => {
+  let ct = 'CookingTimer'
+  let action = (intent || android).getStringExtra('action')
+  console.log('calling: ', action)
+  if (action == 'open_timer' && store.state.currentComponent != ct) {
+    let openTimer = setInterval(() => {
+      let comp = store.state.currentComponent
+      if (comp == ct) clearInterval(openTimer)
+      else {
+        if (comp == 'CTSettings') Vue.navigateBack()
+        else {
+          Vue.navigateTo(CookingTimer)
+          store.commit('setComponent', 'CookingTimer')
+        }
+      }
+    }, 250)
+  }
+}
+Application.on(Application.launchEvent, () => {
+  Application.android.on(
+    AndroidApplication.activityNewIntentEvent,
+    intentListener
+  )
+})
+Application.on(Application.exitEvent, () => {
+  store.commit('setComponent', 'EnRecipes')
+  Application.android.off(
+    AndroidApplication.activityNewIntentEvent,
+    intentListener
+  )
+})
diff --git a/app/resources/Android/src/main/AndroidManifest.xml b/app/resources/Android/src/main/AndroidManifest.xml
index 3956f81d..f5e4faba 100644
--- a/app/resources/Android/src/main/AndroidManifest.xml
+++ b/app/resources/Android/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" tools:targetApi="28" />
+	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:targetApi="29" />
 	<uses-permission android:name="android.permission.CAMERA" tools:node="remove" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
diff --git a/app/shared/utils.ts b/app/shared/utils.ts
index 6623897d..ee37e93a 100644
--- a/app/shared/utils.ts
+++ b/app/shared/utils.ts
@@ -6,6 +6,7 @@ import {
   Color,
   path,
   knownFolders,
+  TimerInfo,
 } from '@nativescript/core'
 let timerOne
 declare const global, android, androidx, com, java, Array: any
@@ -318,39 +319,45 @@ export class TimerNotif {
     const NotifySrv = ctx.getSystemService(
       android.content.Context.NOTIFICATION_SERVICE
     )
+    // nID ? NotifySrv.cancel(nID) : NotifySrv.cancelAll()
     NotifySrv.cancel(nID)
   }
-  static show({
-    actions,
-    bID,
-    cID,
-    cName,
-    description,
-    nID,
-    priority,
-    sound,
-    title,
-    vibrate,
-  }: {
-    actions?: boolean
-    bID: string
-    cID: string
-    cName: string
-    description: string
-    nID: number
-    priority: number
-    sound: string
-    title: string
-    vibrate?: number
-  }) {
+
+  static getNotification(
+    {
+      actions,
+      bID,
+      cID,
+      cName,
+      description,
+      nID,
+      priority,
+      sound,
+      title,
+      vibrate,
+    }: {
+      actions?: boolean
+      bID: string
+      cID: string
+      cName: string
+      description: string
+      nID: number
+      priority: number
+      sound: string
+      title: string
+      vibrate?: number
+    },
+    ctx
+  ) {
     let sdkv: number = parseInt(Device.sdkVersion)
     let soundUri: any
     if (sound) soundUri = new android.net.Uri.parse(sound)
     const NotifyMgr = android.app.NotificationManager
-    let ctx = Utils.ad.getApplicationContext()
     const NotifySrv = ctx.getSystemService(
       android.content.Context.NOTIFICATION_SERVICE
     )
+    const NotificationCompat = androidx.core.app.NotificationCompat
+    const AudioManager = android.media.AudioManager
     if (sdkv >= 26) {
       const importance =
         priority > 0 ? NotifyMgr.IMPORTANCE_HIGH : NotifyMgr.IMPORTANCE_MIN
@@ -371,6 +378,7 @@ export class TimerNotif {
       if (sound) Channel.setSound(soundUri, audioAttributes)
       else Channel.setSound(null, null)
       Channel.setShowBadge(true)
+      Channel.setLockscreenVisibility(NotificationCompat.VISIBILITY_PUBLIC)
       NotifySrv.createNotificationChannel(Channel)
     }
 
@@ -390,7 +398,7 @@ export class TimerNotif {
     let actionInt1, actionInt2, actionPInt1, actionPInt2
     if (actions) {
       actionInt1 = new Intent(bID)
-      actionInt1.putExtra('action', 'delay')
+      actionInt1.putExtra('action', 'stop')
       actionPInt1 = PendingIntent.getBroadcast(
         ctx,
         2,
@@ -398,7 +406,7 @@ export class TimerNotif {
         PendingIntent.FLAG_UPDATE_CURRENT
       )
       actionInt2 = new Intent(bID)
-      actionInt2.putExtra('action', 'stop')
+      actionInt2.putExtra('action', 'delay')
       actionPInt2 = PendingIntent.getBroadcast(
         ctx,
         3,
@@ -408,8 +416,7 @@ export class TimerNotif {
     }
 
     // CREATE NOTIFICATION
-    const NotificationCompat = androidx.core.app.NotificationCompat
-    const AudioManager = android.media.AudioManager
+
     let icon = TimerNotif.getIcon(ctx, 'ic_stat_notify_silhouette')
     let builder = new NotificationCompat.Builder(ctx, cID)
       .setColor(new Color('#ff5200').android)
@@ -421,6 +428,7 @@ export class TimerNotif {
       .setSmallIcon(icon)
       .setTicker(title)
       .setAutoCancel(false)
+      .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
     if (sound) builder.setSound(soundUri, AudioManager.STREAM_ALARM)
     else builder.setSound(null)
     if (description) builder.setContentText(description)
@@ -428,13 +436,21 @@ export class TimerNotif {
     if (actions) {
       builder.setDeleteIntent(actionPInt2)
       builder.setFullScreenIntent(mainPInt, true)
-      builder.addAction(null, 'Delay', actionPInt1)
-      builder.addAction(null, 'Stop', actionPInt2)
+      builder.addAction(null, 'Stop', actionPInt1)
+      builder.addAction(null, 'Delay', actionPInt2)
     }
     let notification = builder.build()
     notification.flags =
       NotificationCompat.FLAG_INSISTENT | NotificationCompat.FLAG_ONGOING_EVENT
-    NotifySrv.notify(nID, notification)
+
+    return notification
+  }
+  static show(data) {
+    const ctx = Utils.ad.getApplicationContext()
+    const NotifySrv = ctx.getSystemService(
+      android.content.Context.NOTIFICATION_SERVICE
+    )
+    NotifySrv.notify(data.nID, TimerNotif.getNotification(data, ctx))
   }
 }
 
diff --git a/package-lock.json b/package-lock.json
index e86c34aa..9a322c11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1388,9 +1388,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001228",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
-      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
+      "version": "1.0.30001230",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
+      "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -1877,9 +1877,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.738",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
-      "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
+      "version": "1.3.739",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
+      "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -4718,9 +4718,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
@@ -5914,9 +5914,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001228",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
-      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
+      "version": "1.0.30001230",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
+      "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
       "dev": true
     },
     "chalk": {
@@ -6281,9 +6281,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.738",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
-      "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
+      "version": "1.3.739",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
+      "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
       "dev": true
     },
     "emoji-regex": {
@@ -8386,9 +8386,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
-      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "dev": true
     },
     "xmlbuilder": {

From a64020a1194aef7b194e16421edb214751b825ab Mon Sep 17 00:00:00 2001
From: vishnuraghavb <design@vishnuraghav.com>
Date: Thu, 27 May 2021 10:22:08 +0530
Subject: [PATCH 4/4] updated strings

---
 app/i18n/ar.json            | 4 ++--
 app/i18n/en-GB.default.json | 3 ++-
 app/i18n/fi.json            | 4 ++--
 app/i18n/ja.json            | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/i18n/ar.json b/app/i18n/ar.json
index 9101f4bf..ef1e8276 100644
--- a/app/i18n/ar.json
+++ b/app/i18n/ar.json
@@ -12,7 +12,7 @@
     "American": "أمريكية",
     "aNBtn": "أضف جديدة",
     "aNoBtn": "أضف ملاحظة",
-    "app.name": "",
+    "app.name": "EnRecipes",
     "appCrd": "شورك عبر EnRecipes. احصل عليه على F-Droid, IzzyOnDroid, أو متجر بلاي.",
     "Appetizers": "مقبلات",
     "appInfo": "EnRecipes كتاب طبخ مفتوح المصدر صديق للخصوصية يتيح لك إنشاء وصفاتك و إدارتها ومشاركتها",
@@ -70,7 +70,7 @@
     "editRec": "عدل الوصفة",
     "Egyptian": "مصرية",
     "English": "إنجليزية",
-    "EnRecipes": "",
+    "EnRecipes": "EnRecipes",
     "expBu": "صدر نسخة احتياطية كاملة",
     "expip": "جار التصدير",
     "expSuc": "نجح التصدير",
diff --git a/app/i18n/en-GB.default.json b/app/i18n/en-GB.default.json
index 2c8da6f3..de3748fd 100644
--- a/app/i18n/en-GB.default.json
+++ b/app/i18n/en-GB.default.json
@@ -298,7 +298,8 @@
   "delay": "Delay",
   "tmr": "Timer %s",
   "prstBtn": "PRESETS",
-  "tmrPrsts": "Timer presets",
+  "prsts": "Presets",
+  "delPrst": "You are about to delete %s from the presets",
   "fwr": "for which recipe?",
   "aTPrst": "Added to presets",
   "tmrSnd": "Timer sound",
diff --git a/app/i18n/fi.json b/app/i18n/fi.json
index f835d7f6..8c3274fc 100644
--- a/app/i18n/fi.json
+++ b/app/i18n/fi.json
@@ -12,7 +12,7 @@
     "American": "amerikkalainen",
     "aNBtn": "LISÄÄ UUSI",
     "aNoBtn": "LISÄÄ HUOMAUTUS",
-    "app.name": "",
+    "app.name": "EnRecipes",
     "appCrd": "Jaettu EnRecipesin kautta. Lataa se F-Droidista, IzzyOnDroidista tai Play Storesta.",
     "Appetizers": "Alkupalat",
     "appInfo": "EnRecipes on avoimen lähdekoodin, yksityisyyden suojaa kunnioittava digitaalinen keittokirja, jonka avulla voit luoda, hallita ja jakaa reseptejäsi",
@@ -70,7 +70,7 @@
     "editRec": "Muokkaa resepti",
     "Egyptian": "egyptiläinen",
     "English": "englantilainen",
-    "EnRecipes": "",
+    "EnRecipes": "EnRecipes",
     "expBu": "Vie koko varmuuskopio",
     "expip": "Vienti käynnissä",
     "expSuc": "",
diff --git a/app/i18n/ja.json b/app/i18n/ja.json
index 63c97b84..2167f57e 100644
--- a/app/i18n/ja.json
+++ b/app/i18n/ja.json
@@ -12,6 +12,7 @@
     "American": "アメリカ料理",
     "aNBtn": "新しく追加",
     "aNoBtn": "メモを追加",
+    "app.name": "EnRecipes",
     "appCrd": "EnRecipesから共有されました。F-DroidかIzzyOnDroidかPlayストアからダウンロード出来ます。",
     "Appetizers": "前菜",
     "appInfo": "EnRecipesはレシピを作成・管理・共有することができる、オープンソースでプライバシーに配慮したデジタル料理本です",
@@ -69,6 +70,7 @@
     "editRec": "レシピを編集する",
     "Egyptian": "エジプト料理",
     "English": "イングランド料理",
+    "EnRecipes": "EnRecipes",
     "expBu": "バックアップをエクスポート",
     "expip": "エクスポートを実行中",
     "expSuc": "エクスポートに成功",