diff --git a/app/app.scss b/app/app.scss
index 215e0605..927e684e 100644
--- a/app/app.scss
+++ b/app/app.scss
@@ -1,225 +1,196 @@
-// NativeScript core theme
-// @see https://docs.nativescript.org/ui/theme
-@import '~@nativescript/theme/core'; // Override variables here
-$gray0: #fff;
-$gray1: #f0f0f0;
-$gray2: #e0e0e0;
-$gray3: #d1d1d1;
-$gray4: #c2c2c2;
-$gray5: #858585;
-$gray6: #575757;
-$gray7: #393939;
-$gray8: #292929;
-$gray9: #1a1a1a;
-$gray10: #000;
+$gray0: #f8f9fa;
+$gray1: #f1f3f5;
+$gray2: #e9ecef;
+$gray3: #dee2e6;
+$gray4: #ced4da;
+$gray5: #adb5bd;
+$gray6: #868e96;
+$gray7: #495057;
+$gray8: #343a40;
+$gray9: #212529;
+$gray10: #000000;
 $orange: #ff5200;
-$fabRipple: #ffa94d;
-$red: #c92a2a;
-$breakfast: #ffa94d;
-$lunch: #69db7c;
-$dinner: #4dabf7;
-$snacks: #9775fa; // Global SCSS styling
-// @see https://docs.nativescript.org/ui/styling
-.ns-modal,
+
 Page {
-  font-family: 'Orkney-Regular';
+  font-family: "Inter-Medium";
+  font-size: 14;
 }
-.orkm {
-  font-family: 'Orkney-Medium';
+.tb {
+  font-family: "Inter-Bold";
 }
-.er {
-  font-family: 'enrecipes';
+.ico {
+  font-family: "enrecipes";
   font-size: 24;
   vertical-alignment: center;
-  &.small {
-    padding: 0;
+  &.sm {
     font-size: 16;
   }
 }
-.today {
-  color: $orange;
+.tac {
+  text-align: center;
 }
-.ns-light {
-  .count,
-  ActionBar,
-  ListPicker,
+.tw {
+  text-wrap: true;
+}
+.pageTitle {
+  @extend .tb;
+  @extend .tw;
+  font-size: 25;
+  padding: 16;
+}
+.Light {
+  color: $gray9;
+  background: $gray1;
   Page,
-  SearchBar,
-  TabStripItem,
-  Tabs {
-    color: $gray9;
+  .filters {
     background: $gray1;
   }
-  .hr {
+  TextField,
+  TextView {
+    border-color: $gray3;
+    placeholder-color: $gray5;
+  }
+  .modalInput {
     border-color: $gray2;
   }
-  .fieldLabel,
-  .sd {
-    background: $gray1;
-  }
-  .combination,
-  .hasPlans,
-  .overviewItem,
-  .recipeItem,
-  .titleContainer {
+  .appbar,
+  .modal,
+  .topPlate {
     background: $gray0;
   }
-  .combinationToken,
-  .note,
-  .tag {
-    background: $gray2;
-  }
+  .fieldLabel,
   .dayName,
-  .group-info,
-  .option .info {
+  .sub {
     color: $gray6;
   }
-  .done .count {
-    color: $gray0;
-  }
-  .imageHolder {
+  .imgHolder {
     color: $gray3;
     background: $gray2;
   }
-  .selected {
-    background: $gray2;
-  }
-  .activeDay {
+  .snackBar {
     color: $gray1;
     background: $gray9;
   }
-  .dayContainer,
-  .instruction {
-    border-color: $gray9;
-  }
-  MDProgress {
+  Progress {
     progress-background-color: $gray4;
   }
-  MDFloatingActionButton {
-    color: $gray0;
-  }
-  .appIconContainer {
-    background: $orange;
-  }
-  .emptyState .icon {
-    color: $gray4;
+  .fab,
+  .hlMsg {
+    color: $gray1;
   }
 }
-.ns-dark {
-  .count,
-  ActionBar,
-  ListPicker,
+.Dark {
+  color: $gray1;
+  background: $gray9;
   Page,
-  SearchBar,
-  TabStripItem,
-  Tabs {
-    color: $gray2;
+  .filters {
     background: $gray9;
   }
-  .hr {
+  TextField,
+  TextView {
     border-color: $gray8;
+    placeholder-color: $gray6;
   }
-  .fieldLabel,
-  .sd {
-    background: $gray9;
+  .modalInput {
+    border-color: $gray7;
   }
-  .combination,
-  .hasPlans,
-  .overviewItem,
-  .recipeItem,
-  .titleContainer {
+  .appbar,
+  .modal,
+  .topPlate {
+    color: $gray0;
     background: $gray8;
   }
-  .combinationToken,
-  .note,
-  .tag {
-    background: $gray10;
-  }
+  .fieldLabel,
   .dayName,
-  .group-info,
-  .option .info {
+  .sub {
     color: $gray5;
   }
-  .done .count {
-    color: $gray10;
-  }
-  .imageHolder {
+  .imgHolder {
     color: $gray9;
     background: $gray10;
   }
-  .selected {
-    background: $gray6;
-  }
-  .activeDay {
+  .snackBar {
     color: $gray9;
-    background: $gray2;
+    background: $gray1;
   }
-  .dayContainer,
-  .instruction {
-    border-color: $gray2;
-  }
-  MDProgress {
+  Progress {
     progress-background-color: $gray5;
   }
-  MDFloatingActionButton {
+  .fab,
+  .hlMsg {
     color: $gray9;
   }
-  .appIconContainer {
-    background: $orange;
+}
+.Black {
+  color: $gray2;
+  background: $gray10;
+  Page {
+    background: $gray10;
   }
-  .emptyState .icon {
+  TextField,
+  TextView {
+    border-color: $gray9;
+    placeholder-color: $gray7;
+  }
+  .modalInput {
+    border-color: $gray8;
+  }
+  .appbar,
+  .modal,
+  .topPlate {
+    color: $gray1;
+    background: $gray9;
+  }
+  .fieldLabel,
+  .dayName,
+  .sub {
     color: $gray6;
   }
+  .imgHolder {
+    color: $gray10;
+    background: $gray9;
+  }
+  .snackBar {
+    color: $gray10;
+    background: $gray2;
+  }
+  Progress {
+    progress-background-color: $gray5;
+  }
+  .fab,
+  .hlMsg {
+    color: $gray10;
+  }
+}
+TextField.combField,
+#searchBar {
+  border-color: transparent;
 }
 // -----------------------------
 // Elements
 TextField,
-TextView,
-TimePickerField {
+TextView {
   width: 100%;
-  border-width: 1;
-  font-size: 14;
-  padding: 13 12;
-  margin: 8 0 0;
-  border-radius: 4;
-  border-color: $gray5;
-  placeholder-color: $gray5;
+  padding: 14 8;
+  border-bottom-width: 1;
 }
 TextView {
-  line-height: 12;
+  line-height: 4;
 }
-ListPicker {
-  width: 25%;
-}
-SearchBar {
-  font-family: 'Orkney-Regular';
-  font-size: 14;
-  text-field-hint-color: $gray5;
-}
-TabView {
-  tab-text-color: $gray5;
+#searchBar {
+  padding-left: 0;
+  margin: 0;
 }
 .inputField {
-  margin-bottom: 8;
+  margin-bottom: 24;
 }
 .fieldLabel {
   font-size: 12;
-  margin-left: 8;
-  padding: 0 4;
 }
 .progressContainer {
   width: 100%;
 }
-.hr {
-  padding: 0;
-}
-// .category,
-// .group-header,
-.text-btn,
-MDActivityIndicator {
-  color: $orange;
-}
-MDProgress {
+Progress {
   progress-color: $orange;
 }
 Switch {
@@ -227,618 +198,434 @@ Switch {
   off-background-color: $gray5;
 }
 // -----------------------------
-// ActionBar
-ActionBar {
-  height: 64;
-  margin: 0;
-  padding: 0 8;
-  GridLayout {
-    padding: 0;
-    margin: 0;
-  }
-  MDButton.er {
-    padding: 0;
-    margin: 0;
-  }
-  .title {
-    padding-left: 12;
-    text-align: left;
-    font-size: 18;
-  }
-}
-// -----------------------------
 // Side Drawer
-.sd {
-  padding: 8;
-}
-.sd-item {
-  border-radius: 4;
-  height: 48;
-  vertical-alignment: center;
-  .er {
-    font-size: 24;
-    margin: 0 24 0 0;
-  }
-  &.selected .er {
-    color: $orange;
-  }
-  &.selected {
-    color: $orange;
-    background: rgba($orange, 0.1);
-    .mdr {
-      ripple-color: transparent;
-    }
-  }
-  // prettier-ignore
-  Label {
-    padding: 2 16 0 0;
-    font-size: 14;
-    vertical-alignment: center;
-    &.er {
-      padding: 0 0 0 16;
-    }
-  }
-  .mdr {
-    padding: 0 16;
-  }
-  MDButton.er {
-    margin: 0;
-  }
-  .recipeCount {
-    padding: 4;
-    font-size: 14;
-    margin: 0 8 0 0;
+.segment {
+  border-radius: 8;
+  margin: 0 4 0 0;
+  padding: 0 12;
+  .value {
+    padding-left: 8;
     vertical-alignment: center;
   }
-}
-.sd-group-header {
-  width: 100%;
-  padding: 0 0 0 8;
-  MDButton.er {
-    margin: 0;
-  }
-  .filterPath {
-    line-height: 6;
+  &.select {
+    color: $orange;
+    @extend .hl;
   }
 }
-.noTags {
-  font-size: 14;
-  text-align: center;
-  margin: 8;
-}
-.mdr {
-  border-radius: 4;
-}
-MDButton {
+Button {
+  background-color: transparent;
+  z-index: 0;
   padding: 8;
+  border-radius: 8;
   min-width: 0;
   min-height: 0;
-  &.er {
+  &:active {
+    @extend .fade;
+  }
+  &.ico {
     padding: 0;
+    margin: 0;
     width: 48;
     height: 48;
-    margin: 0 8 0 0;
-    border-radius: 99;
   }
-}
-MDButton,
-.mdr {
-  ripple-color: rgba($gray5, 0.2);
+  &.text {
+    @extend .tb;
+    horizontal-alignment: left;
+    color: $orange;
+  }
+  &.big {
+    margin-top: 8;
+    padding: 16 0;
+  }
+  &.sm {
+    font-size: 12;
+    padding: 12;
+  }
+  &.min {
+    width: 40;
+    height: 40;
+  }
+  &.x {
+    width: 32;
+    height: 32;
+    min-width: 0;
+    margin: 0 0 0 8;
+    vertical-alignment: center;
+  }
+  &.rate {
+    margin: 0 4 0 0;
+    width: 32;
+    height: 32;
+  }
 }
 // -----------------------------
 // HOME
-.emptyStateContainer {
-  width: 100%;
-  height: 100%;
-}
 .emptyState {
-  line-height: 8;
-  padding: 0 32;
-  text-align: center;
-  font-size: 14;
-  horizontal-alignment: center;
-  .icon {
-    font-size: 64;
-    text-align: center;
-    margin-bottom: 16;
-  }
-  .logo {
-    width: 64;
-    margin-bottom: 16;
+  padding: 16 16 8;
+  Label {
+    @extend .tw;
   }
   .title {
-    font-size: 18;
-    text-align: center;
-    padding: 0;
-    horizontal-alignment: center;
-    .er {
-      font-size: 24;
-      vertical-alignment: center;
-    }
-  }
-  .searchAll {
-    font-size: 14;
-    width: auto;
-    height: auto;
-    min-width: 0;
-    padding: 12;
-    border-radius: 4;
-    letter-spacing: 0;
-    // text-transform: none;
-    margin: 16;
-    color: $orange;
-    horizontal-alignment: center;
+    @extend .tb;
+    font-size: 17;
   }
 }
 // -----------------------------
 // Recipe Items
-ListView {
-  font-size: 14;
+.recipeItem {
+  padding: 8 16;
+  .recipeInfo {
+    vertical-alignment: top;
+    padding: 4 0 4 8;
+  }
+  .title {
+    padding: 0 0 4;
+  }
+  .attributes {
+    padding-top: 2;
+    .attr {
+      font-size: 10;
+      padding: 0 6 1 2;
+    }
+  }
 }
-.recipeContainer {
+.simple .recipeInfo {
+  padding: 8 0;
+}
+.minimal .title {
   padding: 0;
 }
-.firstItem {
-  padding: 12 0 0;
+
+.grid {
+  padding: 8;
+  .recipeInfo {
+    padding: 8 8 0;
+  }
+  &.odd {
+    padding: 8 8 8 16;
+  }
+  &.even {
+    padding: 8 16 8 8;
+  }
 }
 .lastItem {
-  padding: 0 0 84;
+  margin-bottom: 128;
 }
-.layout1 {
-  padding: 0;
-  margin: 4 16;
-  border-radius: 4;
-  .recipeInfo {
-    margin: 0;
-    padding: 8;
-    .attr,
-    .category {
-      font-size: 10;
-      padding: 0;
-      margin: 0;
-    }
-    .title {
-      margin: 0;
-      padding: 2 0;
-    }
-    .attrContainer {
-      padding: 0;
-      .attr {
-        padding: 1 8 0 2;
-      }
-    }
-  }
+.selected {
+  @extend .hl;
 }
-.layout2 {
-  padding: 0;
-  margin: 4;
-  border-radius: 4;
-  .imageHolder {
-    vertical-alignment: center;
-    &.card {
-      border-radius: 4 4 0 0;
-      // prettier-ignore
-      Image {
-        border-radius: 4 4 0 0;
-      }
-    }
-  }
-  .recipeInfo {
-    margin: 0;
-    padding: 8;
-    .attr,
-    .category {
-      font-size: 10;
-      padding: 0;
-      margin: 0;
-    }
-    .title {
-      margin: 0;
-      padding: 2 0;
-    }
-  }
-  .tagsContainer {
-    padding: 4 0 0;
-  }
+.unselected {
+  background-color: transparent;
 }
-.tagsContainer {
-  padding: 2 0 0;
-  .tag {
-    font-size: 10;
-    padding: 1 4;
-    margin: 0 4 0 0;
-    line-height: 0;
-    border-radius: 2;
-  }
-}
-.imageHolder {
-  vertical-alignment: center;
-  &.card {
-    border-radius: 4 0 0 4;
-    // prettier-ignore
-    Image {
-      border-radius: 4 0 0 4;
-    }
-  }
-}
-.swipe-item {
-  margin: 0 8;
-  background: $red;
-  color: #fff;
-  height: 104;
-  border-radius: 4;
+.imgHolder {
+  border-radius: 8;
 }
 // -----------------------------
 // SETTINGS
-.group-header {
-  // text-transform: uppercase;
-  padding: 8;
-}
 .group-info {
-  text-align: center;
-  padding: 16;
-  line-height: 6;
-  // margin-top: 8;
-  border-radius: 4;
+  padding: 16 16 16 72;
+  line-height: 4;
 }
-.main-container {
-  padding: 8 8 88;
+.options-list {
   .option {
-    font-size: 14;
-    line-height: 6;
-    .er {
-      margin: 11 24 11 16;
+    padding: 14 8;
+    margin: 0 16;
+    .ico {
+      padding: 0;
+      margin: 0 24 0 16;
     }
-    .info {
+    .info,
+    .sub {
+      @extend .tw;
+    }
+    .sub {
       font-size: 12;
-      padding-top: 0;
-    }
-    StackLayout {
-      margin: 9 24 9 0;
     }
   }
+  .listSpace {
+    height: 72;
+  }
 }
+
 // -----------------------------
 // ABOUT
-.appIconContainer {
-  background: $orange;
-  padding: 24 0;
-  width: 100%;
-  border-radius: 4;
-  .appIcon {
-    height: 104;
+.app-info {
+  .icon {
+    margin: 16;
+    background: $orange;
+    border-radius: 99;
+    horizontal-alignment: center;
+  }
+  .name {
+    font-size: 17;
+  }
+  .info {
+    padding: 8 16 24;
+    line-height: 4;
   }
 }
 // -----------------------------
 // VIEW RECIPE
-.viewRecipe {
-  .attr,
-  .category,
-  .ingredient,
-  .tag,
-  .tagsTitle {
-    font-size: 14;
-  }
-  .attr,
-  .category {
-    margin: 0 12;
-  }
-  .small {
-    font-size: 10;
-  }
+.photo {
+  border-radius: 8;
+  margin: 24 16 0 0;
+  vertical-align: top;
+}
+.attribute {
+  margin: 8 16;
   .title {
-    font-size: 18;
-    line-height: 6;
-    padding: 0 12;
+    margin-right: 8;
+    font-size: 12;
+    color: $gray6;
   }
-  .ratingContainer {
-    margin: 16 8 8;
+  .value {
+    @extend .tb;
+    @extend .tw;
   }
-  .rate,
-  .rated {
-    padding: 0 8 0 0;
-  }
-  .rate {
-    color: $gray5;
-  }
-  .rated {
+  .clickable {
     color: $orange;
   }
-  .tagsContainer {
-    padding: 0;
-    margin: 12 12 0;
-    .tag {
-      padding: 2 6;
-      margin: 0 8 8 0;
-    }
-  }
-  .overviewContainer {
-    margin: 8 8 12;
-    .overviewItem {
-      border-radius: 4;
-      margin: 4;
-      android-elevation: 1;
-      .er {
-        padding: 16 0 0 16;
-        horizontal-alignment: left;
-      }
-      .itemCount {
-        font-size: 14;
-        padding: 8 16 16;
-      }
-    }
+}
+.ingredient {
+  padding: 0 16;
+  .value {
+    @extend .tw;
+    vertical-align: center;
+    padding: 14 0 14 16;
+    line-height: 4;
   }
+}
+.instruction {
+  padding: 0 16;
   .count {
-    width: 24;
-    height: 24;
-    margin: 0 0 0 8;
-    text-align: center;
-    vertical-alignment: top;
-    horizontal-alignment: center;
-    border-radius: 99;
-    border-width: 2;
-    border-color: $gray5;
+    @extend .tb;
+    font-size: 17;
   }
-  .instruction {
-    font-size: 14;
-    line-height: 6;
-    padding: 2 0 24 35;
-    margin: 0 0 0 19;
-    border-width: 0 0 0 2;
-    border-color: $gray5;
+  .value {
+    @extend .tw;
+    padding: 14 0 14 16;
+    line-height: 4;
   }
-  .instruction.noBorder {
-    border-color: transparent;
-  }
-  .done .count {
-    background: $orange;
-    border-color: $orange;
-  }
-  .done .instruction {
-    opacity: 0.4;
+}
+.done {
+  opacity: 0.5;
+  // @extend .fade;
+  .value {
     text-decoration: line-through;
   }
-  .combination {
-    margin: 0 16 8;
-    border-radius: 4;
-    font-size: 14;
-    .combinationTitle {
-      padding: 14 16;
-      margin: 0;
-      line-height: 6;
-    }
-  }
-  .note {
-    font-size: 14;
-    line-height: 6;
-    padding: 14 16;
-    margin: 0 0 8;
-    border-radius: 4;
-  }
+}
+.combination {
+  @extend .tw;
+  text-align: left;
+  padding: 16;
+  line-height: 4;
+}
+.note {
+  @extend .tw;
+  line-height: 4;
+  padding: 16 0;
 }
 // -----------------------------
-// FAB
-#btnFabContainer {
-  z-index: 100;
-  width: 100%;
-  height: 100%;
+// APPBAR
+.appbar {
+  z-index: 99;
+  min-height: 56;
+  margin: 8;
+  padding: 4;
+  border-radius: 10;
+  elevation: 16;
+  &.hlMsg {
+    background: $orange;
+  }
+  .title {
+    @extend .tb;
+    @extend .tw;
+    vertical-align: center;
+    line-height: 4;
+  }
+  .msg {
+    padding: 14 16;
+  }
+  .fab {
+    margin-left: 4;
+  }
 }
-MDFloatingActionButton {
-  width: 56;
-  height: 56;
-  margin: 16;
+.toolbar {
+  z-index: 98;
+  padding: 4;
+  margin-bottom: 0;
+  horizontal-alignment: left;
+  .tool {
+    padding: 0 12;
+    Label {
+      vertical-alignment: center;
+    }
+    .ico {
+      padding-right: 8;
+    }
+  }
+}
+.fab {
+  width: 48;
+  height: 48;
+  margin: 0 4 0 0;
+  border-radius: 8;
   background: $orange;
-  ripple-color: $fabRipple;
 }
 // -----------------------------
 // EDIT RECIPE
 .sectionTitle {
-  font-size: 18;
+  @extend .tb;
+  @extend .tw;
+  font-size: 21;
+  padding: 0;
+  margin: 32 0 16;
 }
-.text-btn {
-  font-size: 14;
-  horizontal-alignment: left;
-  padding: 12;
-  margin: 8 0 0;
-  min-width: 0;
-}
-MDButton.x {
-  margin: 8 0 0;
-  width: 32;
-  height: 32;
-  min-width: 0;
-  vertical-alignment: center;
+.countdown {
+  background-color: transparent;
+  width: 48;
+  height: 48;
+  z-index: 0;
+  font-size: 17;
+  color: $orange;
 }
 // -----------------------------
 // MEAL PLANNER
 .calendar {
   padding: 0 8;
   .navBtn {
-    horizontal-alignment: center;
     margin: 0;
   }
   .monthName {
     text-align: center;
     vertical-alignment: center;
-    font-size: 18;
-    padding: 24 0;
+    font-size: 17;
   }
   .dayName {
-    padding: 8 4;
+    margin: 8 0;
     font-size: 12;
     text-align: center;
   }
   .day {
-    font-size: 14;
-    margin: 4;
-    width: 32;
-    height: 32;
-    // horizontal-alignment: center;
-    border-radius: 99;
-    text-align: center;
+    border-radius: 8;
+  }
+  .hasPlans {
+    color: $orange;
+  }
+  .activeDay {
+    background-color: rgba($orange, 0.2);
   }
 }
 .dayPlan {
-  padding: 0 8 88;
+  padding: 16 16 80;
   width: 100%;
-  .plansContainer {
-    margin: 16 0 0 8;
-    padding: 0;
-    border-left-width: 8;
-    &.breakfast {
-      border-left-color: $breakfast;
-    }
-    &.lunch {
-      border-left-color: $lunch;
-    }
-    &.dinner {
-      border-left-color: $dinner;
-    }
-    &.snacks {
-      border-left-color: $snacks;
-    }
-    .periodLabel {
-      text-transform: capitalize;
-      vertical-alignment: center;
-      font-size: 14;
-      padding: 0 0 0 16;
-    }
-    .recipe {
-      margin: 0 8;
-      .titleContainer {
-        border-radius: 4;
-        margin: 0 0 8 8;
-      }
-      .recipeTitle {
-        font-size: 14;
-        padding: 14 16;
-        line-height: 6;
-      }
-    }
-    .x {
-      margin: 8 0 16 8;
-      vertical-alignment: center;
-    }
+  .periodLabel {
+    font-size: 17;
+    text-transform: capitalize;
+    vertical-align: center;
+  }
+  .recipeTitle {
+    @extend .tw;
+    text-align: left;
+    padding: 16 0;
+    line-height: 4;
   }
 }
 // -----------------------------
 // DIALOGS
-.dialogContainer {
-  max-width: 480;
+.modal {
+  max-width: 320;
   width: 100%;
-  color: $gray9;
-  background: $gray1;
-  font-size: 14;
-  &.dark {
-    color: $gray2;
-    background: $gray9;
+  border-radius: 10;
+  margin: 72 0;
+  .title {
+    @extend .tb;
+    @extend .tw;
+    padding: 16;
+    font-size: 21;
   }
-  .dialogIcon {
-    text-align: center;
-    padding: 32;
-    font-size: 48;
+  .input {
+    padding: 0 16 8;
   }
-  .dialogTitle {
-    line-height: 6;
-    padding: 24 24 16;
-    font-size: 18;
+  .description {
+    line-height: 4;
+    padding: 0 16 8;
   }
-  .dialogInput {
-    padding: 0 24 16;
+  ListPicker {
+    width: 25%;
+    height: 160;
   }
-  .dialogDescription {
-    line-height: 6;
-    padding: 0 24 8;
-  }
-  .actionItem {
+  .listItem {
+    @extend .tw;
+    width: 100%;
     letter-spacing: 0;
     text-transform: none;
-    line-height: 6;
-    padding: 13 24;
+    line-height: 4;
+    padding: 13 16;
     margin: 0;
-    border-radius: 1;
     background: transparent;
   }
-  .actionToggle {
-    background: $orange;
-  }
-  .actionsContainer {
-    padding: 8;
-  }
   .shareItem {
-    border-radius: 4;
-    margin: 0 16 16;
-    android-elevation: 1;
+    border-radius: 8;
+    margin: 0 8 8;
     text-align: center;
-    .er {
+    .ico {
       padding: 16 0 0;
     }
     .item {
+      @extend .tw;
       padding: 8 16 16;
     }
   }
-  .action {
-    font-size: 12;
-    padding: 12;
-    min-width: 0;
-    color: $orange;
+  .actions {
+    padding: 4;
   }
-  MDButton.actionIcon {
-    font-size: 14;
-    width: auto;
-    height: auto;
-    min-width: 0;
-    padding: 16 24;
-    border-radius: 4;
-    letter-spacing: 0;
-    text-transform: none;
-    margin: 0 16 16;
+  .filters {
+    padding: 8;
+    margin: 0 0 8;
   }
 }
+.noResInfo {
+  @extend .tac;
+  @extend .tw;
+  padding: 16;
+  line-height: 4;
+}
 // -----------------------------
-MDActivityIndicator {
+ActivityIndicator {
   width: 24;
   height: 24;
-  margin: 16 12;
+  margin: 12;
+  color: $orange;
 }
 // -----------------------------
 // Transitions
-.bounce-enter-active {
-  animation-name: bounce-in;
-  animation-duration: 1s;
+.hl {
+  animation-name: hl;
+  animation-duration: 0.2s;
   animation-fill-mode: forwards;
-  animation-timing-function: ease-in-out;
+  animation-timing-function: ease-out;
 }
-.bounce-leave-active {
-  animation-name: bounce-out;
-  animation-duration: 0.25s;
-  animation-fill-mode: forwards;
-}
-@keyframes bounce-in {
+@keyframes hl {
   0% {
-    transform: scale(0);
-    opacity: 0;
+    opacity: 0.5;
+    background-color: transparent;
   }
-  25% {
-    transform: scale(1.2);
+  100% {
     opacity: 1;
-  }
-  50% {
-    transform: scale(0.9);
-  }
-  75% {
-    transform: scale(1.1);
-  }
-  100% {
-    transform: scale(1);
+    background-color: rgba($orange, 0.2);
   }
 }
-@keyframes bounce-out {
+.fade {
+  animation-name: fade;
+  animation-duration: 0.2s;
+  animation-fill-mode: forwards;
+  animation-timing-function: ease-out;
+}
+@keyframes fade {
   0% {
-    transform: scale(1);
   }
   100% {
-    transform: scale(0);
-    opacity: 0;
+    opacity: 0.5;
   }
 }
diff --git a/app/components/App.vue b/app/components/App.vue
deleted file mode 100644
index dc5bc35a..00000000
--- a/app/components/App.vue
+++ /dev/null
@@ -1,496 +0,0 @@
-<template>
-  <Page
-    @loaded="onPageLoad"
-    actionBarHidden="true"
-    :androidStatusBarBackground="appTheme == 'Light' ? '#f0f0f0' : '#1A1A1A'"
-  >
-    <Drawer
-      @loaded="drawerLoad"
-      :gestureEnabled="gestures"
-      leftSwipeDistance="128"
-    >
-      <GridLayout ~leftDrawer rows="*, auto" columns="*" width="280" class="sd">
-        <StackLayout row="0">
-          <GridLayout
-            rows="48"
-            columns="auto, *, auto"
-            v-for="(item, index) in topmenu"
-            :key="index"
-            class="sd-item orkm mdr"
-            :class="{
-              selected: currentComponent === item.component,
-            }"
-            @tap="navigateTo(item.component, item.component, false)"
-          >
-            <Label col="0" class="er" :text="icon[item.icon]" />
-            <Label col="1" :text="`${item.title}` | L" />
-            <Label
-              class="recipeCount"
-              v-if="getRecipeCount(item.title)"
-              :text="getRecipeCount(item.title)"
-              col="2"
-            />
-          </GridLayout>
-          <GridLayout
-            class="sd-group-header orkm"
-            rows="auto"
-            columns="*, auto"
-            v-if="cuisinesWithRecipes.length"
-          >
-            <Label
-              class="filterPath"
-              verticalAlignment="center"
-              col="0"
-              :text="getCurrentPath | L"
-              textWrap="true"
-            />
-            <MDButton
-              :visibility="selectedCuisine ? 'visible' : 'hidden'"
-              variant="text"
-              @tap="previousRecipeFilter"
-              class="er"
-              col="2"
-              :text="icon.back"
-            />
-          </GridLayout>
-          <ScrollView height="100%">
-            <StackLayout>
-              <GridLayout
-                v-for="(item, index) in getRecipeList"
-                :key="index"
-                class="sd-item orkm mdr"
-                :class="{
-                  selected: selectedTag == item,
-                }"
-                columns="auto, *, auto"
-                @tap="setFilter && setRecipeFilter(item)"
-              >
-                <Label col="0" class="er" :text="icon[selectedFilterType]" />
-                <Label col="1" :text="`${item}` | L" />
-                <Label
-                  class="recipeCount"
-                  :text="getRecipeCount(item)"
-                  col="2"
-                />
-              </GridLayout>
-              <GridLayout
-                v-if="selectedFilterType == 'tag' && !tagsWithRecipes.length"
-                columns="*"
-                rows="*"
-              >
-                <Label class="noTags" :text="'noTs' | L" textWrap="true" />
-              </GridLayout>
-            </StackLayout>
-          </ScrollView>
-        </StackLayout>
-        <StackLayout row="1">
-          <StackLayout class="hr" margin="0 8 8"></StackLayout>
-          <GridLayout
-            rows="48"
-            columns="auto, *"
-            class="sd-item orkm mdr"
-            :class="{
-              selected: currentComponent == 'MealPlanner',
-            }"
-            @tap="navigateTo(MealPlanner, 'MealPlanner', true)"
-          >
-            <Label col="0" class="er" :text="icon.cal" />
-            <Label col="2" :text="'planner' | L" />
-          </GridLayout>
-
-          <!-- <GridLayout
-            rows="48"
-            columns="auto, *"
-            class="sd-item orkm mdr"
-            :class="{
-              selected: currentComponent == 'GroceryList',
-            }"
-            @tap="navigateTo(GroceryList, 'GroceryList', true)"
-          >
-            <Label col="0" class="er" :text="icon.bag" />
-            <Label col="2" :text="'grocery' | L" />
-          </GridLayout>
-          <GridLayout
-            rows="48"
-            columns="auto, *"
-            class="sd-item orkm mdr"
-            :class="{
-              selected: currentComponent == 'GroceryList',
-            }"
-            @tap="navigateTo(GroceryList, 'GroceryList', true)"
-          >
-            <Label col="0" class="er" :text="icon.price" />
-            <Label col="2" :text="'Price List' | L" />
-          </GridLayout> -->
-
-          <StackLayout class="hr" margin="8"></StackLayout>
-
-          <GridLayout
-            class="sd-item orkm mdr"
-            :class="{
-              selected: currentComponent == 'Settings',
-            }"
-            rows="48"
-            columns="auto, *"
-            @tap="navigateTo(Settings, 'Settings', true)"
-          >
-            <Label class="er" col="0" :text="icon.cog" />
-            <Label col="2" :text="'Settings' | L" />
-          </GridLayout>
-        </StackLayout>
-      </GridLayout>
-      <Frame ~mainContent id="main-frame">
-        <EnRecipes
-          ref="enrecipes"
-          :filterFavourites="filterFavourites"
-          :filterTrylater="filterTrylater"
-          :selectedCuisine="selectedCuisine"
-          :selectedCategory="selectedCategory"
-          :selectedTag="selectedTag"
-          :closeDrawer="closeDrawer"
-          :hijackGlobalBackEvent="hijackGlobalBackEvent"
-          :releaseGlobalBackEvent="releaseGlobalBackEvent"
-          @backToHome="backToHome"
-          :showDrawer="showDrawer"
-          @selectModeOn="selectModeOn"
-        />
-      </Frame>
-    </Drawer>
-  </Page>
-</template>
-
-<script>
-import {
-  ApplicationSettings,
-  AndroidApplication,
-  Application,
-} from "@nativescript/core";
-import Theme from "@nativescript/theme";
-import { localize } from "@nativescript/localize";
-import { mapActions, mapState } from "vuex";
-import EnRecipes from "./EnRecipes";
-import ViewRecipe from "./ViewRecipe";
-import MealPlanner from "./MealPlanner";
-import GroceryList from "./GroceryList";
-import Settings from "./Settings";
-import PromptDialog from "./modal/PromptDialog";
-let filterTimer;
-export default {
-  data() {
-    return {
-      selectedCuisine: null,
-      selectedCategory: null,
-      selectedTag: null,
-      selectedFilterType: "cuisine",
-      filterFavourites: false,
-      filterTrylater: false,
-      MealPlanner: MealPlanner,
-      GroceryList: GroceryList,
-      Settings: Settings,
-      topmenu: [
-        {
-          title: "EnRecipes",
-          component: "EnRecipes",
-          icon: "home",
-        },
-        {
-          title: "trylater",
-          component: "Try Later",
-          icon: "try",
-        },
-        {
-          title: "favourites",
-          component: "Favourites",
-          icon: "fav",
-        },
-      ],
-      appTheme: "Light",
-      setFilter: true,
-      gestures: true,
-      drawer: null,
-    };
-  },
-  components: {
-    EnRecipes,
-    ViewRecipe,
-    MealPlanner,
-    GroceryList,
-    Settings,
-  },
-  computed: {
-    ...mapState([
-      "icon",
-      "recipes",
-      "cuisines",
-      "categories",
-      "yieldUnits",
-      "mealPlans",
-      "currentComponent",
-    ]),
-    getCurrentPath() {
-      let path = "/";
-      if (this.selectedCuisine) path += localize(this.selectedCuisine);
-      else path = "cuis";
-      if (this.selectedCategory) path += "/" + localize(this.selectedCategory);
-      if (this.selectedTag) path += "/" + localize(this.selectedTag);
-      return path;
-    },
-    getRecipeList() {
-      switch (this.selectedFilterType) {
-        case "cuisine":
-          return this.cuisinesWithRecipes;
-          break;
-        case "category":
-          return this.categoriesWithRecipes;
-          break;
-        case "tag":
-          return this.tagsWithRecipes;
-          break;
-      }
-    },
-    cuisinesWithRecipes() {
-      let arr = this.recipes.map((e) => e.cuisine).sort();
-      return arr.length ? ["allCuis", ...new Set(arr)] : [];
-    },
-    categoriesWithRecipes() {
-      let arr = this.recipes
-        .map(
-          (e) =>
-            (this.selectedCuisine === "allCuis" ||
-              e.cuisine === this.selectedCuisine) &&
-            e.category
-        )
-        .filter((e) => e)
-        .sort();
-      return arr.length ? ["allCats", ...new Set(arr)] : [];
-    },
-    tagsWithRecipes() {
-      let arr = this.recipes
-        .map((e) => {
-          if (
-            this.selectedCuisine === "allCuis" &&
-            this.selectedCategory === "allCats" &&
-            e.tags.length
-          )
-            return e.tags;
-          else if (
-            this.selectedCuisine === "allCuis" &&
-            e.category === this.selectedCategory &&
-            e.tags.length
-          )
-            return e.tags;
-          else if (
-            this.selectedCategory === "allCats" &&
-            e.cuisine === this.selectedCuisine &&
-            e.tags.length
-          )
-            return e.tags;
-          else if (
-            e.category === this.selectedCategory &&
-            e.cuisine === this.selectedCuisine &&
-            e.tags.length
-          )
-            return e.tags;
-        })
-        .flat()
-        .filter((e) => e)
-        .sort();
-      let showAllTags =
-        this.selectedCuisine === "allCuis" &&
-        this.selectedCategory === "allCats";
-      return arr.length
-        ? [!showAllTags && "allTs", ...new Set(arr)].filter((e) => e)
-        : [];
-    },
-  },
-  methods: {
-    ...mapActions([
-      "setCurrentComponentAction",
-      "initializeListItems",
-      "initializeRecipes",
-      "initializeMealPlans",
-      "setShakeAction",
-    ]),
-    onPageLoad() {
-      if (this.appTheme === "Light") {
-        const View = android.view.View;
-        const window = Application.android.startActivity.getWindow();
-        const decorView = window.getDecorView();
-        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-      }
-    },
-    drawerLoad(args) {
-      this.drawer = args.object;
-    },
-
-    // HELPERS
-    setRecipeFilter(item) {
-      this.setFilter = this.filterFavourites = this.filterTrylater = false;
-      this.$navigateBack({
-        frame: "main-frame",
-        backstackVisible: false,
-      });
-      setTimeout((e) => {
-        if (this.selectedCuisine == null) {
-          this.selectedCuisine = item;
-          this.selectedFilterType = "category";
-        } else if (this.selectedCategory == null) {
-          this.selectedCategory = item;
-          this.selectedFilterType = "tag";
-          if (!this.tagsWithRecipes.length) this.closeDrawer();
-        } else {
-          this.selectedTag = item;
-          this.closeDrawer();
-        }
-        this.setFilter = true;
-      }, 250);
-      this.setCurrentComponentAction("Filtered recipes");
-    },
-    previousRecipeFilter() {
-      if (this.selectedCategory) {
-        this.selectedFilterType = "category";
-        this.selectedTag = this.selectedCategory = null;
-        this.setCurrentComponentAction("Filtered recipes");
-      } else {
-        this.selectedFilterType = "cuisine";
-        this.selectedCuisine = null;
-        this.setCurrentComponentAction("EnRecipes");
-      }
-    },
-    showDrawer() {
-      this.drawer.open();
-    },
-    closeDrawer() {
-      this.drawer.close();
-    },
-    getRecipeCount(arg) {
-      let count = "";
-      switch (arg) {
-        case "EnRecipes":
-          count = this.recipes.length;
-          break;
-        case "trylater":
-          count = this.recipes.filter((e) => !e.tried).length;
-          break;
-        case "favourites":
-          count = this.recipes.filter((e) => e.isFavorite).length;
-          break;
-        default: {
-          switch (this.selectedFilterType) {
-            case "cuisine":
-              count = this.recipes.filter((e) =>
-                arg === "allCuis" ? e.cuisine : e.cuisine === arg
-              ).length;
-              break;
-            case "category":
-              count = this.recipes.filter((e) =>
-                this.selectedCuisine === "allCuis"
-                  ? arg === "allCats"
-                    ? e.category
-                    : e.category === arg
-                  : arg === "allCats"
-                  ? e.cuisine === this.selectedCuisine && e.category
-                  : e.cuisine === this.selectedCuisine && e.category === arg
-              ).length;
-              break;
-            case "tag":
-              count = this.recipes.filter((e) => {
-                if (
-                  this.selectedCuisine === "allCuis" &&
-                  this.selectedCategory === "allCats"
-                ) {
-                  return e.tags.includes(arg) || arg === "allTs";
-                } else if (
-                  this.selectedCuisine === "allCuis" &&
-                  e.category === this.selectedCategory
-                ) {
-                  return e.tags.includes(arg) || arg === "allTs";
-                } else if (
-                  this.selectedCategory === "allCats" &&
-                  e.cuisine === this.selectedCuisine
-                ) {
-                  return e.tags.includes(arg) || arg === "allTs";
-                } else if (
-                  e.category === this.selectedCategory &&
-                  e.cuisine === this.selectedCuisine
-                ) {
-                  return e.tags.includes(arg) || arg === "allTs";
-                }
-              }).length;
-              break;
-          }
-        }
-      }
-      return count;
-    },
-    selectModeOn(bool) {
-      this.gestures = bool;
-    },
-    // NAVIGATION HANDLERS
-    hijackGlobalBackEvent() {
-      AndroidApplication.on(
-        AndroidApplication.activityBackPressedEvent,
-        this.globalBackEvent
-      );
-    },
-    releaseGlobalBackEvent() {
-      AndroidApplication.off(
-        AndroidApplication.activityBackPressedEvent,
-        this.globalBackEvent
-      );
-    },
-    globalBackEvent(args) {
-      if (this.drawer && this.drawer.isOpened()) {
-        args.cancel = true;
-        this.closeDrawer();
-      } else if (
-        ["Favourites", "Try Later", "Filtered recipes"].includes(
-          this.currentComponent
-        )
-      ) {
-        args.cancel = true;
-        this.backToHome();
-      }
-    },
-    backToHome() {
-      this.setCurrentComponentAction("EnRecipes");
-      this.filterFavourites = this.filterTrylater = false;
-      this.selectedTag = this.selectedCategory = this.selectedCuisine = null;
-      this.selectedFilterType = "cuisine";
-    },
-    navigateTo(to, title, isTrueComponent) {
-      if (title !== this.currentComponent) {
-        if (isTrueComponent) {
-          this.$navigateTo(to, {
-            backstackVisible: true,
-          });
-          this.closeDrawer();
-        } else {
-          this.setCurrentComponentAction(to);
-          this.$navigateBack({
-            frame: "main-frame",
-            backstackVisible: false,
-          });
-          this.filterFavourites = to === "Favourites";
-          this.filterTrylater = to === "Try Later";
-          this.closeDrawer();
-          this.selectedTag = this.selectedCategory = this.selectedCuisine = null;
-          this.selectedFilterType = "cuisine";
-        }
-      } else {
-        this.closeDrawer();
-      }
-    },
-  },
-  created() {
-    this.appTheme = ApplicationSettings.getString("appTheme", "Light");
-    setTimeout((e) => {
-      Theme.setMode(Theme[this.appTheme]);
-    }, 10);
-    if (!this.recipes.length) this.initializeRecipes();
-    this.initializeListItems();
-    if (!this.mealPlans.length) this.initializeMealPlans();
-    this.setShakeAction(ApplicationSettings.getBoolean("shakeEnabled", true));
-  },
-};
-</script>
diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue
index dd95ba33..cdad4b42 100644
--- a/app/components/EditRecipe.vue
+++ b/app/components/EditRecipe.vue
@@ -1,120 +1,289 @@
 <template>
-<Page @loaded="onPageLoad" @unloaded="onPageUnload">
-  <ActionBar androidElevation="1">
-    <GridLayout rows="*" columns="auto, *, auto">
-      <MDButton variant="text" class="er" :text="icon.back" automationText="Back" col="0" @tap="navigateBack" />
-      <Label class="title orkm" :text="`${title}` | L" col="1" />
-      <MDButton variant="text" v-if="hasChanges && !saving" class="er" :text="icon.save" col="2" @tap="saveOperation" />
-      <MDActivityIndicator col="2" v-if="saving" :busy="saving" />
-    </GridLayout>
-  </ActionBar>
-  <ScrollView width="100%" height="100%">
-    <StackLayout width="100%" padding="0 0 88">
-      <AbsoluteLayout>
-        <StackLayout width="100%" :height="screenWidth" class="imageHolder" verticalAlignment="center">
-          <Image v-if="recipeContent.imageSrc" :src="recipeContent.imageSrc" stretch="aspectFill" width="100%" :height="screenWidth" />
-          <Label v-else horizontalAlignment="center" class="er" fontSize="160" :text="icon.img" />
-        </StackLayout>
-        <transition :name="recipeContent.imageSrc ? 'null' : 'bounce'">
-          <MDFloatingActionButton v-if="showFab" :top="screenWidth - 44" :left="screenWidth - 88" class="er" src="res://cam" @tap="imageHandler" />
-        </transition>
-      </AbsoluteLayout>
-      <StackLayout margin="0 16">
-        <AbsoluteLayout class="inputField">
-          <TextField :hint="'recTitle' | L" v-model="recipeContent.title" @loaded="setInputTypeText($event, 'words')" />
-          <Label top="0" class="fieldLabel" :text="'title' | L" />
-        </AbsoluteLayout>
-        <GridLayout columns="*, 8, *">
-          <AbsoluteLayout class="inputField" col="0">
-            <TextField :text="`${recipeContent.cuisine}` | L" editable="false" @focus="modalOpen === false && showCuisine(true)" @tap="showCuisine(false)" />
-            <Label top="0" class="fieldLabel" :text="'cui' | L" />
-          </AbsoluteLayout>
-          <AbsoluteLayout class="inputField" col="2">
-            <TextField ref='category' :text="`${recipeContent.category}` | L" editable="false" @focus="modalOpen === false && showCategories(true)" @tap="showCategories(false)" />
-            <Label top="0" class="fieldLabel" :text="'cat' | L" />
-          </AbsoluteLayout>
-        </GridLayout>
-        <AbsoluteLayout class="inputField">
-          <TextField autocapitalizationType="words" ref='tags' :hint="`${$options.filters.L('tsInfo')}`" v-model="tags" @textChange="splitTags" returnKeyType="next" />
-          <Label top="0" class="fieldLabel" :text="`${$options.filters.L('ts')} (${$options.filters.L('tsInfo')})`" />
-        </AbsoluteLayout>
-        <GridLayout columns="*, 8, *">
-          <AbsoluteLayout class="inputField" col="0">
-            <TextField :text="timeRequired('prepTime')" editable="false" @focus="
+  <Page @loaded="onPageLoad" @unloaded="onPageUnload" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ScrollView
+        rowSpan="2"
+        colSpan="2"
+        @scroll="!showUndo && onScroll($event)"
+      >
+        <StackLayout padding="0 16 72">
+          <Label class="pageTitle" padding="16 0" :text="`${title}` | L" />
+          <Image
+            margin="8 0 32"
+            v-if="recipeContent.imageSrc"
+            :src="recipeContent.imageSrc"
+            stretch="aspectFit"
+            class="imgHolder"
+            :width="screenWidth - 32"
+            :height="screenWidth - 32"
+            @tap="imageHandler"
+          />
+          <Button
+            v-else
+            margin="8 0 32"
+            class="ico imgHolder"
+            fontSize="128"
+            :width="screenWidth - 32"
+            :height="screenWidth - 32"
+            :text="icon.img"
+            @tap="imageHandler"
+          />
+          <!-- OVERVIEW -->
+          <StackLayout class="inputField">
+            <Label class="fieldLabel" :text="'title' | L" />
+            <TextField
+              :hint="'recTitle' | L"
+              v-model="recipeContent.title"
+              @loaded="setInputTypeText($event, 'words')"
+            />
+          </StackLayout>
+          <GridLayout columns="*, 8, *">
+            <StackLayout class="inputField">
+              <Label class="fieldLabel" :text="'cui' | L" />
+              <TextField
+                :text="recipeContent.cuisine | L"
+                editable="false"
+                @focus="modalOpen === false && showCuisine(true)"
+                @tap="showCuisine(false)"
+              />
+            </StackLayout>
+            <StackLayout class="inputField" col="2">
+              <Label class="fieldLabel" :text="'cat' | L" />
+              <TextField
+                ref="category"
+                :text="recipeContent.category | L"
+                editable="false"
+                @focus="modalOpen === false && showCategories(true)"
+                @tap="showCategories(false)"
+              />
+            </StackLayout>
+          </GridLayout>
+          <StackLayout class="inputField">
+            <Label class="fieldLabel" :text="'ts' | L" />
+            <TextField
+              :hint="'tsInfo' | L"
+              autocapitalizationType="words"
+              ref="tags"
+              v-model="tags"
+              @textChange="splitTags"
+              returnKeyType="next"
+            />
+          </StackLayout>
+          <GridLayout columns="*, 8, *">
+            <StackLayout class="inputField">
+              <Label class="fieldLabel" :text="'prepT' | L" />
+              <TextField
+                :text="timeRequired('prepTime')"
+                editable="false"
+                @focus="
                   modalOpen === false && setTimeRequired(true, 'prepTime')
-                " @tap="setTimeRequired(false, 'prepTime')" />
-            <Label top="0" class="fieldLabel" :text="'prepT' | L" />
-          </AbsoluteLayout>
-          <AbsoluteLayout class="inputField" col="2">
-            <TextField ref="cookTime" :text="timeRequired('cookTime')" editable="false" @focus="
+                "
+                @tap="setTimeRequired(false, 'prepTime')"
+              />
+            </StackLayout>
+            <StackLayout class="inputField" col="2">
+              <Label class="fieldLabel" :text="'cookT' | L" />
+              <TextField
+                ref="cookTime"
+                :text="timeRequired('cookTime')"
+                editable="false"
+                @focus="
                   modalOpen === false && setTimeRequired(true, 'cookTime')
-                " @tap="setTimeRequired(false, 'cookTime')" />
-            <Label top="0" class="fieldLabel" :text="'cookT' | L" />
-          </AbsoluteLayout>
-        </GridLayout>
-        <GridLayout columns="*, 8, *">
-          <AbsoluteLayout class="inputField" col="0">
-            <TextField ref="yieldQuantity" v-model="recipeContent.yield.quantity" hint="1" keyboardType="number" returnKeyType="next" />
-            <Label top="0" class="fieldLabel" :text="'yieldQ' | L" />
-          </AbsoluteLayout>
-          <AbsoluteLayout class="inputField" col="2">
-            <TextField :text="`${recipeContent.yield.unit}` | L" editable="false" @focus="modalOpen === false && showYieldUnits(true)" @tap="showYieldUnits(false)" />
-            <Label top="0" class="fieldLabel" :text="'yieldU' | L" />
-          </AbsoluteLayout>
-        </GridLayout>
-        <GridLayout columns="*, 8, *">
-          <AbsoluteLayout class="inputField" col="0">
-            <TextField ref="difficultyLevel" :text="`${recipeContent.difficulty}` | L" editable="false" @focus="modalOpen === false && showDifficultyLevel(true)" @tap="showDifficultyLevel(false)" />
-            <Label top="0" class="fieldLabel" :text="'Difficulty level' | L" />
-          </AbsoluteLayout>
-        </GridLayout>
-        <StackLayout class="hr" margin="24 16"></StackLayout>
-      </StackLayout>
-      <StackLayout margin="0 16">
-        <Label :text="'ings' | L" class="sectionTitle" />
-        <GridLayout columns="auto,8,auto,8,*,8,auto" v-for="(ingredient, index) in recipeContent.ingredients" :key="index">
+                "
+                @tap="setTimeRequired(false, 'cookTime')"
+              />
+            </StackLayout>
+          </GridLayout>
+          <GridLayout columns="*, 8, *">
+            <StackLayout class="inputField">
+              <Label class="fieldLabel" :text="'yieldQ' | L" />
+              <TextField
+                ref="yieldQuantity"
+                v-model="recipeContent.yield.quantity"
+                hint="1"
+                keyboardType="number"
+                returnKeyType="next"
+              />
+            </StackLayout>
+            <StackLayout class="inputField" col="2">
+              <Label class="fieldLabel" :text="'yieldU' | L" />
+              <TextField
+                :text="`${recipeContent.yield.unit}` | L"
+                editable="false"
+                @focus="modalOpen === false && showYieldUnits(true)"
+                @tap="showYieldUnits(false)"
+              />
+            </StackLayout>
+          </GridLayout>
+          <GridLayout columns="*, 8, *">
+            <StackLayout class="inputField">
+              <Label class="fieldLabel" :text="'Difficulty level' | L" />
+              <TextField
+                ref="difficultyLevel"
+                :text="`${recipeContent.difficulty}` | L"
+                editable="false"
+                @focus="modalOpen === false && showDifficultyLevel(true)"
+                @tap="showDifficultyLevel(false)"
+              />
+            </StackLayout>
+          </GridLayout>
+          <!-- INGREDIENTS -->
+          <Label
+            :text="getTitleCount('ings', 'ingredients')"
+            class="sectionTitle"
+          />
+          <GridLayout
+            columns="auto,8,auto,8,*,8,auto"
+            v-for="(ingredient, index) in recipeContent.ingredients"
+            :key="'ing' + index"
+          >
+            <TextField
+              width="60"
+              @loaded="
+                !recipeContent.ingredients[index].item && focusField($event)
+              "
+              v-model="recipeContent.ingredients[index].quantity"
+              hint="1.00"
+              keyboardType="number"
+              returnKeyType="next"
+            />
 
-          <TextField width="60" col="0" @loaded="!recipeContent.ingredients[index].item && focusField($event)" v-model="recipeContent.ingredients[index].quantity" hint="1.00" keyboardType="number" returnKeyType="next" />
+            <TextField
+              width="76"
+              col="2"
+              :text="`${recipeContent.ingredients[index].unit}` | L"
+              editable="false"
+              @focus="modalOpen === false && showUnits($event, true, index)"
+              @tap="showUnits($event, false, index)"
+            />
 
-          <TextField width="76" col="2" :text="`${recipeContent.ingredients[index].unit}` | L" editable="false" @focus="modalOpen === false && showUnits($event, true, index)" @tap="showUnits($event, false, index)" />
+            <TextField
+              ref="ingredient"
+              @loaded="setInputTypeText($event, 'sentence')"
+              col="4"
+              v-model="recipeContent.ingredients[index].item"
+              :hint="`${$options.filters.L('it')} ${index + 1}`"
+              @returnPress="
+                index + 1 == recipeContent.ingredients.length && addIngredient()
+              "
+            />
 
-          <TextField ref="ingredient" @loaded="setInputTypeText($event, 'sentence')" col="4" v-model="recipeContent.ingredients[index].item" :hint="`${$options.filters.L('it')} ${index + 1}`"
-            @returnPress="index+1 == recipeContent.ingredients.length && addIngredient()" />
-
-          <MDButton variant="text" col="6" class="er x" :text="icon.x" @tap="removeIngredient(index)" />
-        </GridLayout>
-        <MDButton variant="text" class="text-btn orkm" :text="`+ ${$options.filters.L('aIngBtn')}`" @tap="addIngredient()" />
-        <StackLayout class="hr" margin="24 16"></StackLayout>
-      </StackLayout>
-      <StackLayout margin="0 16">
-        <Label :text="'inss' | L" class="sectionTitle" />
-        <GridLayout columns="*,8,auto" v-for="(instruction, index) in recipeContent.instructions" :key="index">
-          <TextView @loaded="focusField($event, 'multiLine')" col="0" :hint="`${$options.filters.L('stp')} ${index + 1}`" v-model="recipeContent.instructions[index]" />
-          <MDButton variant="text" col="2" class="er x" :text="icon.x" @tap="removeInstruction(index)" />
-        </GridLayout>
-        <MDButton variant="text" class="text-btn orkm" :text="`+ ${$options.filters.L('aStpBtn')}`" @tap="addInstruction" />
-        <StackLayout class="hr" margin="24 16"></StackLayout>
-      </StackLayout>
-      <StackLayout margin="0 16">
-        <Label :text="'nos' | L" class="sectionTitle" />
-        <GridLayout columns="*,8,auto" v-for="(note, index) in recipeContent.notes" :key="index">
-          <TextView @loaded="focusField($event, 'multiLine')" col="0" :hint="`${$options.filters.L('no')} ${index + 1}`" v-model="recipeContent.notes[index]" />
-          <MDButton variant="text" col="2" class="er x" :text="icon.x" @tap="removeNote(index)" />
-        </GridLayout>
-        <MDButton variant="text" class="text-btn orkm" :text="`+ ${$options.filters.L('aNoBtn')}`" @tap="addNote" />
-        <StackLayout class="hr" margin="24 16"></StackLayout>
-      </StackLayout>
-      <StackLayout margin="0 16">
-        <Label :text="'cmbs' | L" class="sectionTitle" />
-        <GridLayout columns="*,8,auto" v-for="(combination, index) in recipeContent.combinations" :key="index">
-          <TextField class="combinationToken" col="0" :text="getCombinationTitle(combination)" editable="false" />
-          <MDButton variant="text" col="2" class="er x" :text="icon.x" @tap="removeCombination(combination)" />
-        </GridLayout>
-        <MDButton variant="text" class="text-btn orkm" :text="`+ ${$options.filters.L('addCmbBtn')}`" @tap="showCombinations" />
-      </StackLayout>
-    </StackLayout>
-  </ScrollView>
-</Page>
+            <Button
+              col="6"
+              class="ico x"
+              :text="icon.x"
+              @tap="removeIngredient(index)"
+            />
+          </GridLayout>
+          <Button
+            class="text big"
+            :text="'aIngBtn' | L"
+            @tap="addIngredient()"
+          />
+          <!-- INSTRUCTIONS -->
+          <Label
+            :text="getTitleCount('inss', 'instructions')"
+            class="sectionTitle"
+          />
+          <GridLayout
+            columns="*,8,auto"
+            v-for="(instruction, index) in recipeContent.instructions"
+            :key="'ins' + index"
+          >
+            <TextView
+              @loaded="focusField($event, 'multiLine')"
+              :hint="`${$options.filters.L('stp')} ${index + 1}`"
+              v-model="recipeContent.instructions[index]"
+            />
+            <Button
+              col="2"
+              class="ico x"
+              :text="icon.x"
+              @tap="removeInstruction(index)"
+            />
+          </GridLayout>
+          <Button
+            class="text big"
+            :text="'aStpBtn' | L"
+            @tap="addInstruction"
+          />
+          <!-- COMBINATIONS -->
+          <Label
+            :text="getTitleCount('cmbs', 'combinations')"
+            class="sectionTitle"
+          />
+          <GridLayout
+            columns="*,8,auto"
+            v-for="(combination, index) in recipeContent.combinations"
+            :key="'cmbs' + index"
+          >
+            <TextField
+              class="combField"
+              :text="getCombinationTitle(combination)"
+              editable="false"
+            />
+            <Button
+              col="2"
+              class="ico x"
+              :text="icon.x"
+              @tap="removeCombination(combination)"
+            />
+          </GridLayout>
+          <Button
+            class="text big"
+            :text="'addCmbBtn' | L"
+            @tap="showCombinations"
+          />
+          <!-- NOTES -->
+          <Label :text="getTitleCount('nos', 'notes')" class="sectionTitle" />
+          <GridLayout
+            columns="*,8,auto"
+            v-for="(note, index) in recipeContent.notes"
+            :key="'nos' + index"
+          >
+            <TextView
+              @loaded="focusField($event, 'multiLine')"
+              :hint="`${$options.filters.L('no')} ${index + 1}`"
+              v-model="recipeContent.notes[index]"
+            />
+            <Button
+              col="2"
+              class="ico x"
+              :text="icon.x"
+              @tap="removeNote(index)"
+            />
+          </GridLayout>
+          <Button class="text big" :text="'aNoBtn' | L" @tap="addNote" />
+        </StackLayout>
+      </ScrollView>
+      <GridLayout
+        row="1"
+        @loaded="onAppBarLoad"
+        :colSpan="hasChanges || showUndo ? '2' : '1'"
+        class="appbar"
+        :class="{ snackBar: showUndo }"
+        columns="auto, *, auto"
+      >
+        <Button v-if="showUndo" :text="countdown" class="countdown tb" />
+        <Button v-else class="ico" :text="icon.back" @tap="navigateBack" />
+        <Label
+          class="title"
+          verticalAlignment="center"
+          col="1"
+          v-if="showUndo"
+          :text="snackMsg | L"
+        />
+        <Button
+          v-if="(hasChanges && !saving) || showUndo"
+          class="ico fab"
+          :text="showUndo ? icon.alert : icon.save"
+          col="2"
+          @tap="showUndo ? undoDel() : saveOperation()"
+        />
+        <ActivityIndicator margin="16" col="2" v-if="saving" :busy="saving" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
 </template>
 
 <script>
@@ -129,38 +298,28 @@ import {
   path,
   Screen,
   Utils,
-  Observable
-}
-from "@nativescript/core"
-import * as Permissions from "@nativescript-community/perms"
-import * as Toast from "nativescript-toast"
-import * as Filepicker from "nativescript-plugin-filepicker"
-import {
-  ImageCropper
-}
-from "nativescript-imagecropper"
-import {
-  localize
-}
-from "@nativescript/localize"
-import {
-  SnackBar
-} from '@nativescript-community/ui-material-snackbar';
-const snackbar = new SnackBar();
-import {
-  mapState,
-  mapActions
-}
-from "vuex"
-import ViewRecipe from "./ViewRecipe.vue"
-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 * as utils from "~/shared/utils"
+  Observable,
+} from "@nativescript/core";
+import * as Permissions from "@nativescript-community/perms";
+// import * as Filepicker from "nativescript-plugin-filepicker";
+import { ImageCropper } from "nativescript-imagecropper";
+import { localize } from "@nativescript/localize";
+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 ListPicker from "./modal/ListPicker.vue";
+import ViewRecipe from "./ViewRecipe";
+import * as utils from "~/shared/utils";
+let undoTimer;
 export default {
-  props: [ "recipeID", "selectedCuisine", "selectedCategory", "selectedTag", "filterFavourites", "filterTrylater", "navigationFromView", ],
+  props: [
+    "recipeID",
+    "filterFavourites",
+    "filterTrylater",
+    "navigationFromView",
+  ],
   data() {
     return {
       title: "newRec",
@@ -198,647 +357,766 @@ export default {
       saving: false,
       cacheImagePath: null,
       unSyncCombinations: [],
-      difficultyLevels: [
-        "Easy",
-        "Moderate",
-        "Challenging",
-      ],
-    }
+      difficultyLevels: ["Easy", "Moderate", "Challenging"],
+      appbar: null,
+      scrollPos: 1,
+      countdown: 5,
+      snackMsg: null,
+      showUndo: false,
+      undo: false,
+    };
   },
   computed: {
-    ...mapState( [ "icon", "units", "yieldUnits", "recipes", "cuisines", "categories", "currentComponent", ] ),
+    ...mapState([
+      "icon",
+      "units",
+      "yieldUnits",
+      "recipes",
+      "cuisines",
+      "categories",
+      "currentComponent",
+      "selectedCuisine",
+      "selectedCategory",
+      "selectedTag",
+    ]),
     screenWidth() {
-      return Screen.mainScreen.widthDIPs
+      return Screen.mainScreen.widthDIPs;
     },
     appTheme() {
-      return Application.systemAppearance()
+      return Application.systemAppearance();
     },
     hasChanges() {
-      return ( JSON.stringify( this.recipeContent ) !== JSON.stringify( this.tempRecipeContent ) )
+      return (
+        JSON.stringify(this.recipeContent) !==
+        JSON.stringify(this.tempRecipeContent)
+      );
     },
   },
   methods: {
-    ...mapActions( [ "setCurrentComponentAction", "addRecipeAction", "overwriteRecipeAction", "addListItemAction", "unSyncCombinationsAction", ] ),
-    onPageLoad( args ) {
+    ...mapActions([
+      "setComponent",
+      "addRecipeAction",
+      "overwriteRecipeAction",
+      "addListItemAction",
+      "unSyncCombinationsAction",
+    ]),
+    onPageLoad(args) {
       const page = args.object;
       page.bindingContext = new Observable();
-      this.showFab = true
+      this.showFab = true;
     },
     onPageUnload() {
-      this.releaseBackEvent()
-      snackbar.dismiss()
+      this.releaseBackEvent();
     },
-    timeRequired( time ) {
-      let t = this.recipeContent[ time ].split( ":" )
-      let h = parseInt( t[ 0 ] )
-      let m = parseInt( t[ 1 ] )
-      let hr = localize( 'hr' )
-      let min = localize( 'min' )
-      return h ? ( m ? `${h} ${hr} ${m} ${min}` : `${h} ${hr}` ) : `${m} ${min}`
+    onAppBarLoad({ object }) {
+      this.appbar = object;
     },
-    // HELPERS
-    focusField( args, type ) {
-      if ( type ) this.setInputTypeText( args, type )
-      if ( !args.object.text ) {
-        args.object.focus()
-        setTimeout( ( e ) => Utils.ad.showSoftInput( args.object.android ), 100 )
+    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.animateInOut(
+            250,
+            false,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        } else if (scrollUp && ab == 64) {
+          Utils.ad.dismissSoftInput();
+          this.animateInOut(
+            250,
+            true,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        }
       }
     },
-    setInputTypeText( args, type ) {
-      let field = args.object
-      let common = android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_FLAG_AUTO_CORRECT
-      switch ( type ) {
+    timeRequired(time) {
+      let t = this.recipeContent[time].split(":");
+      let h = parseInt(t[0]);
+      let m = parseInt(t[1]);
+      let hr = localize("hr");
+      let min = localize("min");
+      return h ? (m ? `${h} ${hr} ${m} ${min}` : `${h} ${hr}`) : `${m} ${min}`;
+    },
+    // HELPERS
+    focusField(args, type) {
+      if (type) this.setInputTypeText(args, type);
+      if (!args.object.text) {
+        args.object.focus();
+        setTimeout((e) => Utils.ad.showSoftInput(args.object.android), 100);
+      }
+    },
+    setInputTypeText(args, type) {
+      let field = args.object;
+      let common =
+        android.text.InputType.TYPE_CLASS_TEXT |
+        android.text.InputType.TYPE_TEXT_FLAG_AUTO_CORRECT;
+      switch (type) {
         case "words":
-          field.android.setInputType( android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS | common )
-          break
+          field.android.setInputType(
+            android.text.InputType.TYPE_TEXT_FLAG_CAP_WORDS | common
+          );
+          break;
         case "sentence":
-          field.android.setInputType( android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | common )
-          break
+          field.android.setInputType(
+            android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | common
+          );
+          break;
         case "multiLine":
-          field.android.setInputType( android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE | android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | common )
-          break
+          field.android.setInputType(
+            android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE |
+              android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES |
+              common
+          );
+          break;
         default:
-          break
+          break;
       }
     },
     getRandomID() {
-      let res = ""
-      let chars = "abcdefghijklmnopqrstuvwxyz0123456789"
-      for ( let i = 0; i < 20; i++ ) {
-        res += chars.charAt( Math.floor( Math.random() * chars.length ) )
+      let res = "";
+      let chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+      for (let i = 0; i < 20; i++) {
+        res += chars.charAt(Math.floor(Math.random() * chars.length));
       }
-      return res
+      return res;
     },
-    setTimeRequired( focus, time ) {
-      this.modalOpen = true
-      let t = this.recipeContent[ time ].split( ":" )
-      let hr = t[ 0 ]
-      let min = t[ 1 ]
-      this.$showModal( ListPicker, {
+    setTimeRequired(focus, time) {
+      this.modalOpen = true;
+      let t = this.recipeContent[time].split(":");
+      let hr = t[0];
+      let min = t[1];
+      this.$showModal(ListPicker, {
         props: {
           title: `${time == "prepTime" ? "prepT" : "cookT"}`,
           action: "SET",
           selectedHr: hr,
           selectedMin: min,
         },
-      } ).then( ( result ) => {
-        if ( result ) {
-          this.recipeContent[ time ] = result
-          this.modalOpen = false
-          if ( focus ) {
-            switch ( time ) {
+      }).then((result) => {
+        if (result) {
+          this.recipeContent[time] = result;
+          this.modalOpen = false;
+          if (focus) {
+            switch (time) {
               case "prepTime":
-                this.autoFocusField( "cookTime", false )
-                break
+                this.autoFocusField("cookTime", false);
+                break;
               case "cookTime":
-                this.autoFocusField( "yieldQuantity", true )
-                break
+                this.autoFocusField("yieldQuantity", true);
+                break;
               default:
-                break
+                break;
             }
           }
         }
-      } )
+      });
+    },
+    getTitleCount(title, type) {
+      let count = this.recipeContent[type].length;
+      let text = count ? ` (${count})` : "";
+      return localize(title) + text;
     },
     // DATA LIST
-    showCuisine( focus ) {
-      this.modalOpen = true
-      this.releaseBackEvent()
-      this.$showModal( ActionDialog, {
+    showCuisine(focus) {
+      this.modalOpen = true;
+      this.releaseBackEvent();
+      this.$showModal(ActionDialog, {
         props: {
           title: "cui",
           list: this.cuisines,
-          stretch: true,
           action: "aNBtn",
-          helpIcon: 'cuisine',
         },
-      } ).then( ( action ) => {
-        if ( action == "aNBtn" ) {
-          this.$showModal( PromptDialog, {
+      }).then((action) => {
+        if (action == "aNBtn") {
+          this.$showModal(PromptDialog, {
             props: {
               title: "newCui",
               action: "aBtn",
-              helpIcon: 'cuisine',
             },
-          } ).then( ( item ) => {
-            this.hijackBackEvent()
-            if ( item.length ) {
-              this.recipeContent.cuisine = item
-              this.addListItemAction( {
+          }).then((item) => {
+            this.hijackBackEvent();
+            if (item.length) {
+              this.recipeContent.cuisine = item;
+              this.addListItemAction({
                 item,
-                listName: 'cuisines'
-              } )
-              this.modalOpen = false
-              if ( focus ) this.autoFocusField( "category", false )
+                listName: "cuisines",
+              });
+              this.modalOpen = false;
+              if (focus) this.autoFocusField("category", false);
             }
-          } )
-        } else if ( action ) {
-          this.recipeContent.cuisine = action
-          this.hijackBackEvent()
-          this.modalOpen = false
-          if ( focus ) this.autoFocusField( "category", false )
+          });
+        } else if (action) {
+          this.recipeContent.cuisine = action;
+          this.hijackBackEvent();
+          this.modalOpen = false;
+          if (focus) this.autoFocusField("category", false);
         } else {
-          this.cuisines.includes( this.recipeContent.cuisine ) ? mull : this.recipeContent.cuisine = 'Undefined'
-          this.hijackBackEvent()
+          this.cuisines.includes(this.recipeContent.cuisine)
+            ? mull
+            : (this.recipeContent.cuisine = "Undefined");
+          this.hijackBackEvent();
         }
-      } )
+      });
     },
-    showCategories( focus ) {
-      this.modalOpen = true
-      this.releaseBackEvent()
-      this.$showModal( ActionDialog, {
+    showCategories(focus) {
+      this.modalOpen = true;
+      this.releaseBackEvent();
+      this.$showModal(ActionDialog, {
         props: {
           title: "cat",
           list: this.categories,
-          stretch: true,
           action: "aNBtn",
-          helpIcon: 'category',
         },
-      } ).then( ( action ) => {
-        if ( action == "aNBtn" ) {
-          this.$showModal( PromptDialog, {
+      }).then((action) => {
+        if (action == "aNBtn") {
+          this.$showModal(PromptDialog, {
             props: {
               title: "nwCat",
               action: "aBtn",
-              helpIcon: 'category',
             },
-          } ).then( ( item ) => {
-            this.hijackBackEvent()
-            if ( item.length ) {
-              this.recipeContent.category = item
-              this.addListItemAction( {
+          }).then((item) => {
+            this.hijackBackEvent();
+            if (item.length) {
+              this.recipeContent.category = item;
+              this.addListItemAction({
                 item,
-                listName: 'categories'
-              } )
-              this.modalOpen = false
-              if ( focus ) this.autoFocusField( "tags", true )
+                listName: "categories",
+              });
+              this.modalOpen = false;
+              if (focus) this.autoFocusField("tags", true);
             }
-          } )
-        } else if ( action ) {
-          this.recipeContent.category = action
-          this.hijackBackEvent()
-          this.modalOpen = false
-          if ( focus ) this.autoFocusField( "tags", true )
+          });
+        } else if (action) {
+          this.recipeContent.category = action;
+          this.hijackBackEvent();
+          this.modalOpen = false;
+          if (focus) this.autoFocusField("tags", true);
         } else {
-          this.categories.includes( this.recipeContent.category ) ? mull : this.recipeContent.category = 'Undefined'
-          this.hijackBackEvent()
+          this.categories.includes(this.recipeContent.category)
+            ? mull
+            : (this.recipeContent.category = "Undefined");
+          this.hijackBackEvent();
         }
-      } )
+      });
     },
-    showYieldUnits( focus ) {
-      this.modalOpen = true
-      this.releaseBackEvent()
-      this.$showModal( ActionDialog, {
+    showYieldUnits(focus) {
+      this.modalOpen = true;
+      this.releaseBackEvent();
+      this.$showModal(ActionDialog, {
         props: {
           title: "yieldU",
           list: this.yieldUnits,
-          stretch: true,
           action: "aNBtn",
-          helpIcon: 'yield',
         },
-      } ).then( ( action ) => {
-        if ( action == "aNBtn" ) {
-          this.$showModal( PromptDialog, {
+      }).then((action) => {
+        if (action == "aNBtn") {
+          this.$showModal(PromptDialog, {
             props: {
               title: "nwYiU",
               action: "aBtn",
-              helpIcon: 'yield',
             },
-          } ).then( ( item ) => {
-            this.hijackBackEvent()
-            if ( item.length ) {
-              this.recipeContent.yield.unit = item
-              this.addListItemAction( {
+          }).then((item) => {
+            this.hijackBackEvent();
+            if (item.length) {
+              this.recipeContent.yield.unit = item;
+              this.addListItemAction({
                 item,
-                listName: 'yieldUnits'
-              } )
-              this.modalOpen = false
-              if ( focus ) this.autoFocusField( "difficultyLevel", false )
+                listName: "yieldUnits",
+              });
+              this.modalOpen = false;
+              if (focus) this.autoFocusField("difficultyLevel", false);
             }
-          } )
-        } else if ( action ) {
-          this.recipeContent.yield.unit = action
-          this.hijackBackEvent()
-          this.modalOpen = false
-          if ( focus ) this.autoFocusField( "difficultyLevel", false )
+          });
+        } else if (action) {
+          this.recipeContent.yield.unit = action;
+          this.hijackBackEvent();
+          this.modalOpen = false;
+          if (focus) this.autoFocusField("difficultyLevel", false);
         } else {
-          this.yieldUnits.includes( this.recipeContent.yield.unit ) ? mull : this.recipeContent.yield.unit = 'Serving'
-          this.hijackBackEvent()
+          this.yieldUnits.includes(this.recipeContent.yield.unit)
+            ? mull
+            : (this.recipeContent.yield.unit = "Serving");
+          this.hijackBackEvent();
         }
-      } )
+      });
     },
-    showDifficultyLevel( focus ) {
-      this.modalOpen = true
-      this.releaseBackEvent()
-      this.$showModal( ActionDialog, {
+    showDifficultyLevel(focus) {
+      this.modalOpen = true;
+      this.releaseBackEvent();
+      this.$showModal(ActionDialog, {
         props: {
           title: "Difficulty level",
           list: this.difficultyLevels,
-          stretch: false,
-          helpIcon: 'diff',
         },
-      } ).then( ( action ) => {
-        if ( action ) {
-          this.recipeContent.difficulty = action
-          this.hijackBackEvent()
-          this.modalOpen = false
-          if ( focus ) this.addIngredient()
+      }).then((action) => {
+        if (action) {
+          this.recipeContent.difficulty = action;
+          this.hijackBackEvent();
+          this.modalOpen = false;
+          if (focus) this.addIngredient();
         } else {
-          this.difficultyLevels.includes( this.recipeContent.difficulty ) ? mull : this.recipeContent.difficulty = 'Easy'
-          this.hijackBackEvent()
+          this.difficultyLevels.includes(this.recipeContent.difficulty)
+            ? mull
+            : (this.recipeContent.difficulty = "Easy");
+          this.hijackBackEvent();
         }
-      } )
+      });
     },
-    showUnits( e, focus, index ) {
-      this.modalOpen = true
-      this.releaseBackEvent()
-      this.$showModal( ActionDialog, {
+    showUnits(e, focus, index) {
+      this.modalOpen = true;
+      this.releaseBackEvent();
+      this.$showModal(ActionDialog, {
         props: {
           title: "Unit",
           list: this.units,
-          stretch: true,
           action: "aNBtn",
-          helpIcon: 'unit',
         },
-      } ).then( ( action ) => {
-        if ( action == "aNBtn" ) {
-          this.$showModal( PromptDialog, {
+      }).then((action) => {
+        if (action == "aNBtn") {
+          this.$showModal(PromptDialog, {
             props: {
               title: "newUnit",
               action: "aBtn",
-              helpIcon: 'unit',
             },
-          } ).then( ( item ) => {
-            this.hijackBackEvent()
-            if ( item.length ) {
-              this.recipeContent.ingredients[ index ].unit = item
-              this.addListItemAction( {
+          }).then((item) => {
+            this.hijackBackEvent();
+            if (item.length) {
+              this.recipeContent.ingredients[index].unit = item;
+              this.addListItemAction({
                 item,
-                listName: 'units'
-              } )
-              this.modalOpen = false
-              if ( focus && this.recipeContent.ingredients.length - 1 === index )
-                this.autoFocusRefField( 'ingredient', index )
+                listName: "units",
+              });
+              this.modalOpen = false;
+              if (focus && this.recipeContent.ingredients.length - 1 === index)
+                this.autoFocusRefField("ingredient", index);
             }
-          } )
-        } else if ( action ) {
-          this.recipeContent.ingredients[ index ].unit = action
-          this.hijackBackEvent()
-          this.modalOpen = false
-          if ( focus && this.recipeContent.ingredients.length - 1 === index ) this.autoFocusRefField( 'ingredient', index )
+          });
+        } else if (action) {
+          this.recipeContent.ingredients[index].unit = action;
+          this.hijackBackEvent();
+          this.modalOpen = false;
+          if (focus && this.recipeContent.ingredients.length - 1 === index)
+            this.autoFocusRefField("ingredient", index);
         }
-      } )
+      });
     },
-    autoFocusField( ref, showSoftInput ) {
-      this.$refs[ ref ].nativeView.focus()
-      if ( showSoftInput ) {
-        setTimeout( () => {
-          Utils.ad.showSoftInput( this.$refs[ ref ].nativeView.android )
-        }, 100 )
+    autoFocusField(ref, showSoftInput) {
+      this.$refs[ref].nativeView.focus();
+      if (showSoftInput) {
+        setTimeout(() => {
+          Utils.ad.showSoftInput(this.$refs[ref].nativeView.android);
+        }, 100);
       }
     },
-    autoFocusRefField( ref, index ) {
-      this.$refs[ ref ][ index ].nativeView.focus()
-      setTimeout( () => {
-        Utils.ad.showSoftInput( this.$refs[ ref ][ index ].nativeView.android )
-      }, 100 )
+    autoFocusRefField(ref, index) {
+      this.$refs[ref][index].nativeView.focus();
+      setTimeout(() => {
+        Utils.ad.showSoftInput(this.$refs[ref][index].nativeView.android);
+      }, 100);
     },
     // NAVIGATION HANDLERS
-    navigateBackController() {
-      if ( this.navigationFromView ) {
-        this.$navigateTo( ViewRecipe, {
-          props: {
-            filterTrylater: this.filterTrylater,
-            recipeID: this.recipeID,
-          },
-          backstackVisible: false,
-        } )
-      } else this.$navigateBack()
-    },
     navigateBack() {
-      if ( this.hasChanges ) {
-        this.blockModal = true
-        this.$showModal( ConfirmDialog, {
+      if (this.hasChanges) {
+        this.blockModal = true;
+        this.$showModal(ConfirmDialog, {
           props: {
             title: "unsaved",
-            description: localize( "disc" ),
+            description: localize("disc"),
             cancelButtonText: "disBtn",
             okButtonText: "kEdit",
-            helpIcon: 'alert',
-            bgColor: '#c92a2a',
           },
-        } ).then( ( action ) => {
-          this.blockModal = false
-          if ( action != null && !action ) {
-            this.navigateBackController()
-            this.releaseBackEvent()
+        }).then((action) => {
+          this.blockModal = false;
+          if (action != null && !action) {
+            this.$navigateBack();
+            this.releaseBackEvent();
           }
-        } )
+        });
       } else {
-        this.navigateBackController()
-        this.releaseBackEvent()
+        this.$navigateBack();
+        this.releaseBackEvent();
       }
     },
     hijackBackEvent() {
-      AndroidApplication.on( AndroidApplication.activityBackPressedEvent, this.backEvent )
+      AndroidApplication.on(
+        AndroidApplication.activityBackPressedEvent,
+        this.backEvent
+      );
     },
     releaseBackEvent() {
-      AndroidApplication.off( AndroidApplication.activityBackPressedEvent, this.backEvent )
+      AndroidApplication.off(
+        AndroidApplication.activityBackPressedEvent,
+        this.backEvent
+      );
     },
-    backEvent( args ) {
-      if ( this.hasChanges && !this.blockModal ) {
-        args.cancel = true
-        this.navigateBack()
+    backEvent(args) {
+      if (this.hasChanges && !this.blockModal) {
+        args.cancel = true;
+        this.navigateBack();
       }
     },
     // DATA HANDLERS
     imageHandler() {
-      this.clearEmptyFields()
-      if ( this.recipeContent.imageSrc ) {
-        this.blockModal = true
-        this.$showModal( ConfirmDialog, {
+      this.clearEmptyFields(true);
+      if (this.recipeContent.imageSrc) {
+        this.blockModal = true;
+        this.$showModal(ConfirmDialog, {
           props: {
             title: "recPic",
-            cancelButtonText: "rBtn",
+            secondButtonText: "rBtn",
+            cancelButtonText: "cBtn",
             okButtonText: "repBtn",
-            helpIcon: 'img',
-            bgColor: '#858585',
           },
-        } ).then( ( action ) => {
-          this.blockModal = false
-          if ( action ) {
-            this.permissionCheck( this.permissionConfirmation, this.imagePicker )
-          } else if ( action != null ) {
-            this.recipeContent.imageSrc = null
-            this.releaseBackEvent()
+        }).then((action) => {
+          this.blockModal = false;
+          if (action > 0) {
+            this.permissionCheck(this.permissionConfirmation, this.imagePicker);
+          } else if (action < 0) {
+            this.recipeContent.imageSrc = null;
+            this.releaseBackEvent();
+          } else if (action != null) {
+            this.releaseBackEvent();
           }
-        } )
+        });
       } else {
-        this.permissionCheck( this.permissionConfirmation, this.imagePicker )
+        this.permissionCheck(this.permissionConfirmation, this.imagePicker);
       }
     },
     permissionConfirmation() {
-      return this.$showModal( ConfirmDialog, {
+      return this.$showModal(ConfirmDialog, {
         props: {
           title: "grant",
-          description: localize( "reqAcc" ),
+          description: localize("reqAcc"),
           cancelButtonText: "nNBtn",
           okButtonText: "conBtn",
-          helpIcon: 'folder',
-          bgColor: '#ff5200',
         },
-      } )
+      });
     },
-    permissionCheck( confirmation, action ) {
-      if ( !ApplicationSettings.getBoolean( "storagePermissionAsked", false ) ) {
-        confirmation().then( ( e ) => {
-          if ( e ) {
-            Permissions.request( "photo" ).then( ( status ) => {
-              switch ( status[ 0 ] ) {
+    permissionCheck(confirmation, action) {
+      if (!ApplicationSettings.getBoolean("storagePermissionAsked", false)) {
+        confirmation().then((e) => {
+          if (e) {
+            Permissions.request("photo").then((status) => {
+              switch (status[0]) {
                 case "authorized":
-                  action()
-                  break
+                  action();
+                  break;
                 case "never_ask_again":
-                  ApplicationSettings.setBoolean( "storagePermissionAsked", true )
-                  break
+                  ApplicationSettings.setBoolean(
+                    "storagePermissionAsked",
+                    true
+                  );
+                  break;
                 case "denied":
-                  Toast.makeText( localize( "dend" ) ).show()
-                  break
+                  // Toast.makeText(localize("dend")).show();
+                  break;
                 default:
-                  break
+                  break;
               }
-            } )
+            });
           }
-        } )
+        });
       } else {
-        Permissions.check( "photo" ).then( ( res ) => {
-          res[ 0 ] !== "authorized" ? confirmation().then( ( e ) => e && utils.openAppSettingsPage() ) : action()
-        } )
+        Permissions.check("photo").then((res) => {
+          res[0] !== "authorized"
+            ? confirmation().then((e) => e && utils.openAppSettingsPage())
+            : action();
+        });
       }
     },
     imagePicker() {
-      ApplicationSettings.setBoolean( "storagePermissionAsked", true )
-      Filepicker.create( {
-        mode: "single",
-        extensions: [ "png", "jpeg", "jpg" ],
-      } ).present().then( ( selection ) => {
-        this.cacheImagePath = path.join( knownFolders.temp().path, `${this.getRandomID()}.jpg` )
-        let imgPath = selection[ 0 ]
-        ImageSource.fromFile( imgPath ).then( ( image ) => {
-          ImageCropper.prototype.show( image, {
-            width: 1080,
-            height: 1080,
-          }, {
-            hideBottomControls: true,
-            toolbarTitle: localize( "cPic" ),
-            statusBarColor: "#ff5200",
-            toolbarTextColor: this.appTheme == "light" ? "#1A1A1A" : "#e0e0e0",
-            toolbarColor: this.appTheme == "light" ? "#e0e0e0" : "#1A1A1A",
-            cropFrameColor: "#ff5200",
-          } ).then( ( cropped ) => {
-            cropped.image.saveToFile( this.cacheImagePath, "jpg", 75 )
-            this.recipeContent.imageSrc = this.cacheImagePath
-          } )
-        } )
-      } )
+      ApplicationSettings.setBoolean("storagePermissionAsked", true);
+      // Filepicker.create({
+      //   mode: "single",
+      //   extensions: ["png", "jpeg", "jpg"],
+      // })
+      //   .present()
+      //   .then((selection) => {
+      //     this.cacheImagePath = path.join(
+      //       knownFolders.temp().path,
+      //       `${this.getRandomID()}.jpg`
+      //     );
+      //     let imgPath = selection[0];
+      //     ImageSource.fromFile(imgPath).then((image) => {
+      //       ImageCropper.prototype
+      //         .show(
+      //           image,
+      //           {
+      //             width: 1080,
+      //             height: 1080,
+      //           },
+      //           {
+      //             hideBottomControls: true,
+      //             toolbarTitle: localize("cPic"),
+      //             statusBarColor: "#ff5200",
+      //             toolbarTextColor:
+      //               this.appTheme == "light" ? "#1A1A1A" : "#e9ecef",
+      //             toolbarColor:
+      //               this.appTheme == "light" ? "#e9ecef" : "#1A1A1A",
+      //             cropFrameColor: "#ff5200",
+      //           }
+      //         )
+      //         .then((cropped) => {
+      //           cropped.image.saveToFile(this.cacheImagePath, "jpg", 75);
+      //           this.recipeContent.imageSrc = this.cacheImagePath;
+      //         });
+      //     });
+      //   });
     },
     // INPUT FIELD HANDLERS
     splitTags() {
-      let string
-      if ( this.tags ) {
-        let tags = this.tags.split( " " ).map( e => {
-          string = e.replace( /^[^\w\s]+/, '' )
-          if ( /^[A-Za-z]+/.test( string ) ) {
-            return string.charAt( 0 ).toUpperCase() + string.slice( 1 )
-          }
-        } ).filter( e => e )
-        this.recipeContent.tags = tags
+      let tags = [];
+      let string;
+      if (this.tags) {
+        tags = this.tags
+          .split(" ")
+          .map((e) => {
+            string = e.replace(/^[^\w\s]+/, "");
+            if (/^[A-Za-z]+/.test(string)) {
+              return string.charAt(0).toUpperCase() + string.slice(1);
+            }
+          })
+          .filter((e) => e);
       }
+      this.recipeContent.tags = tags;
     },
     joinTags() {
-      this.tags = this.recipeContent.tags.join( " " )
+      this.tags = this.recipeContent.tags.join(" ");
     },
-    undoDeletion( message ) {
-      return snackbar
-        .action( {
-          message,
-          textColor: this.appTheme == "light" ? "#fff" : "#292929",
-          actionTextColor: '#ff5200',
-          backgroundColor: this.appTheme == "light" ? "#292929" : "#fff",
-          actionText: localize('undo'),
-          hideDelay: 5000
-        } )
+    showUndoBar(message) {
+      return new Promise((resolve, reject) => {
+        this.showUndo = true;
+        this.appbar.translateY = 0;
+        this.snackMsg = message;
+        this.countdown = 5;
+        let a = 5;
+        clearTimeout(undoTimer);
+        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);
+      });
+    },
+    undoDel() {
+      this.undo = true;
     },
     addIngredient() {
-      let ingredients = this.recipeContent.ingredients
-      let unit = ingredients.length ? ingredients[ ingredients.length - 1 ].unit : "unit"
-      this.recipeContent.ingredients.push( {
+      let ingredients = this.recipeContent.ingredients;
+      let unit = ingredients.length
+        ? ingredients[ingredients.length - 1].unit
+        : "unit";
+      this.recipeContent.ingredients.push({
         item: "",
         quantity: null,
         unit,
-      } )
+      });
     },
-    removeIngredient( index ) {
-      this.modalOpen = true
-      if ( this.recipeContent.ingredients[ index ].item.length ) {
-        let item = this.recipeContent.ingredients[ index ]
-        this.recipeContent.ingredients.splice( index, 1 )
-        this.undoDeletion( `${this.$options.filters.L('rmIng')}` ).then( res => {
-          if ( res.command === 'action' )
-            this.recipeContent.ingredients.splice( index, 0, item )
-        } )
+    removeIngredient(index) {
+      this.modalOpen = true;
+      if (this.recipeContent.ingredients[index].item.length) {
+        let item = this.recipeContent.ingredients[index];
+        this.recipeContent.ingredients.splice(index, 1);
+        this.showUndoBar("rmIng").then(
+          (res) => res && this.recipeContent.ingredients.splice(index, 0, item)
+        );
       } else {
-        this.recipeContent.ingredients.splice( index, 1 )
+        this.recipeContent.ingredients.splice(index, 1);
       }
-      setTimeout( e => this.modalOpen = false, 200 )
+      setTimeout((e) => (this.modalOpen = false), 200);
     },
     addInstruction() {
-      this.recipeContent.instructions.push( "" )
+      this.recipeContent.instructions.push("");
     },
-    removeInstruction( index ) {
-      if ( this.recipeContent.instructions[ index ].length ) {
-        let item = this.recipeContent.instructions[ index ]
-        this.recipeContent.instructions.splice( index, 1 )
-        this.undoDeletion( `${this.$options.filters.L('rmIns')}` ).then( res => {
-          if ( res.command === 'action' ) {
-            this.recipeContent.instructions.splice( index, 0, item )
-          }
-        } )
-      } else this.recipeContent.instructions.splice( index, 1 )
+    removeInstruction(index) {
+      if (this.recipeContent.instructions[index].length) {
+        let item = this.recipeContent.instructions[index];
+        this.recipeContent.instructions.splice(index, 1);
+        this.showUndoBar("rmIns").then(
+          (res) => res && this.recipeContent.instructions.splice(index, 0, item)
+        );
+      } else this.recipeContent.instructions.splice(index, 1);
     },
     addNote() {
-      this.recipeContent.notes.push( "" )
+      this.recipeContent.notes.push("");
     },
-    removeNote( index ) {
-      if ( this.recipeContent.notes[ index ].length ) {
-        let item = this.recipeContent.notes[ index ]
-        this.recipeContent.notes.splice( index, 1 )
-        this.undoDeletion( `${this.$options.filters.L('rmN')}` ).then( res => {
-          if ( res.command === 'action' ) {
-            this.recipeContent.notes.splice( index, 0, item )
-          }
-        } )
-      } else this.recipeContent.notes.splice( index, 1 )
+    removeNote(index) {
+      if (this.recipeContent.notes[index].length) {
+        let item = this.recipeContent.notes[index];
+        this.recipeContent.notes.splice(index, 1);
+        this.showUndoBar("rmN").then((res) =>
+          this.recipeContent.notes.splice(index, 0, item)
+        );
+      } else this.recipeContent.notes.splice(index, 1);
     },
-    getCombinationTitle( id ) {
-      return this.recipes.filter( ( e ) => e.id === id )[ 0 ].title
+    getCombinationTitle(id) {
+      return this.recipes.filter((e) => e.id === id)[0].title;
     },
     showCombinations() {
-      this.modalOpen = true
-      this.releaseBackEvent()
-      let existingCombinations = [ ...this.recipeContent.combinations,
+      Utils.ad.dismissSoftInput();
+      this.modalOpen = true;
+      this.releaseBackEvent();
+      let existingCombinations = [
+        ...this.recipeContent.combinations,
         this.recipeContent.id,
-      ]
+      ];
       let filteredRecipes = this.recipes.filter(
-        ( e ) => !existingCombinations.includes( e.id ) )
-      this.$showModal( ActionDialogWithSearch, {
+        (e) => !existingCombinations.includes(e.id)
+      );
+      this.$showModal(ActionDialogWithSearch, {
         props: {
           title: "selRec",
           recipes: filteredRecipes,
-          helpIcon: 'comb',
         },
-      } ).then( ( res ) => {
-        this.hijackBackEvent()
-        if ( res ) {
-          this.recipeContent.combinations.push( res )
+      }).then((res) => {
+        this.hijackBackEvent();
+        if (res) {
+          this.recipeContent.combinations.push(res);
         }
-      } )
+      });
     },
-    removeCombination( id ) {
-      let index = this.recipeContent.combinations.indexOf( id )
-      this.recipeContent.combinations.splice( index, 1 )
-      this.unSyncCombinations.push( id )
-      this.undoDeletion( `${this.$options.filters.L('rmCmb')}` ).then( res => {
-        if ( res.command === 'action' ) {
-          this.recipeContent.combinations.splice( index, 0, id )
-        }
-      } )
+    removeCombination(id) {
+      let index = this.recipeContent.combinations.indexOf(id);
+      this.recipeContent.combinations.splice(index, 1);
+      this.unSyncCombinations.push(id);
+      this.showUndoBar("rmCmb").then((res) =>
+        this.recipeContent.combinations.splice(index, 0, id)
+      );
     },
     // SAVE OPERATION
-    clearEmptyFields() {
-      if ( !this.recipeContent.title ) this.recipeContent.title = localize( "untRec" )
-      if ( !this.recipeContent.yield.quantity ) this.recipeContent.yield.quantity = 1
+    clearEmptyFields(bool) {
+      if (!this.recipeContent.title && !bool)
+        this.recipeContent.title = localize("untRec");
+      if (!this.recipeContent.yield.quantity)
+        this.recipeContent.yield.quantity = 1;
       this.recipeContent.ingredients = this.recipeContent.ingredients.filter(
-        ( e ) => e.item )
-      let vm = this
+        (e) => e.item
+      );
+      let vm = this;
 
-      function clearEmpty( arr ) {
-        vm.recipeContent[ arr ] = vm.recipeContent[ arr ].filter( ( e ) => e )
+      function clearEmpty(arr) {
+        vm.recipeContent[arr] = vm.recipeContent[arr].filter((e) => e);
       }
-      clearEmpty( "instructions" )
-      clearEmpty( "notes" )
+      clearEmpty("instructions");
+      clearEmpty("notes");
     },
     saveOperation() {
-      this.saving = this.modalOpen = true
-      this.clearEmptyFields()
-      this.recipeContent.lastModified = new Date()
-      ApplicationSettings.setString( "previousCuisine", this.recipeContent.cuisine )
-      ApplicationSettings.setString( "previousCategory", this.recipeContent.category )
-      ApplicationSettings.setString( "previousYieldUnit", this.recipeContent.yield.unit )
-      if ( this.cacheImagePath ) {
-        let recipeImage = path.join( knownFolders.documents().getFolder( "EnRecipes" ).getFolder( "Images" ).path, `${this.getRandomID()}.jpg` )
-        let binarySource = File.fromPath( this.cacheImagePath ).readSync()
-        File.fromPath( recipeImage ).writeSync( binarySource )
-        this.recipeContent.imageSrc = recipeImage
-        knownFolders.temp().clear()
+      this.saving = this.modalOpen = true;
+      this.clearEmptyFields();
+      this.recipeContent.lastModified = new Date();
+      ApplicationSettings.setString(
+        "previousCuisine",
+        this.recipeContent.cuisine
+      );
+      ApplicationSettings.setString(
+        "previousCategory",
+        this.recipeContent.category
+      );
+      ApplicationSettings.setString(
+        "previousYieldUnit",
+        this.recipeContent.yield.unit
+      );
+      if (this.cacheImagePath) {
+        let recipeImage = path.join(
+          knownFolders.documents().getFolder("EnRecipes").getFolder("Images")
+            .path,
+          `${this.getRandomID()}.jpg`
+        );
+        let binarySource = File.fromPath(this.cacheImagePath).readSync();
+        File.fromPath(recipeImage).writeSync(binarySource);
+        this.recipeContent.imageSrc = recipeImage;
+        knownFolders.temp().clear();
       }
-      if ( this.recipeContent.imageSrc ) {
-        if ( this.tempRecipeContent.imageSrc && this.tempRecipeContent.imageSrc !== this.recipeContent.imageSrc ) {
-          getFileAccess().deleteFile( this.tempRecipeContent.imageSrc )
+      if (this.recipeContent.imageSrc) {
+        if (
+          this.tempRecipeContent.imageSrc &&
+          this.tempRecipeContent.imageSrc !== this.recipeContent.imageSrc
+        ) {
+          getFileAccess().deleteFile(this.tempRecipeContent.imageSrc);
         }
-      } else if ( this.tempRecipeContent.imageSrc ) {
-        getFileAccess().deleteFile( this.tempRecipeContent.imageSrc )
+      } else if (this.tempRecipeContent.imageSrc) {
+        getFileAccess().deleteFile(this.tempRecipeContent.imageSrc);
       }
-      this.unSyncCombinationsAction( {
+      this.unSyncCombinationsAction({
         id: this.recipeID,
         combinations: this.unSyncCombinations,
-      } )
-      this.saveRecipe()
+      });
+      this.saveRecipe();
     },
     saveRecipe() {
-      if ( this.recipeID ) {
-        this.overwriteRecipeAction( {
+      if (this.recipeID) {
+        this.overwriteRecipeAction({
           id: this.recipeID,
           recipe: this.recipeContent,
-        } )
+        });
       } else {
-        this.recipeContent.id = this.newRecipeID
-        this.addRecipeAction( {
+        this.recipeContent.id = this.newRecipeID;
+        this.addRecipeAction({
           id: this.newRecipeID,
           recipe: this.recipeContent,
-        } )
+        });
       }
-      setTimeout( () => {
-        this.saving = false
-      }, 100 )
-      this.navigateBackController()
+      setTimeout(() => {
+        this.saving = false;
+      }, 100);
+      this.$navigateBack();
     },
   },
   created() {
-    setTimeout( ( e ) => {
-      this.setCurrentComponentAction( "EditRecipe" )
-    }, 500 )
-    this.title = this.recipeID ? "editRec" : "newRec"
-    if ( this.recipeID ) {
-      let recipe = this.recipes.filter( ( e ) => e.id === this.recipeID )[ 0 ]
-      Object.assign( this.recipeContent, JSON.parse( JSON.stringify( recipe ) ) )
-      Object.assign( this.tempRecipeContent, JSON.parse( JSON.stringify( this.recipeContent ) ) )
-      if ( this.recipeContent.tags.length ) this.joinTags()
+    setTimeout((e) => {
+      this.setComponent("EditRecipe");
+    }, 500);
+    this.title = this.recipeID ? "editRec" : "newRec";
+    if (this.recipeID) {
+      let recipe = this.recipes.filter((e) => e.id === this.recipeID)[0];
+      Object.assign(this.recipeContent, JSON.parse(JSON.stringify(recipe)));
+      Object.assign(
+        this.tempRecipeContent,
+        JSON.parse(JSON.stringify(this.recipeContent))
+      );
+      if (this.recipeContent.tags.length) this.joinTags();
     } else {
-      this.recipeContent.cuisine = this.selectedCuisine ? /all/.test( this.selectedCuisine ) ? "Undefined" : this.selectedCuisine : ApplicationSettings.getString( "previousCuisine", "Undefined" )
-      this.recipeContent.category = this.selectedCategory ? /all/.test( this.selectedCategory ) ? "Undefined" : this.selectedCategory : ApplicationSettings.getString( "previousCategory", "Undefined" )
-      if ( this.selectedTag && !/all/.test( this.selectedTag ) ) {
-        this.tags = this.selectedTag
-        this.splitTags()
+      this.recipeContent.cuisine = this.selectedCuisine
+        ? /all/.test(this.selectedCuisine)
+          ? "Undefined"
+          : this.selectedCuisine
+        : ApplicationSettings.getString("previousCuisine", "Undefined");
+      this.recipeContent.category = this.selectedCategory
+        ? /all/.test(this.selectedCategory)
+          ? "Undefined"
+          : this.selectedCategory
+        : ApplicationSettings.getString("previousCategory", "Undefined");
+      if (this.selectedTag && !/all/.test(this.selectedTag)) {
+        this.tags = this.selectedTag;
+        this.splitTags();
       }
-      this.recipeContent.yield.unit = ApplicationSettings.getString( "previousYieldUnit", "Serving" )
-      if ( this.filterFavourites ) this.recipeContent.isFavorite = true
-      if ( this.filterTrylater ) this.recipeContent.tried = false
-      this.recipeContent.created = new Date()
-      Object.assign( this.tempRecipeContent, JSON.parse( JSON.stringify( this.recipeContent ) ) )
-      this.newRecipeID = this.getRandomID()
+      this.recipeContent.yield.unit = ApplicationSettings.getString(
+        "previousYieldUnit",
+        "Serving"
+      );
+      if (this.filterFavourites) this.recipeContent.isFavorite = true;
+      if (this.filterTrylater) this.recipeContent.tried = false;
+      this.recipeContent.created = new Date();
+      Object.assign(
+        this.tempRecipeContent,
+        JSON.parse(JSON.stringify(this.recipeContent))
+      );
+      this.newRecipeID = this.getRandomID();
     }
-    this.hijackBackEvent()
+    this.hijackBackEvent();
   },
-}
+};
 </script>
diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue
index 5d8e5e67..45939e86 100644
--- a/app/components/EnRecipes.vue
+++ b/app/components/EnRecipes.vue
@@ -1,417 +1,470 @@
 <template>
-  <Page @loaded="onPageLoad" @unloaded="onPageUnload">
-    <ActionBar androidElevation="1">
-      <GridLayout
-        v-if="showSearch"
-        columns="auto, *"
-        verticalAlignment="center"
-      >
-        <MDButton
-          class="er"
-          :text="icon.back"
-          variant="text"
-          automationText="Back"
-          col="0"
-          @tap="closeSearch"
-        />
-        <SearchBar
-          col="1"
-          :hint="'ser' | L"
-          @textChange="updateList($event.value)"
-          @clear="clearSearch"
-        />
-      </GridLayout>
-      <GridLayout v-else columns="auto, *, auto, auto, auto">
-        <MDButton
-          class="er"
-          col="0"
-          variant="text"
-          @tap="selectMode ? clearSelection() : showDrawer()"
-          :text="selectMode ? icon.x : icon.menu"
-        />
-        <Label
-          v-if="selectMode"
-          class="title orkm"
-          :text="`${selection.length} ${$options.filters.L('sltd')}`"
-          col="1"
-        />
-        <Label
-          v-else
-          class="title orkm"
-          :text="`${currentComponent}` | L"
-          col="1"
-        />
-        <MDButton
-          v-if="recipes.length"
-          class="er mdr"
-          :text="layout == 1 ? icon.l1 : layout == 2 ? icon.l2 : icon.l3"
-          variant="text"
-          col="2"
-          @tap="switchLayout"
-        />
-        <MDButton
-          v-if="recipes.length && !selectMode"
-          class="er"
-          :text="selectMode ? icon.export : icon.sear"
-          variant="text"
-          col="3"
-          @tap="selectMode ? exportSelection() : openSearch()"
-        />
-        <MDButton
-          v-if="recipes.length"
-          class="er"
-          :text="selectMode ? icon.del : icon.sort"
-          variant="text"
-          col="4"
-          @tap="selectMode ? deleteSelection() : sortDialog()"
-        />
-      </GridLayout>
-    </ActionBar>
-    <AbsoluteLayout>
-      <CollectionView
-        width="100%"
-        height="100%"
-        for="recipe in filteredRecipes"
-        ref="listview"
-        :itemTemplateSelector="getLayout"
-      >
-        <v-template name="one">
-          <GridLayout class="recipeContainer" :class="isFirstItem(recipe.id)">
-            <GridLayout
-              class="recipeItem layout1 mdr"
-              rows="104"
-              columns="104, *"
-              androidElevation="1"
-              ref="recipe"
-              @longPress="
-                selectMode
-                  ? viewRecipe(recipe.id)
-                  : addToSelection($event, recipe.id)
-              "
-              @tap="
-                selectMode
-                  ? addToSelection($event, recipe.id)
-                  : viewRecipe(recipe.id)
-              "
-            >
-              <GridLayout class="imageHolder card" rows="104" columns="104">
-                <Image
-                  row="0"
-                  col="0"
-                  v-if="recipe.imageSrc"
-                  :src="recipe.imageSrc"
-                  stretch="aspectFill"
-                  decodeWidth="104"
-                  decodeHeight="104"
-                  loadMode="async"
-                />
-                <Label
-                  v-else
-                  row="0"
-                  col="0"
-                  horizontalAlignment="center"
-                  class="er"
-                  fontSize="56"
-                  :text="icon.img"
-                />
-              </GridLayout>
-              <StackLayout class="recipeInfo" col="1">
-                <Label
-                  :text="`${$options.filters.L(
-                    recipe.cuisine
-                  )} • ${$options.filters.L(recipe.category)}`"
-                  class="category"
-                />
-                <Label :text="recipe.title" class="orkm title" />
-                <GridLayout columns="*" rows="auto, *, auto">
-                  <StackLayout
-                    class="attrContainer"
-                    orientation="horizontal"
-                    row="0"
-                  >
-                    <Label class="er small" :text="icon.star" />
-                    <Label class="attr" :text="recipe.rating" />
-                    <Label class="er small" :text="icon.diff" />
-                    <Label class="attr" :text="`${recipe.difficulty}` | L" />
-                    <Label class="er small" :text="icon.time" />
-                    <Label
-                      class="attr"
-                      :text="`${
-                        formattedTotalTime(recipe.prepTime, recipe.cookTime)
-                          .time
-                      }`"
-                    />
-                  </StackLayout>
-                  <StackLayout
-                    class="tagsContainer"
-                    orientation="horizontal"
-                    row="2"
-                  >
-                    <Label
-                      v-for="(tag, index) in recipe.tags"
-                      :key="index"
-                      class="tag"
-                      :text="tag"
-                    />
-                  </StackLayout>
-                </GridLayout>
-              </StackLayout>
+  <Frame @loaded="onFrameLoad" :class="appTheme">
+    <Page @loaded="onPageLoad" @unloaded="onPageUnload" actionBarHidden="true">
+      <GridLayout rows="*, auto, auto" columns="*">
+        <CollectionView
+          rowSpan="3"
+          :spanSize="getSpanSize"
+          for="recipe in getList"
+          @loaded="onListLoad"
+          :itemTemplateSelector="getLayout"
+          :colWidth="layout == 'grid' ? '50%' : '100%'"
+          @scroll="!selectMode && onScroll($event)"
+        >
+          <v-template name="header">
+            <GridLayout rows="auto" columns="*, auto, 12">
+              <Label class="pageTitle" :text="`${currentComponent}` | L" />
+              <Button
+                col="1"
+                class="ico"
+                :text="icon.cog"
+                @tap="navigateTo(Settings, 'Settings', true)"
+              />
             </GridLayout>
-          </GridLayout>
-        </v-template>
-        <v-template name="two">
-          <GridLayout class="recipeContainer" :class="isFirstItem(recipe.id)">
-            <GridLayout
-              class="recipeItem layout2 mdr"
-              rows="auto, auto"
-              columns="*"
-              androidElevation="1"
-              ref="recipe"
-              @longPress="
-                selectMode
-                  ? viewRecipe(recipe.id)
-                  : addToSelection($event, recipe.id)
-              "
-              @tap="
-                selectMode
-                  ? addToSelection($event, recipe.id)
-                  : viewRecipe(recipe.id)
-              "
-            >
-              <GridLayout class="imageHolder card" :rows="imgWidth" columns="*">
-                <Image
-                  row="0"
-                  col="0"
-                  v-if="recipe.imageSrc"
-                  :src="recipe.imageSrc"
-                  stretch="aspectFill"
-                  :decodeWidth="imgWidth"
-                  :decodeHeight="imgWidth"
-                  loadMode="async"
-                />
+          </v-template>
+          <v-template name="lists">
+            <StackLayout orientation="horizontal" padding="0 16 16">
+              <GridLayout
+                rows="48"
+                columns="auto, auto"
+                class="segment"
+                v-for="(item, index) in topmenu"
+                :key="index"
+                :class="{
+                  select: currentComponent === item.component,
+                }"
+                @touch="touchSelector($event, item.component)"
+              >
+                <Label class="ico" :text="icon[item.icon]" />
                 <Label
-                  v-else
-                  row="0"
-                  col="0"
-                  horizontalAlignment="center"
-                  class="er"
-                  :fontSize="imgWidth / 2"
-                  :text="icon.img"
+                  class="value"
+                  v-if="getRecipeCount(item.title)"
+                  :text="getRecipeCount(item.title)"
+                  col="1"
                 />
               </GridLayout>
-              <StackLayout class="recipeInfo" row="1">
+              <GridLayout
+                v-if="currentComponent === 'Filtered recipes'"
+                rows="48"
+                columns="auto, auto"
+                class="segment"
+                :class="{
+                  select: currentComponent === 'Filtered recipes',
+                }"
+              >
+                <Label class="ico" :text="icon.sort" />
                 <Label
-                  :text="`${$options.filters.L(
-                    recipe.cuisine
-                  )} • ${$options.filters.L(recipe.category)}`"
-                  class="category"
+                  class="value"
+                  :text="getRecipeCount('filtered')"
+                  col="1"
                 />
-                <Label :text="recipe.title" class="orkm title" />
+              </GridLayout>
+            </StackLayout>
+          </v-template>
+          <v-template name="detailed">
+            <GridLayout
+              class="recipeItem"
+              :class="getItemPos(recipe.id)"
+              rows="96"
+              columns="96, *"
+              ref="recipe"
+              @longPress="
+                selectMode ? viewRecipe(recipe.id) : addToSelection(recipe.id)
+              "
+              @tap="
+                selectMode ? addToSelection(recipe.id) : viewRecipe(recipe.id)
+              "
+            >
+              <Image
+                class="imgHolder"
+                v-if="recipe.imageSrc"
+                :src="recipe.imageSrc"
+                stretch="aspectFit"
+                decodeWidth="96"
+                decodeHeight="96"
+                loadMode="async"
+              />
+              <Label
+                v-else
+                class="ico imgHolder"
+                @loaded="centerLabel"
+                width="96"
+                height="96"
+                fontSize="48"
+                :text="icon.img"
+              />
+              <StackLayout class="recipeInfo" col="1">
+                <Label :text="recipe.title" class="tb title" />
+                <StackLayout class="attributes" orientation="horizontal">
+                  <Label class="ico sm" :text="icon.cuisine" />
+                  <Label class="attr" :text="recipe.cuisine | L" />
+                  <Label class="ico sm" :text="icon.category" />
+                  <Label class="attr" :text="recipe.category | L" />
+                </StackLayout>
                 <StackLayout
-                  class="tagsContainer"
+                  v-if="recipe.tags.length"
+                  class="attributes"
                   orientation="horizontal"
-                  row="2"
                 >
+                  <Label class="ico sm" :text="icon.tag" />
+                  <Label class="attr" :text="getTags(recipe.tags)" />
+                </StackLayout>
+                <StackLayout class="attributes" orientation="horizontal">
+                  <Label class="ico sm" :text="icon.star" />
+                  <Label class="attr" :text="recipe.rating" />
+                  <Label class="ico sm" :text="icon.time" />
                   <Label
-                    v-for="(tag, index) in recipe.tags"
-                    :key="index"
-                    v-if="tag"
-                    class="tag"
-                    :text="tag"
+                    class="attr"
+                    :text="`${
+                      formattedTotalTime(recipe.prepTime, recipe.cookTime).time
+                    }`"
                   />
+                  <Label class="ico sm" :text="icon.diff" />
+                  <Label class="attr" :text="recipe.difficulty | L" />
                 </StackLayout>
               </StackLayout>
             </GridLayout>
-          </GridLayout>
-        </v-template>
-        <v-template name="three">
-          <GridLayout class="recipeContainer" :class="isFirstItem(recipe.id)">
+          </v-template>
+          <v-template name="grid">
             <GridLayout
-              class="recipeItem layout1 mdr"
-              rows="auto"
+              class="recipeItem grid"
+              :class="getItemPos(recipe.id)"
+              rows="auto, auto"
               columns="*"
-              androidElevation="1"
               ref="recipe"
               @longPress="
-                selectMode
-                  ? viewRecipe(recipe.id)
-                  : addToSelection($event, recipe.id)
+                selectMode ? viewRecipe(recipe.id) : addToSelection(recipe.id)
               "
               @tap="
-                selectMode
-                  ? addToSelection($event, recipe.id)
-                  : viewRecipe(recipe.id)
+                selectMode ? addToSelection(recipe.id) : viewRecipe(recipe.id)
+              "
+            >
+              <Image
+                class="imgHolder"
+                v-if="recipe.imageSrc"
+                :src="recipe.imageSrc"
+                stretch="aspectFit"
+                :decodeWidth="imgWidth"
+                :decodeHeight="imgWidth"
+                loadMode="async"
+              />
+              <Label
+                v-else
+                width="100%"
+                :height="imgWidth"
+                @loaded="centerLabel"
+                class="ico imgHolder"
+                :fontSize="imgWidth / 2"
+                :text="icon.img"
+              />
+              <StackLayout class="recipeInfo" row="1">
+                <Label :text="recipe.title" class="tb title" />
+                <StackLayout class="attributes" orientation="horizontal">
+                  <Label class="ico sm" :text="icon.cuisine" />
+                  <Label class="attr" :text="recipe.cuisine | L" />
+                </StackLayout>
+                <StackLayout class="attributes" orientation="horizontal">
+                  <Label class="ico sm" :text="icon.category" />
+                  <Label class="attr" :text="recipe.category | L" />
+                </StackLayout>
+                <StackLayout
+                  v-if="recipe.tags.length"
+                  class="attributes"
+                  orientation="horizontal"
+                >
+                  <Label class="ico sm" :text="icon.tag" />
+                  <Label class="attr" :text="getTags(recipe.tags)" />
+                </StackLayout>
+              </StackLayout>
+            </GridLayout>
+          </v-template>
+          <v-template name="simple">
+            <GridLayout
+              class="recipeItem simple"
+              :class="getItemPos(recipe.id)"
+              columns="*"
+              ref="recipe"
+              @longPress="
+                selectMode ? viewRecipe(recipe.id) : addToSelection(recipe.id)
+              "
+              @tap="
+                selectMode ? addToSelection(recipe.id) : viewRecipe(recipe.id)
               "
             >
               <StackLayout class="recipeInfo">
-                <Label
-                  :text="`${$options.filters.L(
-                    recipe.cuisine
-                  )} • ${$options.filters.L(recipe.category)}`"
-                  class="category"
-                />
-                <Label :text="recipe.title" class="orkm title" />
-                <StackLayout class="tagsContainer" orientation="horizontal">
-                  <Label
-                    v-for="(tag, index) in recipe.tags"
-                    :key="index"
-                    v-if="tag"
-                    class="tag"
-                    :text="tag"
-                  />
+                <Label :text="recipe.title" class="tb title" />
+                <StackLayout class="attributes" orientation="horizontal">
+                  <Label class="ico sm" :text="icon.cuisine" />
+                  <Label class="attr" :text="recipe.cuisine | L" />
+                  <Label class="ico sm" :text="icon.category" />
+                  <Label class="attr" :text="recipe.category | L" />
+                </StackLayout>
+                <StackLayout
+                  v-if="recipe.tags.length"
+                  class="attributes"
+                  orientation="horizontal"
+                >
+                  <Label class="ico sm" :text="icon.tag" />
+                  <Label class="attr" :text="getTags(recipe.tags)" />
                 </StackLayout>
               </StackLayout>
             </GridLayout>
-          </GridLayout>
-        </v-template>
-      </CollectionView>
-      <GridLayout rows="*, auto, *, 88" columns="*" class="emptyStateContainer">
-        <StackLayout
-          row="1"
-          class="emptyState"
-          v-if="!recipes.length && !filterFavourites && !filterTrylater"
-          @tap="addRecipe"
-        >
-          <Label class="er icon" :text="icon.plusc" />
-          <Label class="title orkm" :text="'strAdd' | L" textWrap="true" />
-          <StackLayout orientation="horizontal" horizontalAlignment="center">
-            <Label :text="'plsAdd' | L" textWrap="true" />
-          </StackLayout>
-        </StackLayout>
-        <StackLayout
-          row="1"
-          class="emptyState"
-          v-if="!filteredRecipes.length && filterTrylater && !searchQuery"
-        >
-          <Label class="er icon" :text="icon.try" textWrap="true" />
-          <Label class="title orkm" :text="'aD' | L" textWrap="true" />
-          <Label :text="'tLInfo' | L" textWrap="true" />
-        </StackLayout>
-        <StackLayout
-          row="1"
-          class="emptyState"
-          v-if="!filteredRecipes.length && filterFavourites && !searchQuery"
-        >
-          <Label class="er icon" :text="icon.fav" textWrap="true" />
-          <Label class="title orkm" :text="'noFavs' | L" textWrap="true" />
-          <Label :text="'fsList' | L" textWrap="true" />
-        </StackLayout>
-        <StackLayout
-          row="1"
-          class="emptyState"
-          v-if="!filteredRecipes.length && searchQuery"
-        >
-          <Label class="er icon" :text="icon.noresult" textWrap="true" />
-          <Label
-            class="title orkm"
-            :text="`${noResultFor}` | L"
-            textWrap="true"
-          />
-          <MDButton
-            v-if="filterFavourites || filterTrylater || selectedCuisine"
-            variant="text"
-            class="searchAll orkm"
-            :text="'trySer' | L"
-            @tap="searchAll"
-          />
-        </StackLayout>
-      </GridLayout>
-      <GridLayout id="btnFabContainer" rows="*, auto" columns="*, auto">
-        <transition name="bounce">
-          <MDFloatingActionButton
-            v-if="showFAB"
+          </v-template>
+          <v-template name="minimal">
+            <GridLayout
+              class="recipeItem simple minimal"
+              :class="getItemPos(recipe.id)"
+              columns="*"
+              ref="recipe"
+              @longPress="
+                selectMode ? viewRecipe(recipe.id) : addToSelection(recipe.id)
+              "
+              @tap="
+                selectMode ? addToSelection(recipe.id) : viewRecipe(recipe.id)
+              "
+            >
+              <StackLayout class="recipeInfo">
+                <Label :text="recipe.title" class="tb title" />
+              </StackLayout>
+            </GridLayout>
+          </v-template>
+        </CollectionView>
+        <GridLayout rowSpan="2" rows="*, auto" columns="*">
+          <StackLayout
             row="1"
-            col="1"
-            class="er fab-button"
-            src="res://plus"
-            @tap="addRecipe"
+            class="emptyState"
+            v-if="!recipes.length && !filterFavourites && !filterTrylater"
+          >
+            <Label class="title" :text="'strAdd' | L" />
+            <Label :text="'plsAdd' | L" />
+          </StackLayout>
+          <StackLayout
+            row="1"
+            class="emptyState"
+            v-if="!filteredRecipes.length && filterTrylater && !searchQuery"
+          >
+            <Label class="title" :text="'aD' | L" />
+            <Label :text="'tLInfo' | L" />
+          </StackLayout>
+          <StackLayout
+            row="1"
+            class="emptyState"
+            v-if="!filteredRecipes.length && filterFavourites && !searchQuery"
+          >
+            <Label class="title" :text="'noFavs' | L" />
+            <Label :text="'fsList' | L" />
+          </StackLayout>
+          <StackLayout
+            row="1"
+            class="emptyState"
+            v-if="!filteredRecipes.length && searchQuery"
+          >
+            <Label class="title" :text="`${noResultFor}` | L" />
+            <Button
+              v-if="filterFavourites || filterTrylater || selectedCuisine"
+              class="text big"
+              :text="'trySer' | L"
+              @tap="goToHome"
+            />
+          </StackLayout>
+        </GridLayout>
+        <GridLayout
+          row="1"
+          rows="auto"
+          columns="auto"
+          class="appbar toolbar"
+          v-if="showTools"
+        >
+          <GridLayout
+            row="1"
+            rows="48"
+            class="tool"
+            columns="auto, *"
+            @touch="touchTool($event, MealPlanner, 'MealPlanner')"
+          >
+            <Label class="ico" :text="icon.cal" />
+            <Label col="1" :text="'planner' | L" />
+          </GridLayout>
+        </GridLayout>
+        <GridLayout
+          row="2"
+          @loaded="onAppBarLoad"
+          class="appbar"
+          columns="auto, *, auto, auto, auto, auto"
+        >
+          <Button
+            class="ico"
+            @tap="
+              showSearch
+                ? closeSearch()
+                : selectMode
+                ? clearSelection()
+                : toggleTools()
+            "
+            :text="
+              showSearch
+                ? icon.back
+                : selectMode || showTools
+                ? icon.x
+                : icon.menu
+            "
           />
-        </transition>
+          <TextField
+            id="searchBar"
+            @loaded="focusField"
+            v-if="showSearch"
+            col="1"
+            colSpan="5"
+            :hint="'ser' | L"
+            @textChange="updateList($event.value)"
+          />
+          <Label
+            v-if="selectMode"
+            class="title"
+            :text="`${selection.length} ${$options.filters.L('sltd')}`"
+            col="1"
+          />
+          <Button
+            v-if="recipes.length && !selectMode && !showSearch"
+            class="ico"
+            :text="selectMode ? icon.export : icon.sear"
+            col="2"
+            @tap="selectMode ? exportSelection() : openSearch()"
+          />
+          <Button
+            v-if="recipes.length && !showSearch && !selectMode"
+            class="ico"
+            :text="icon.sort"
+            col="3"
+            @tap="openSort"
+          />
+          <Button
+            v-if="recipes.length && !showSearch && !selectMode"
+            class="ico"
+            :text="icon.sort"
+            col="4"
+            @tap="openFilters"
+          />
+          <Button
+            v-if="!showSearch && !selectMode"
+            class="ico fab"
+            :text="icon.plus"
+            col="5"
+            @tap="addRecipe()"
+          />
+          <Button
+            v-if="selectMode"
+            class="ico"
+            :text="icon.del"
+            col="5"
+            @tap="deleteSelection"
+          />
+        </GridLayout>
       </GridLayout>
-    </AbsoluteLayout>
-  </Page>
+    </Page>
+  </Frame>
 </template>
+
 <script>
 import {
   ApplicationSettings,
   AndroidApplication,
+  Application,
   Utils,
   Observable,
   Device,
   Screen,
+  Color,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
-import { time } from "tns-core-modules/profiling";
 import {
   startAccelerometerUpdates,
   stopAccelerometerUpdates,
-} from "nativescript-accelerometer";
-import { Vibrate } from "nativescript-vibrate";
-let vibrator = new Vibrate();
+} from "@triniwiz/nativescript-accelerometer";
 import { mapActions, mapState } from "vuex";
-import EditRecipe from "./EditRecipe.vue";
-import ViewRecipe from "./ViewRecipe.vue";
+import ViewRecipe from "./ViewRecipe";
+import EditRecipe from "./EditRecipe";
+import MealPlanner from "./MealPlanner";
+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 * as utils from "~/shared/utils.js";
 let lastTime = 0;
 let lastShake = 0;
 let lastForce = 0;
 let shakeCount = 0;
 let typingTimer;
+let filterTimer;
 export default {
-  props: [
-    "filterFavourites",
-    "filterTrylater",
-    "closeDrawer",
-    "showDrawer",
-    "selectedCategory",
-    "selectedCuisine",
-    "selectedTag",
-    "hijackGlobalBackEvent",
-    "releaseGlobalBackEvent",
-  ],
-  components: {
-    EditRecipe,
-    ViewRecipe,
-  },
   data() {
     return {
       searchQuery: "",
       showSearch: false,
-      rightAction: false,
       deletionDialogActive: false,
-      showFAB: false,
-      filterDone: true,
       selection: [],
       selectMode: false,
-      recipeList: [],
-      // listView: null,
-      layout: 1,
+      listview: null,
+      appbar: null,
+      scrollPos: 1,
+      filterFavourites: false,
+      filterTrylater: false,
+      MealPlanner: MealPlanner,
+      GroceryList: GroceryList,
+      Settings: Settings,
+      topmenu: [
+        {
+          title: "EnRecipes",
+          component: "EnRecipes",
+          icon: "home",
+        },
+        {
+          title: "trylater",
+          component: "Try Later",
+          icon: "try",
+        },
+        {
+          title: "favourites",
+          component: "Favourites",
+          icon: "fav",
+        },
+      ],
+      showTools: false,
     };
   },
+  components: {
+    ViewRecipe,
+    EditRecipe,
+    MealPlanner,
+    GroceryList,
+    Settings,
+  },
   computed: {
     ...mapState([
-      "sortType",
       "icon",
+      "sortType",
       "recipes",
-      "currentComponent",
+      "cuisines",
+      "categories",
+      "yieldUnits",
+      "mealPlans",
       "shakeEnabled",
+      "currentComponent",
+      "layout",
+      "selectedCuisine",
+      "selectedCategory",
+      "selectedTag",
+      "appTheme",
     ]),
     filteredRecipes() {
-      let ingredients = this.recipes
-        .map((e) => e.ingredients.map((f) => f.item.toLowerCase()).join())
-        .join();
-
       let vm = this;
-
       function getIngredients(e) {
         return e.ingredients
           .map((f) => f.item.toLowerCase())
           .join()
           .includes(vm.searchQuery);
       }
-      // if ( this.filterDone ) {
       if (this.filterFavourites) {
         return this.recipes
           .filter(
@@ -449,9 +502,9 @@ export default {
           )
           .sort(this.sortFunction);
       }
-      // } else {
-      //   return 0;
-      // }
+    },
+    getList() {
+      return [{}, {}].concat(this.filteredRecipes);
     },
     noResultFor() {
       if (this.filterFavourites) return "noRecsInFavs";
@@ -459,21 +512,57 @@ export default {
       if (this.selectedCuisine) return "noRecsInFtr";
       return "noRecs";
     },
-    screenWidth() {
-      return Screen.mainScreen.widthDIPs;
-    },
     imgWidth() {
-      return Screen.mainScreen.widthDIPs / 2 - 20;
+      return Screen.mainScreen.widthDIPs / 2 - 24;
     },
   },
   methods: {
     ...mapActions([
-      "setCurrentComponentAction",
+      "setComponent",
+      "setSortTypeAction",
+      "initListItems",
+      "initRecipes",
+      "initMealPlans",
+      "setShakeAction",
+      "setLayout",
       "setSortTypeAction",
       "deleteRecipeAction",
       "deleteRecipesAction",
-      "setShakeAction",
+      "clearFilter",
+      "setTheme",
     ]),
+    onFrameLoad() {
+      const View = android.view.View;
+      const window = Application.android.startActivity.getWindow();
+      const decorView = window.getDecorView();
+      let sdkv = Device.sdkVersion;
+      function setColors(color) {
+        window.setStatusBarColor(new Color(color).android);
+        sdkv >= 27 && window.setNavigationBarColor(new Color(color).android);
+      }
+      switch (this.appTheme) {
+        case "Light":
+          setColors("#f1f3f5");
+          break;
+        case "Dark":
+          setColors("#212529");
+          break;
+        default:
+          setColors("#000000");
+          break;
+      }
+      sdkv >= 23 && this.appTheme == "Light"
+        ? decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR)
+        : decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_DARK_STATUS_BAR);
+
+      sdkv >= 27 && this.appTheme == "Light"
+        ? decorView.setSystemUiVisibility(
+            View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+          )
+        : decorView.setSystemUiVisibility(
+            View.SYSTEM_UI_FLAG_DARK_NAVIGATION_BAR
+          );
+    },
     onPageLoad(args) {
       const page = args.object;
       page.bindingContext = new Observable();
@@ -484,67 +573,284 @@ export default {
         : this.selectedCuisine
         ? this.setComponent("Filtered recipes")
         : this.setComponent("EnRecipes");
-      if (!this.selectMode) this.showFAB = true;
       if (this.shakeEnabled) {
         if (utils.hasAccelerometer())
           startAccelerometerUpdates((data) => this.onSensorData(data));
         else this.setShakeAction(false);
       }
-      if (this.showSearch || this.selectMode) this.hijackLocalBackEvent();
-      this.showDrawer();
-      this.closeDrawer();
+      this.hijackBackEvent();
+      setTimeout(() => {
+        if (this.listview) this.listview.refresh();
+      }, 1000);
+      this.showTools = false;
     },
     onPageUnload() {
       if (this.shakeEnabled) stopAccelerometerUpdates();
-      this.releaseGlobalBackEvent();
-      this.releaseLocalBackEvent();
     },
-    listViewLoad(args) {
-      let e = args.object.android;
-      e.setSelector(new android.graphics.drawable.StateListDrawable());
-      e.setDivider(null);
-      e.setDividerHeight(1);
-    },
-    switchLayout() {
-      if (this.layout == 3) this.layout = 1;
-      else this.layout++;
-      this.$refs.listview.refresh();
-    },
-    getLayout() {
-      switch (this.layout) {
-        case 1:
-          return "one";
-        case 2:
-          return "two";
-        case 3:
-          return "three";
-      }
+    onAppBarLoad({ object }) {
+      this.appbar = object;
     },
 
-    // HELPERS
+    // COLLECTIONVIEW
+    onListLoad({ object }) {
+      const View = android.view.View;
+      object.android.setOverScrollMode(View.OVER_SCROLL_NEVER);
+      this.listview = object;
+    },
+    onScroll(args) {
+      this.showTools = false;
+      let scrollUp;
+      let y = args.object.scrollOffset;
+      if (y) {
+        scrollUp = y < this.scrollPos;
+        this.scrollPos = Math.abs(y);
+        let ab = this.appbar.translateY;
+        if (!scrollUp && ab == 0) {
+          this.animateInOut(
+            250,
+            false,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        } else if (scrollUp && ab == 64) {
+          this.animateInOut(
+            250,
+            true,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        }
+      }
+    },
+    getSpanSize(index) {
+      return this.layout == "grid" && (index == 0 || index == 1) ? 2 : 1;
+    },
+    getLayout(args, index, items) {
+      return index == 0 ? "header" : index == 1 ? "lists" : this.layout;
+    },
+
+    // SEARCH
     openSearch() {
+      this.showTools = false;
       this.showSearch = true;
-      this.showFAB = false;
-      this.hijackLocalBackEvent();
     },
     closeSearch() {
       this.searchQuery = "";
       Utils.ad.dismissSoftInput();
       this.showSearch = false;
-      this.showFAB = true;
-      this.releaseLocalBackEvent();
     },
-    setComponent(comp) {
-      this.setCurrentComponentAction(comp);
-      this.hijackGlobalBackEvent();
+
+    //SORT
+    openSort() {
+      this.showTools = false;
+      this.releaseBackEvent();
+      this.$showModal(ActionDialog, {
+        props: {
+          title: "srt",
+          list: [
+            "Title",
+            "Rating",
+            "Quickest first",
+            "Slowest first",
+            "Difficulty level",
+            "Last updated",
+            "Newest first",
+            "Oldest first",
+          ],
+        },
+      }).then((action) => {
+        if (action && action !== "Cancel" && this.sortType !== action) {
+          this.setSortTypeAction(action);
+          ApplicationSettings.setString("sortType", action);
+          this.updateSort();
+        }
+        this.hijackBackEvent();
+      });
     },
-    clearSearch() {
-      this.searchQuery = "";
+
+    //FILTER
+    openFilters() {
+      this.showTools = false;
+      this.releaseBackEvent();
+      this.$showModal(Filters).then(() => this.hijackBackEvent());
+    },
+
+    // TOOLS
+    toggleTools() {
+      this.showTools = !this.showTools;
+    },
+
+    // LIST HANDLERS
+    addToSelection(id) {
+      this.showTools = false;
+      this.selectMode = true;
+      this.appbar.translateY = 0;
+      this.selection.includes(id)
+        ? this.selection.splice(this.selection.indexOf(id), 1)
+        : this.selection.push(id);
+      this.selection.length ? this.listview.refresh() : this.clearSelection();
+    },
+    clearSelection() {
+      this.selectMode = false;
+      this.selection = [];
+      this.listview.refresh();
+    },
+    deleteSelection() {
+      this.selection.length === 1
+        ? this.deleteRecipe(this.selection[0])
+        : this.deleteRecipes(this.selection);
+    },
+    exportSelection() {},
+    deleteRecipe(id) {
+      this.deletionDialogActive = true;
+      let index = this.recipes.findIndex((e) => e.id === id);
+      this.$showModal(ConfirmDialog, {
+        props: {
+          title: localize("conf"),
+          description: `${localize("delRecInfo")} "${
+            this.recipes[index].title
+          }"`,
+          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;
+      this.$showModal(ConfirmDialog, {
+        props: {
+          title: localize("conf"),
+          description: `${localize("delRecsInfo")} ${
+            this.selection.length
+          } ${localize("recs")}`,
+          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 }) {
+      x = x.toFixed(2);
+      y = y.toFixed(2);
+      z = z.toFixed(2);
+      const FORCE_THRESHOLD = 1;
+      const TIME_THRESHOLD = 150;
+      const SHAKE_TIMEOUT = 600;
+      const SHAKE_THROTTLE = 600;
+      const SHAKE_COUNT = 3;
+      const now = Date.now();
+      if (now - lastForce > SHAKE_TIMEOUT) {
+        shakeCount = 0;
+      }
+      let timeDelta = now - lastTime;
+      if (timeDelta > TIME_THRESHOLD) {
+        let forceVector = Math.abs(
+          Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2)) - 1
+        );
+        if (forceVector > FORCE_THRESHOLD) {
+          shakeCount++;
+          if (shakeCount >= SHAKE_COUNT && now - lastShake > SHAKE_THROTTLE) {
+            lastShake = now;
+            shakeCount = 0;
+            if (this.filteredRecipes.length) {
+              utils.vibrate(100);
+              this.viewRandomRecipe();
+            }
+          }
+          lastForce = now;
+        }
+        lastTime = now;
+      }
+    },
+
+    // HELPERS
+    getRecipeCount(arg) {
+      let count = 0;
+      let a = this.selectedCuisine;
+      let b = this.selectedCategory;
+      let c = this.selectedTag;
+      let cuisine = a && a != "allCuis";
+      let category = b && b != "allCats";
+      let tag = c && c != "allTs";
+      let allCuisines = a && a == "allCuis";
+      let allCategories = b && b == "allCats";
+      let allTags = c && c == "allTs";
+      switch (arg) {
+        case "EnRecipes":
+          count = this.recipes.length;
+          break;
+        case "trylater":
+          count = this.recipes.filter((e) => !e.tried).length;
+          break;
+        case "favourites":
+          count = this.recipes.filter((e) => e.isFavorite).length;
+          break;
+        default:
+          count = this.recipes.filter((e) => {
+            let cui = e.cuisine === a;
+            let cat = e.category === b;
+            let t = e.tags.includes(c);
+            return allCuisines
+              ? allCategories
+                ? tag
+                  ? t
+                  : true
+                : category
+                ? allTags
+                  ? cat
+                  : tag
+                  ? cat && t
+                  : cat
+                : true
+              : cuisine
+              ? allCategories
+                ? allTags
+                  ? cui
+                  : tag
+                  ? cui && t
+                  : cui
+                : category
+                ? allTags
+                  ? cui && cat
+                  : tag
+                  ? cui && cat && t
+                  : cui && cat
+                : cui
+              : false;
+          }).length;
+          break;
+      }
+      return count;
+    },
+    centerLabel(args) {
+      args.object.android.setGravity(17);
+    },
+    focusField(args) {
+      setTimeout((e) => {
+        args.object.focus();
+        setTimeout((e) => Utils.ad.showSoftInput(args.object.android), 100);
+      }, 100);
     },
     updateList(value) {
       clearTimeout(typingTimer);
       typingTimer = setTimeout((e) => {
-        this.searchQuery = value;
+        this.searchQuery = value.toLowerCase();
       }, 750);
     },
     formattedTotalTime(prepTime, cookTime) {
@@ -583,9 +889,6 @@ export default {
         ? cuisine && categoryMatched
         : cuisine;
     },
-    searchAll() {
-      this.$emit("backToHome");
-    },
     sortFunction(a, b) {
       const titleOrder = a.title
         .toLowerCase()
@@ -640,233 +943,152 @@ export default {
           break;
       }
     },
-    isFirstItem(id) {
+    getItemPos(id) {
       let length = this.filteredRecipes.length;
-      return id == this.filteredRecipes[0].id
-        ? "firstItem"
-        : id == this.filteredRecipes[length - 1].id
-        ? "lastItem"
-        : "";
+      let l2 = this.layout == "grid";
+      let oddOrEven = this.oddOrEven(id);
+      let itemPos =
+        id == this.filteredRecipes[0].id ||
+        (length > 1 && l2 && id == this.filteredRecipes[1].id)
+          ? "firstItem"
+          : id == this.filteredRecipes[length - 1].id ||
+            (length > 1 &&
+              l2 &&
+              oddOrEven == " odd" &&
+              id == this.filteredRecipes[length - 2].id)
+          ? "lastItem"
+          : "";
+      let selection = this.selection.includes(id) ? "selected" : "unselected";
+      let classes = itemPos + " " + selection;
+      return l2 ? classes + oddOrEven : classes;
     },
-    isLastItem(id) {
-      let length = this.filteredRecipes.length;
-      // let lastIsOdd = ( length - 1 ) % 2 == 0
-      // if ( this.filteredRecipes.length > 1 ) {
-      //   if ( id == this.filteredRecipes[ length - 2 ].id ) {
-      //     if ( !lastIsOdd ) return 'lastItem'
-      //   }
-      // }
-      if (id == this.filteredRecipes[length - 1].id) return "lastItem";
+    oddOrEven(id) {
+      return this.filteredRecipes.map((e) => e.id).indexOf(id) % 2 === 0
+        ? " odd"
+        : " even";
+    },
+    getTags(tags) {
+      return tags.join(" · ");
     },
 
     // NAVIGATION HANDLERS
-    hijackLocalBackEvent() {
-      this.releaseGlobalBackEvent();
+    barsVisibility(bool) {
+      this.showTools = bool;
+    },
+    hijackBackEvent() {
       AndroidApplication.on(
         AndroidApplication.activityBackPressedEvent,
-        this.localBackEvent
+        this.backEvent
       );
     },
-    releaseLocalBackEvent() {
+    releaseBackEvent() {
       AndroidApplication.off(
         AndroidApplication.activityBackPressedEvent,
-        this.localBackEvent
+        this.backEvent
       );
-      this.hijackGlobalBackEvent();
     },
-    localBackEvent(args) {
-      args.cancel = true;
-      if (this.selectMode) this.clearSelection();
-      this.closeDrawer();
-      this.closeSearch();
+    backEvent(args) {
+      if (this.showSearch) {
+        args.cancel = true;
+        this.closeSearch();
+      } else if (this.selectMode) {
+        args.cancel = true;
+        this.clearSelection();
+      } else if (
+        ["Favourites", "Try Later", "Filtered recipes"].includes(
+          this.currentComponent
+        )
+      ) {
+        args.cancel = true;
+        this.goToHome();
+      }
+    },
+    goToHome() {
+      this.setComponent("EnRecipes");
+      this.filterFavourites = this.filterTrylater = null;
+      this.clearFilter();
+    },
+    navigateTo(to, title, page) {
+      this.showTools = false;
+      if (page) {
+        this.$navigateTo(to, {
+          transition: {
+            name: "fade",
+            duration: 250,
+            curve: "easeOut",
+          },
+        });
+      } else if (title !== this.currentComponent) {
+        this.setComponent(to);
+        this.filterFavourites = to == "Favourites";
+        this.filterTrylater = to == "Try Later";
+        this.clearFilter();
+      }
     },
     addRecipe() {
-      this.showFAB = false;
-      this.releaseGlobalBackEvent();
+      this.barsVisibility(false);
       this.$navigateTo(EditRecipe, {
         props: {
-          selectedCuisine: this.selectedCuisine,
-          selectedCategory: this.selectedCategory,
-          selectedTag: this.selectedTag,
           filterFavourites: this.filterFavourites,
           filterTrylater: this.filterTrylater,
         },
+        transition: {
+          name: "fade",
+          duration: 250,
+          curve: "easeOut",
+        },
       });
     },
     viewRecipe(recipeID) {
-      this.showFAB = false;
+      this.barsVisibility(false);
       this.$navigateTo(ViewRecipe, {
         props: {
           filterTrylater: this.filterTrylater,
           recipeID,
         },
-        backstackVisible: false,
+        transition: {
+          name: "fade",
+          duration: 250,
+          curve: "easeOut",
+        },
+        // backstackVisible: false,
       });
     },
     viewRandomRecipe() {
-      this.showFAB = false;
+      // this.showFAB =
+      this.showTools = false;
       this.$navigateTo(ViewRecipe, {
         props: {
-          filterTrylater: false,
+          filterTrylater: true,
           recipeID: this.randomRecipeID(),
         },
+        transition: {
+          name: "fade",
+          duration: 250,
+          curve: "easeOut",
+        },
         backstackVisible: false,
       });
     },
-
-    // LIST HANDLERS
-    sortDialog() {
-      this.releaseGlobalBackEvent();
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "srt",
-          list: [
-            "Title",
-            "Quickest first",
-            "Slowest first",
-            "Rating",
-            "Difficulty level",
-            "Last updated",
-            "Newest first",
-            "Oldest first",
-          ],
-          stretch: false,
-          helpIcon: "sort",
-          bgColor: "#858585",
-        },
-      }).then((action) => {
-        if (action && action !== "Cancel" && this.sortType !== action) {
-          this.setSortTypeAction(action);
-          ApplicationSettings.setString("sortType", action);
-          this.updateSort();
-        }
-        this.hijackGlobalBackEvent();
-      });
+    touchSelector({ object, action }, comp) {
+      let selected = this.currentComponent == comp;
+      object.className = action.match(/down|move/)
+        ? `segment ${selected ? "select" : "fade"}`
+        : `segment ${selected && "select"}`;
+      if (action == "up") this.navigateTo(comp, comp);
     },
-
-    // DATA HANDLERS
-    addToSelection(args, id) {
-      // console.log(args, id);
-      this.showFAB = false;
-      if (!this.selectMode) this.hijackLocalBackEvent();
-      this.selectMode = true;
-      this.$emit("selectModeOn", false);
-      let item = args.object;
-      console.log(item.className);
-      let classes = item.className;
-      if (classes.includes("selected")) {
-        item.className = classes.replace(/selected/g, "");
-        this.selection.splice(this.selection.indexOf(id), 1);
-        this.recipeList.splice(this.selection.indexOf(id), 1);
-      } else {
-        item.className = classes + " selected";
-        this.selection.push(id);
-        this.recipeList.push(item);
-      }
-      if (!this.selection.length) this.clearSelection();
-    },
-    clearSelection() {
-      this.selectMode = false;
-      this.$emit("selectModeOn", true);
-      this.selection = [];
-      this.recipeList.forEach((e) => {
-        e.className = e.className.replace(/selected/g, "");
-      });
-      this.releaseLocalBackEvent();
-      this.showFAB = true;
-    },
-    deleteSelection() {
-      this.selection.length === 1
-        ? this.deleteRecipe(this.selection[0])
-        : this.deleteRecipes(this.selection);
-    },
-    exportSelection() {},
-    deleteRecipe(id) {
-      this.deletionDialogActive = true;
-      let index = this.recipes.findIndex((e) => e.id === id);
-      this.$showModal(ConfirmDialog, {
-        props: {
-          title: localize("conf"),
-          description: `${localize("delRecInfo")} "${
-            this.recipes[index].title
-          }"`,
-          cancelButtonText: "cBtn",
-          okButtonText: "dBtn",
-          helpIcon: "del",
-          bgColor: "#c92a2a",
-        },
-      }).then((action) => {
-        if (action) {
-          this.deleteRecipeAction({
-            index,
-            id,
-          });
-          if (!this.filteredRecipes.length) this.$emit("backToHome");
-          this.clearSelection();
-        }
-        this.deletionDialogActive = false;
-      });
-    },
-    deleteRecipes(idsArr) {
-      this.deletionDialogActive = true;
-      this.$showModal(ConfirmDialog, {
-        props: {
-          title: localize("conf"),
-          description: `${localize("delRecsInfo")} ${
-            this.selection.length
-          } ${localize("recs")}`,
-          cancelButtonText: "cBtn",
-          okButtonText: "dBtn",
-          helpIcon: "del",
-          bgColor: "#c92a2a",
-        },
-      }).then((action) => {
-        if (action) {
-          this.deleteRecipesAction(idsArr);
-          if (!this.filteredRecipes.length) this.$emit("backToHome");
-          this.clearSelection();
-        }
-        this.deletionDialogActive = false;
-      });
-    },
-
-    // SHAKE DETECTOR
-    onSensorData({ x, y, z }) {
-      x = x.toFixed(2);
-      y = y.toFixed(2);
-      z = z.toFixed(2);
-      const FORCE_THRESHOLD = 1;
-      const TIME_THRESHOLD = 150;
-      const SHAKE_TIMEOUT = 600;
-      const SHAKE_THROTTLE = 600;
-      const SHAKE_COUNT = 3;
-      const now = time();
-      if (now - lastForce > SHAKE_TIMEOUT) {
-        shakeCount = 0;
-      }
-      let timeDelta = now - lastTime;
-      if (timeDelta > TIME_THRESHOLD) {
-        let forceVector = Math.abs(
-          Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2)) - 1
-        );
-        if (forceVector > FORCE_THRESHOLD) {
-          shakeCount++;
-          if (shakeCount >= SHAKE_COUNT && now - lastShake > SHAKE_THROTTLE) {
-            lastShake = now;
-            shakeCount = 0;
-            if (this.filteredRecipes.length) {
-              vibrator.vibrate(100);
-              this.viewRandomRecipe();
-            }
-          }
-          lastForce = now;
-        }
-        lastTime = now;
-      }
+    touchTool({ object, action }, comp, value) {
+      object.className = action.match(/down|move/) ? `tool fade` : `tool`;
+      if (action == "up") this.navigateTo(comp, value, true);
     },
   },
-  mounted() {
-    this.showFAB = true;
+  created() {
+    this.setTheme(ApplicationSettings.getString("appTheme", "Light"));
+    this.setLayout(ApplicationSettings.getString("layout", "detailed"));
+    if (!this.recipes.length) this.initRecipes();
+    this.initListItems();
+    if (!this.mealPlans.length) this.initMealPlans();
+    this.setShakeAction(ApplicationSettings.getBoolean("shakeEnabled", true));
   },
 };
 </script>
diff --git a/app/components/GroceryList.vue b/app/components/GroceryList.vue
index 6249165f..1ca66b4e 100644
--- a/app/components/GroceryList.vue
+++ b/app/components/GroceryList.vue
@@ -2,22 +2,9 @@
   <Page @loaded="onPageLoad">
     <ActionBar flat="true">
       <GridLayout rows="*" columns="auto, *, auto">
-        <MDButton
-          class="er left"
-          variant="text"
-          :text="icon.back"
-          automationText="Back"
-          @tap="$navigateBack()"
-          col="0"
-        />
-        <Label class="title orkm" :text="'grocery' | L" col="1" />
-        <MDButton
-          class="er left"
-          variant="text"
-          :text="icon.today"
-          automationText="today"
-          col="2"
-        />
+        <Button class="ico left" :text="icon.back" @tap="$navigateBack()" />
+        <Label class="title tb" :text="'grocery' | L" col="1" />
+        <Button class="ico left" :text="icon.today" col="2" />
       </GridLayout>
     </ActionBar>
     <GridLayout columns="" rows=""> </GridLayout>
@@ -26,8 +13,6 @@
 
 <script>
 import { ApplicationSettings, Observable } from "@nativescript/core";
-import { SnackBar } from "@nativescript-community/ui-material-snackbar";
-const snackbar = new SnackBar();
 import { mapState, mapActions } from "vuex";
 export default {
   data() {
@@ -42,11 +27,11 @@ export default {
     },
   },
   methods: {
-    ...mapActions(["setCurrentComponentAction"]),
+    ...mapActions(["setComponent"]),
     onPageLoad(args) {
       const page = args.object;
       page.bindingContext = new Observable();
-      this.setCurrentComponentAction("GroceryList");
+      this.setComponent("GroceryList");
     },
     // HELPERS
 
@@ -64,16 +49,6 @@ export default {
       }
     },
     // DATA HANDLERS
-    undoRemove(message) {
-      return snackbar.action({
-        message,
-        textColor: this.appTheme == "Light" ? "#fff" : "#292929",
-        actionTextColor: "#ff5200",
-        backgroundColor: this.appTheme == "Light" ? "#292929" : "#fff",
-        actionText: "Undo",
-        hideDelay: 5000,
-      });
-    },
   },
   created() {
     this.appTheme = ApplicationSettings.getString("appTheme", "Light");
diff --git a/app/components/MealPlanner.vue b/app/components/MealPlanner.vue
index 8ffa3f97..66916744 100644
--- a/app/components/MealPlanner.vue
+++ b/app/components/MealPlanner.vue
@@ -1,162 +1,138 @@
 <template>
-  <Page @loaded="onPageLoad" @unloaded="onPageUnload">
-    <ActionBar androidElevation="1">
-      <GridLayout rows="*" columns="auto, *, auto, auto">
-        <MDButton
-          class="er"
-          variant="text"
-          :text="icon.back"
-          automationText="Back"
-          @tap="$navigateBack()"
-          col="0"
-        />
-        <Label class="title orkm" :text="'planner' | L" col="1" />
-        <MDButton
-          class="er"
-          variant="text"
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="*">
+      <ScrollView
+        @scroll="!edit && onScroll($event)"
+        rowSpan="2"
+        scrollBarIndicatorVisible="false"
+      >
+        <StackLayout>
+          <Label class="pageTitle" :text="'planner' | L" />
+          <GridLayout
+            class="calendar"
+            columns="*, *, *, *, *, *, *"
+            rows="auto, auto, auto, auto, auto, auto, auto, auto"
+          >
+            <Button class="ico navBtn" :text="icon.left" @tap="prevMonth" />
+            <Label
+              class="monthName"
+              col="1"
+              colSpan="5"
+              :text="$options.filters.L(mNames[month]) + ' ' + year"
+            />
+            <Button
+              class="ico navBtn"
+              col="6"
+              :text="icon.right"
+              @tap="nextMonth"
+            />
+            <Label
+              class="dayName"
+              row="1"
+              :col="i"
+              v-for="(d, i) in dNames"
+              :key="d"
+              :text="d | L"
+            />
+            <Button
+              class="min day"
+              :class="{
+                tb: isToday(d),
+                activeDay: isActive(d),
+                hasPlans: hasPlans(d),
+              }"
+              :row="getrow(i)"
+              :col="i % 7"
+              v-for="(d, i) in getCal"
+              :key="i"
+              :text="d ? d : null"
+              @tap="setToday(d)"
+            />
+          </GridLayout>
+          <StackLayout class="dayPlan">
+            <StackLayout
+              v-for="(mealType, index) in mealTimesWithRecipes"
+              :key="'mealType' + index"
+            >
+              <GridLayout columns="auto, auto">
+                <Label
+                  class="periodLabel tb"
+                  :class="mealType"
+                  :text="mealType | L"
+                />
+                <Button
+                  :visibility="edit ? 'visible' : 'hidden'"
+                  col="1"
+                  class="ico"
+                  :text="icon.plus"
+                  @tap="addRecipe(mealType)"
+                />
+              </GridLayout>
+              <GridLayout
+                :columns="`*, ${edit ? 'auto' : 0}`"
+                v-for="(recipeID, index) in getRecipes[mealType]"
+                :key="mealType + index"
+              >
+                <Button
+                  class="recipeTitle"
+                  :text="getRecipeTitle(recipeID)"
+                  @tap="viewRecipe(recipeID)"
+                />
+                <Button
+                  :visibility="edit ? 'visible' : 'hidden'"
+                  col="1"
+                  class="ico x"
+                  :text="icon.x"
+                  @tap="removeRecipe(recipeID, mealType)"
+                />
+              </GridLayout>
+            </StackLayout>
+          </StackLayout>
+        </StackLayout>
+      </ScrollView>
+      <GridLayout
+        row="1"
+        @loaded="onAppBarLoad"
+        class="appbar"
+        v-show="!showUndo"
+        columns="auto, *, auto, auto"
+      >
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+        <Button
+          class="ico"
           :text="icon.tod"
-          automationText="today"
+          v-if="!isExactlyToday"
           @tap="goToToday"
           col="2"
         />
-        <MDButton
-          class="er"
-          variant="text"
+        <Button
+          class="ico fab"
           :text="edit ? icon.done : icon.edit"
-          automationText="edit"
-          @tap="edit = !edit"
+          @tap="toggleEditMode"
           col="3"
         />
       </GridLayout>
-    </ActionBar>
-    <ScrollView width="100%" height="100%">
-      <GridLayout rows="auto, *">
-        <GridLayout
-          class="calendar"
-          width="100%"
-          row="0"
-          columns="*, *, *, *, *, *, *"
-          rows="auto, auto, auto, auto, auto, auto, auto, auto"
-        >
-          <MDButton
-            variant="text"
-            class="er navBtn"
-            col="0"
-            :text="icon.left"
-            @tap="prevMonth"
-          />
-          <Label
-            class="monthName"
-            col="1"
-            colSpan="5"
-            :text="$options.filters.L(mNames[month]) + ' ' + year"
-          />
-          <MDButton
-            variant="text"
-            class="er navBtn"
-            col="6"
-            :text="icon.right"
-            @tap="nextMonth"
-          />
-          <Label
-            class="dayName"
-            row="1"
-            :col="i"
-            v-for="(d, i) in dNames"
-            :key="d"
-            :text="$options.filters.L(d)"
-          />
-          <Label
-            @loaded="centerLabel"
-            class="day orkm"
-            :androidElevation="hasPlans(d) ? 1 : 0"
-            :class="{
-              today: isToday(d),
-              activeDay: isActive(d),
-              hasPlans: hasPlans(d),
-            }"
-            :row="getrow(i)"
-            :col="i % 7"
-            v-for="(d, i) in getCal"
-            :key="i"
-            :text="d ? d : null"
-            @tap="setToday(d)"
-          />
-        </GridLayout>
-        <StackLayout row="1" class="dayPlan">
-          <StackLayout class="hr" margin="16 0 0"></StackLayout>
-          <StackLayout
-            v-for="(mealType, index) in mealTimes"
-            :key="'mealType' + index"
-            class="plansContainer"
-            :class="mealType"
-          >
-            <GridLayout columns="auto, auto" class="header">
-              <Label
-                col="0"
-                @tap="edit = true"
-                class="periodLabel orkm"
-                :text="mealType | L"
-              />
-              <MDButton
-                :visibility="edit ? 'visible' : 'hidden'"
-                col="1"
-                variant="text"
-                class="er"
-                :text="icon.plus"
-                @tap="addRecipe(mealType)"
-              />
-            </GridLayout>
-            <GridLayout
-              class="recipe"
-              :paddingTop="index == 0 ? 8 : 0"
-              :columns="`*, ${edit ? 'auto' : 0}`"
-              v-for="(recipeID, index) in getRecipes[mealType]"
-              :key="mealType + index"
-            >
-              <GridLayout
-                androidElevation="1"
-                col="0"
-                columns="*"
-                class="titleContainer mdr"
-                @tap="viewRecipe(recipeID)"
-              >
-                <Label
-                  verticalAlignment="center"
-                  class="recipeTitle"
-                  :text="getRecipeTitle(recipeID)"
-                  textWrap="true"
-                />
-              </GridLayout>
-              <MDButton
-                :visibility="edit ? 'visible' : 'hidden'"
-                variant="text"
-                col="1"
-                class="er x"
-                :text="icon.x"
-                @tap="removeRecipe(recipeID, mealType)"
-              />
-            </GridLayout>
-          </StackLayout>
-        </StackLayout>
+      <GridLayout
+        row="1"
+        class="appbar snackBar"
+        v-show="showUndo"
+        columns="auto, *, auto"
+      >
+        <Button :text="countdown" class="countdown tb" />
+        <Label class="title" col="1" :text="snackMsg | L" />
+        <Button class="ico fab" :text="icon.alert" @tap="undoDel" col="3" />
       </GridLayout>
-    </ScrollView>
+    </GridLayout>
   </Page>
 </template>
 
 <script>
-import {
-  ApplicationSettings,
-  Page,
-  Observable,
-  GestureTypes,
-} from "@nativescript/core";
-import { SnackBar } from "@nativescript-community/ui-material-snackbar";
-const snackbar = new SnackBar();
+import { ApplicationSettings, Observable } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
 import ViewRecipe from "./ViewRecipe.vue";
 import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
-import ConfirmDialog from "./modal/ConfirmDialog.vue";
+let undoTimer;
+
 export default {
   data() {
     return {
@@ -181,6 +157,12 @@ export default {
       month: 0,
       today: null,
       edit: false,
+      scrollPos: 1,
+      appbar: null,
+      countdown: 5,
+      snackMsg: null,
+      showUndo: false,
+      undo: false,
     };
   },
   computed: {
@@ -211,23 +193,61 @@ export default {
       }
       return days;
     },
+    isExactlyToday() {
+      let d = new Date();
+      return (
+        this.year == d.getFullYear() &&
+        this.month == d.getMonth() &&
+        this.today == d.getDate()
+      );
+    },
+    mealTimesWithRecipes() {
+      return this.mealTimes.filter(
+        (e) => (this.getRecipes[e] && this.getRecipes[e].length) || this.edit
+      );
+    },
   },
   methods: {
     ...mapActions([
-      "setCurrentComponentAction",
+      "setComponent",
       "addMealPlanAction",
       "deleteMealPlanAction",
     ]),
     onPageLoad(args) {
       const page = args.object;
       page.bindingContext = new Observable();
-      this.setCurrentComponentAction("MealPlanner");
+      this.setComponent("MealPlanner");
       if (!this.today || this.today === new Date().getDate()) this.goToToday();
     },
-    onPageUnload(args) {
-      snackbar.dismiss();
+    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.animateInOut(
+            250,
+            false,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        } else if (scrollUp && ab == 64) {
+          this.animateInOut(
+            250,
+            true,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        }
+      }
     },
     // HELPERS
+    showAppBar() {
+      this.appbar.translateY = 0;
+    },
     getrow(i) {
       return Math.floor(2 + i / 7);
     },
@@ -240,9 +260,6 @@ export default {
       let recipe = this.recipes.filter((e) => e.id === id)[0];
       return recipe ? recipe.title : `[ ${this.$options.filters.L("resNF")} ]`;
     },
-    centerLabel(args) {
-      args.object.android.setGravity(17);
-    },
 
     // NAVIGATION HANDLERS
     viewRecipe(recipeID) {
@@ -253,6 +270,12 @@ export default {
             filterTrylater: true,
             recipeID,
           },
+          transition: {
+            name: "fade",
+            duration: 250,
+            curve: "easeOut",
+          },
+          // backstackVisible: false,
         });
       }
     },
@@ -262,18 +285,21 @@ export default {
         this.year--;
         this.month = 11;
       } else this.month--;
+      this.showAppBar();
     },
     nextMonth() {
       if (this.month == 11) {
         this.year++;
         this.month = 0;
       } else this.month++;
+      this.showAppBar();
     },
     goToToday() {
       let d = new Date();
       this.year = d.getFullYear();
       this.month = d.getMonth();
       this.today = d.getDate();
+      this.showAppBar();
     },
     isToday(date) {
       let d = new Date();
@@ -301,6 +327,9 @@ export default {
         index,
       });
     },
+    toggleEditMode() {
+      this.edit = !this.edit;
+    },
     // DATA HANDLERS
     addRecipe(type) {
       let filteredRecipes = this.recipes.filter((e) =>
@@ -310,7 +339,6 @@ export default {
         props: {
           title: "selRec",
           recipes: filteredRecipes,
-          helpIcon: "cal",
         },
       }).then((title) => {
         title && this.newMealPlan(title, null, type, null);
@@ -328,21 +356,34 @@ export default {
         index,
       };
       this.deleteMealPlanAction(mealPlan);
-      this.undoRemove(`${this.$options.filters.L("recRm")}`).then((res) => {
-        if (res.command === "action") {
-          this.newMealPlan(title, date, type, index);
-        }
+      this.showUndoBar("recRm").then((res) =>
+        this.newMealPlan(title, date, type, index)
+      );
+    },
+    showUndoBar(message) {
+      return new Promise((resolve, reject) => {
+        this.showUndo = true;
+        this.snackMsg = message;
+        this.countdown = 5;
+        let a = 5;
+        clearTimeout(undoTimer);
+        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);
       });
     },
-    undoRemove(message) {
-      return snackbar.action({
-        message,
-        textColor: this.appTheme == "Light" ? "#fff" : "#292929",
-        actionTextColor: "#ff5200",
-        backgroundColor: this.appTheme == "Light" ? "#292929" : "#fff",
-        actionText: "Undo",
-        hideDelay: 5000,
-      });
+    undoDel() {
+      this.undo = true;
     },
   },
   created() {
diff --git a/app/components/Settings.vue b/app/components/Settings.vue
index b38f075e..159927cc 100644
--- a/app/components/Settings.vue
+++ b/app/components/Settings.vue
@@ -1,759 +1,117 @@
 <template>
-  <Page @loaded="onPageLoad">
-    <ActionBar androidElevation="1">
-      <GridLayout rows="*" columns="auto, *">
-        <MDButton
-          class="er left"
-          variant="text"
-          :text="icon.back"
-          automationText="Back"
-          @tap="$navigateBack()"
-          col="0"
-        />
-        <Label class="title orkm" :text="'Settings' | L" col="1" />
-      </GridLayout>
-    </ActionBar>
-    <ScrollView>
-      <StackLayout class="main-container">
-        <Label :text="'intf' | L" class="group-header orkm" />
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="selectAppLanguage"
-        >
-          <Label
-            col="0"
-            verticalAlignment="center"
-            class="er"
-            :text="icon.lang"
-          />
-          <StackLayout col="1">
-            <Label :text="'lang' | L" />
-            <Label :text="appLanguage" class="info" />
-          </StackLayout>
-        </GridLayout>
-        <GridLayout columns="auto, *" class="option mdr" @tap="selectThemes">
-          <Label
-            col="0"
-            verticalAlignment="center"
-            class="er"
-            :text="icon.theme"
-          />
-          <StackLayout col="1">
-            <Label :text="'Theme' | L" />
-            <Label :text="`${appTheme}` | L" class="info" />
-          </StackLayout>
-        </GridLayout>
-        <StackLayout class="hr m-10"></StackLayout>
-        <Label :text="'opts' | L" class="group-header orkm" />
-        <GridLayout columns="auto, *, auto" class="option">
-          <Label
-            col="0"
-            verticalAlignment="center"
-            class="er"
-            :text="icon.shuf"
-          />
-          <StackLayout col="1">
-            <Label :text="'sVw' | L" textWrap="true" />
-            <Label :text="`sVwInfo` | L" class="info" textWrap="true" />
-          </StackLayout>
-          <Switch
-            :color="shakeEnabled ? '#ff5200' : '#858585'"
-            verticalAlignment="center"
-            col="2"
-            :checked="shakeEnabled"
-            @checkedChange="toggleShake"
-          />
-        </GridLayout>
-        <StackLayout class="hr m-10"></StackLayout>
-        <Label :text="'db' | L" class="group-header orkm" />
-        <GridLayout columns="auto, *" class="option mdr" @tap="exportCheck">
-          <Label col="0" class="er" :text="icon.exp" />
-          <StackLayout col="1">
-            <Label :text="'expBu' | L" textWrap="true" />
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        @loaded="listViewLoad"
+        for="item in items"
+      >
+        <v-template if="$index == 0">
+          <Label class="pageTitle" :text="'Settings' | L" />
+        </v-template>
+        <v-template if="$index == 7">
+          <StackLayout class="listSpace"> </StackLayout>
+        </v-template>
+        <v-template>
+          <GridLayout
+            columns="auto, *"
+            class="option"
+            @touch="touch($event, item.view)"
+          >
             <Label
-              v-if="!backupInProgress"
-              :text="'buInfo' | L"
-              class="info"
-              textWrap="true"
+              verticalAlignment="center"
+              class="ico"
+              :text="icon[item.icon]"
             />
-            <GridLayout class="progressContainer" v-else columns="*, 64">
-              <MDProgress
-                col="0"
-                :value="backupProgress"
-                maxValue="100"
-              ></MDProgress>
-              <Label col="1" :text="`  ${backupProgress}%`" />
-            </GridLayout>
-          </StackLayout>
-        </GridLayout>
-        <GridLayout columns="auto, *" class="option mdr" @tap="importCheck">
-          <Label col="0" class="er" :text="icon.imp" />
-          <StackLayout col="1">
-            <Label :text="'impBu' | L" textWrap="true" />
-            <Label :text="'impInfo' | L" class="info" textWrap="true" />
-          </StackLayout>
-        </GridLayout>
-        <StackLayout class="hr m-10"></StackLayout>
-        <Label :text="'rest' | L" class="group-header orkm" />
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="resetListItems('cuisines')"
-        >
-          <Label col="0" class="er" :text="icon.reset" />
-          <Label
-            col="1"
-            verticalAlignment="center"
-            :text="'restCuiL' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="resetListItems('categories')"
-        >
-          <Label col="0" class="er" :text="icon.reset" />
-          <Label
-            col="1"
-            verticalAlignment="center"
-            :text="'restCatL' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="resetListItems('yieldUnits')"
-        >
-          <Label col="0" class="er" :text="icon.reset" />
-          <Label
-            col="1"
-            verticalAlignment="center"
-            :text="'restYUL' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="resetListItems('units')"
-        >
-          <Label col="0" class="er" :text="icon.reset" />
-          <Label
-            col="1"
-            verticalAlignment="center"
-            :text="'restUL' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <Label class="group-info" :text="'restInfo' | L" textWrap="true" />
-
-        <StackLayout class="hr m-10"></StackLayout>
-        <Label :text="'help' | L" class="group-header orkm" />
-
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="openURL('https://t.me/enrecipes')"
-        >
-          <Label col="0" class="er" :text="icon.tg" />
-          <StackLayout col="1">
-            <Label :text="'joinTG' | L" textWrap="true" />
-            <Label :text="'tgInfo' | L" class="info" textWrap="true" />
-          </StackLayout>
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="
-            openURL(
-              'https://github.com/vishnuraghavb/EnRecipes/wiki/User-Guide'
-            )
-          "
-        >
-          <Label col="0" class="er" :text="icon.help" />
-          <Label
-            verticalAlignment="center"
-            col="1"
-            :text="'guide' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="
-            openURL(
-              'https://github.com/vishnuraghavb/EnRecipes/blob/main/PRIVACY.md'
-            )
-          "
-        >
-          <Label col="0" class="er" :text="icon.priv" />
-          <Label
-            verticalAlignment="center"
-            col="1"
-            :text="'priv' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <StackLayout class="hr m-10"></StackLayout>
-        <Label :text="'About' | L" class="group-header orkm" />
-
-        <GridLayout columns="auto, *" class="option">
-          <Label col="0" class="er" :text="icon.info" />
-          <StackLayout col="1">
-            <Label :text="'ver' | L" />
-            <Label :text="getVersion" class="info" textWrap="true" />
-          </StackLayout>
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="openURL('https://github.com/vishnuraghavb/enrecipes')"
-        >
-          <Label col="0" class="er" :text="icon.gh" />
-          <Label
-            verticalAlignment="center"
-            col="1"
-            :text="'gh' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="openURL('https://www.vishnuraghav.com/donate')"
-        >
-          <Label col="0" class="er" :text="icon.don" />
-          <Label
-            verticalAlignment="center"
-            col="1"
-            :text="'donate' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <GridLayout
-          columns="auto, *"
-          class="option mdr"
-          @tap="
-            openURL(
-              'https://hosted.weblate.org/projects/enrecipes/app-translations'
-            )
-          "
-        >
-          <Label col="0" class="er" :text="icon.trans" />
-          <Label
-            verticalAlignment="center"
-            col="1"
-            :text="'trnsl' | L"
-            textWrap="true"
-          />
-        </GridLayout>
-        <Label class="group-info" :text="'appInfo' | L" textWrap="true" />
-      </StackLayout>
-    </ScrollView>
+            <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 {
-  Application,
-  Utils,
-  ApplicationSettings,
-  path,
-  knownFolders,
-  File,
-  Folder,
-  Observable,
-  Device,
-} from "@nativescript/core";
-import * as Permissions from "@nativescript-community/perms";
-import { Zip } from "@nativescript/zip";
-import * as Toast from "nativescript-toast";
-import * as Filepicker from "nativescript-plugin-filepicker";
-import Theme from "@nativescript/theme";
-import { localize, overrideLocale } from "@nativescript/localize";
+import { Observable } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
-import ActionDialog from "./modal/ActionDialog.vue";
-import ConfirmDialog from "./modal/ConfirmDialog.vue";
-import * as utils from "~/shared/utils";
+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 Help from "./Settings/Help.vue";
+import About from "./Settings/About.vue";
 export default {
   data() {
     return {
-      appTheme: "Light",
-      appLanguage: "English",
-      backupProgress: 0,
-      backupInProgress: false,
+      items: [
+        {},
+        {
+          icon: "theme",
+          title: "intf",
+          view: Interface,
+        },
+        {
+          icon: "cog",
+          title: "opts",
+          view: Options,
+        },
+        {
+          icon: "exp",
+          title: "db",
+          view: Database,
+        },
+        {
+          icon: "reset",
+          title: "rest",
+          view: Reset,
+        },
+        {
+          icon: "help",
+          title: "help",
+          view: Help,
+        },
+        {
+          icon: "info",
+          title: "About",
+          view: About,
+        },
+        {},
+      ],
     };
   },
   computed: {
-    ...mapState([
-      "icon",
-      "recipes",
-      "cuisines",
-      "categories",
-      "yieldUnits",
-      "units",
-      "mealPlans",
-      "currentComponent",
-      "language",
-      "shakeEnabled",
-      "importSummary",
-    ]),
-    getVersion() {
-      let ctx = Application.android.context;
-      return ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0)
-        .versionName;
-    },
+    ...mapState(["icon"]),
   },
   methods: {
-    ...mapActions([
-      "setCurrentComponentAction",
-      "importListItemsAction",
-      "importRecipesAction",
-      "importMealPlansAction",
-      "resetListItemsAction",
-      "setShakeAction",
-      "unlinkBrokenImages",
-    ]),
+    ...mapActions(["setComponent"]),
     onPageLoad(args) {
       const page = args.object;
       page.bindingContext = new Observable();
-      this.setCurrentComponentAction("Settings");
+      this.setComponent("Settings");
     },
     // HELPERS
-    openURL(url) {
-      Utils.openUrl(url);
-    },
-    // LANGUAGE SELECTION
-    selectAppLanguage() {
-      let languages = this.language.map((e) => e.title);
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "lang",
-          list: [...languages],
-          stretch: true,
-          helpIcon: "lang",
-        },
-      }).then((action) => {
-        if (action && action !== "Cancel" && this.appLanguage !== action) {
-          let currentLocale = Device.language.split("-")[0];
-          let locale = this.language.filter((e) => e.title === action)[0]
-            .locale;
-          if (currentLocale !== locale) {
-            this.$showModal(ConfirmDialog, {
-              props: {
-                title: "appRst",
-                description: localize("nLangInfo"),
-                cancelButtonText: "cBtn",
-                okButtonText: "rst",
-                helpIcon: "res",
-                bgColor: "#ff5200",
-              },
-            }).then((result) => {
-              if (result) {
-                this.appLanguage = action;
-                ApplicationSettings.setString("appLanguage", action);
-                overrideLocale(locale);
-                setTimeout(utils.restartApp, 250);
-              }
-            });
-          }
-        }
-      });
-    },
-    // THEME SELECTION
-    selectThemes() {
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "Theme",
-          list: ["Light", "Dark"],
-          stretch: false,
-          helpIcon: "theme",
-        },
-      }).then((action) => {
-        if (action && action !== "Cancel" && this.appTheme !== action) {
-          this.$showModal(ConfirmDialog, {
-            props: {
-              title: "appRst",
-              description: localize("nThmInfo"),
-              cancelButtonText: "cBtn",
-              okButtonText: "rst",
-              helpIcon: "res",
-              bgColor: "#ff5200",
-            },
-          }).then((result) => {
-            if (result) {
-              this.appTheme = action;
-              ApplicationSettings.setString("appTheme", action);
-              setTimeout(utils.restartApp, 250);
-            }
-          });
-        }
-      });
-    },
-    // SHAKE VIEW RANDOM RECIPE
-    toggleShake(args) {
-      let checked = args.object.checked;
-      if (checked && !utils.hasAccelerometer()) {
-        args.object.checked = false;
-        Toast.makeText(localize("noAccSensor"), "long").show();
-      } else {
-        ApplicationSettings.setBoolean("shakeEnabled", checked);
-        this.setShakeAction(checked);
-      }
-    },
-    // EXPORT HANDLERS
-    exportCheck() {
-      if (!this.recipes.length) {
-        Toast.makeText(localize("aFBu")).show();
-      } else {
-        this.permissionCheck(
-          this.permissionConfirmation,
-          localize("reqAcc"),
-          this.exportBackup
-        );
-      }
-    },
-    exportBackup() {
-      this.exportFiles("create");
-      let date = new Date();
-      let formattedDate =
-        date.getFullYear() +
-        "-" +
-        ("0" + (date.getMonth() + 1)).slice(-2) +
-        "-" +
-        ("0" + date.getDate()).slice(-2) +
-        "_" +
-        ("0" + date.getHours()).slice(-2) +
-        ("0" + date.getMinutes()).slice(-2) +
-        ("0" + date.getSeconds()).slice(-2);
-      const sdDownloadPath = Folder.fromPath(
-        android.os.Environment.getExternalStorageDirectory().getAbsolutePath()
-      ).getFolder("Download").path;
-      let fromPath = path.join(knownFolders.documents().path, "EnRecipes");
-      let destPath = path.join(
-        sdDownloadPath,
-        `EnRecipes-Backup_${formattedDate}.zip`
-      );
-      this.backupInProgress = true;
-      Zip.zip({
-        directory: fromPath,
-        archive: destPath,
-        onProgress: (progress) => {
-          this.backupProgress = progress;
-        },
-      }).then((success) => {
-        Toast.makeText(
-          "Backup file successfully saved to Download folder",
-          "long"
-        ).show();
-        this.exportFiles("delete");
-        setTimeout((e) => (this.backupInProgress = false), 3000);
-      });
-    },
-    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;
-        default:
-          break;
-      }
-    },
-    writeDataToFile(file, data) {
-      file.writeText(JSON.stringify(data));
-    },
-    // IMPORT HANDLERS
-    importCheck() {
-      this.permissionCheck(
-        this.permissionConfirmation,
-        localize("reqAcc"),
-        this.openFilePicker
-      );
-    },
-    openFilePicker() {
-      Filepicker.create({
-        mode: "single",
-        extensions: ["zip"],
-      })
-        .present()
-        .then((selection) => {
-          Toast.makeText(localize("vrfy") + "...").show();
-          let zipPath = selection[0];
-          this.validateZipContent(zipPath);
-        });
-    },
-    importDataToDB(data, db, zipPath) {
-      switch (db) {
-        case "EnRecipesDB":
-          this.importImages(zipPath);
-          this.importRecipesAction(data);
-          break;
-        case "userCuisinesDB":
-          this.importListItemsAction({
-            data,
-            listName: "cuisines",
-          });
-          break;
-        case "userCategoriesDB":
-          this.importListItemsAction({
-            data,
-            listName: "categories",
-          });
-          break;
-        case "userYieldUnitsDB":
-          this.importListItemsAction({
-            data,
-            listName: "yieldUnits",
-          });
-          break;
-        case "userUnitsDB":
-          this.importListItemsAction({
-            data,
-            listName: "units",
-          });
-          break;
-        case "mealPlansDB":
-          this.importMealPlansAction(data);
-          break;
-        default:
-          break;
-      }
-    },
-    hasValidJSON(data) {
-      try {
-        JSON.parse(data) && Array.isArray(JSON.parse(data));
-      } catch (e) {
-        return false;
-      }
-      return true;
-    },
-    isFileDataValid(file) {
-      const files = file.filter((e) => File.exists(e.path));
-      if (files.length) {
-        let isValid = files.map((e) => false);
-        files.forEach((file, i) => {
-          File.fromPath(file.path)
-            .readText()
-            .then((data) => {
-              isValid[i] = this.hasValidJSON(data);
-              if (!isValid[i]) {
-                this.failedImport(
-                  `${localize("buMod")}\n\n${localize("invFile")}: ${file.file}`
-                );
-                return 0;
-              }
-              if (isValid.every((e) => e === true)) {
-                files.forEach((file, i) => {
-                  File.fromPath(file.path)
-                    .readText()
-                    .then((data) => {
-                      this.importDataToDB(
-                        JSON.parse(data),
-                        file.db,
-                        file.zipPath
-                      );
-                    });
-                });
-              }
-            });
-        });
-      } else {
-        this.failedImport(localize("buEmp"));
-      }
-    },
-    failedImport(description) {
-      this.$showModal(ConfirmDialog, {
-        props: {
-          title: "impFail",
-          description,
-          okButtonText: "OK",
-          helpIcon: "alert",
-          bgColor: "#c92a2a",
+    navigateTo(view) {
+      this.$navigateTo(view, {
+        transition: {
+          name: "slide",
+          duration: 200,
+          curve: "easeOut",
         },
       });
     },
-    validateZipContent(zipPath) {
-      Zip.unzip({
-        archive: zipPath,
-        overwrite: true,
-      }).then((extractedFolderPath) => {
-        let cacheFolderPath = extractedFolderPath + "/EnRecipes";
-        const EnRecipesFilePath = cacheFolderPath + "/recipes.json";
-        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([
-            {
-              zipPath,
-              path: EnRecipesFilePath,
-              db: "EnRecipesDB",
-              file: "recipes.json",
-            },
-            {
-              zipPath,
-              path: userCuisinesFilePath,
-              db: "userCuisinesDB",
-              file: "userCuisines.json",
-            },
-            {
-              zipPath,
-              path: userCategoriesFilePath,
-              db: "userCategoriesDB",
-              file: "userCategories.json",
-            },
-            {
-              zipPath,
-              path: userYieldUnitsFilePath,
-              db: "userYieldUnitsDB",
-              file: "userYieldUnits.json",
-            },
-            {
-              zipPath,
-              path: userUnitsFilePath,
-              db: "userUnitsDB",
-              file: "userUnits.json",
-            },
-            {
-              zipPath,
-              path: mealPlansFilePath,
-              db: "mealPlansDB",
-              file: "mealPlans.json",
-            },
-          ]);
-        } else {
-          Folder.fromPath(extractedFolderPath).remove();
-          this.failedImport(localize("buInc"));
-        }
-        if (Folder.exists(cacheFolderPath + "/Images")) {
-          this.importImages(cacheFolderPath + "/Images");
-        }
-      });
+    touch({ object, action }, view) {
+      object.className = action.match(/down|move/) ? "option fade" : "option";
+      if (action == "up") this.navigateTo(view);
     },
-    importImages(sourcePath) {
-      let dest = knownFolders.documents().path;
-      Zip.unzip({
-        archive: sourcePath,
-        directory: dest,
-        overwrite: true,
-      }).then((res) => {
-        this.showImportSummary();
-        this.unlinkBrokenImages();
-      });
-    },
-    showImportSummary() {
-      let { found, imported, updated } = this.importSummary;
-      let exists = Math.abs(found - imported - updated) + updated;
-      let importedNote = `\n${imported} ${localize("recI")}`;
-      let existsNote = `\n${exists} ${localize("recE")}`;
-      let updatedNote = `\n${updated} ${localize("recU")}`;
-      this.$showModal(ConfirmDialog, {
-        props: {
-          title: "impSuc",
-          description: `${found} ${localize(
-            "recF"
-          )}${importedNote}${existsNote}${updatedNote}`,
-          okButtonText: "OK",
-          helpIcon: "succ",
-          bgColor: "#69db7c",
-        },
-      });
-    },
-    // PERMISSIONS HANDLER
-    permissionCheck(confirmation, description, action) {
-      if (!ApplicationSettings.getBoolean("storagePermissionAsked", false)) {
-        confirmation(description).then((e) => {
-          if (e) {
-            Permissions.request("photo").then((res) => {
-              let status = res[Object.keys(res)[0]];
-              if (status === "authorized") action();
-              if (status !== "denied")
-                ApplicationSettings.setBoolean("storagePermissionAsked", true);
-              else Toast.makeText(localize("dend")).show();
-            });
-          }
-        });
-      } else {
-        Permissions.check("photo").then((res) => {
-          let status = res[Object.keys(res)[0]];
-          if (status !== "authorized") {
-            confirmation(description).then((e) => {
-              e && utils.openAppSettingsPage();
-            });
-          } else action();
-        });
-      }
-    },
-    permissionConfirmation(description) {
-      return this.$showModal(ConfirmDialog, {
-        props: {
-          title: "grant",
-          description,
-          cancelButtonText: "nNBtn",
-          okButtonText: "conBtn",
-          helpIcon: "folder",
-          bgColor: "#ff5200",
-        },
-      });
-    },
-    // RESET
-    resetListItems(listName) {
-      this.resetListItemsAction(listName);
-      Toast.makeText(localize("restDone")).show();
-    },
-  },
-  mounted() {
-    this.appTheme = ApplicationSettings.getString("appTheme", "Light");
-    this.appLanguage = ApplicationSettings.getString(
-      "appLanguage",
-      localize("sysDef")
-    );
   },
 };
 </script>
diff --git a/app/components/Settings/About.vue b/app/components/Settings/About.vue
new file mode 100644
index 00000000..4314cb70
--- /dev/null
+++ b/app/components/Settings/About.vue
@@ -0,0 +1,111 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        rowSpan="2"
+        colSpan="2"
+        class="options-list"
+        for="item in items"
+        @loaded="listViewLoad"
+      >
+        <v-template if="$index == 0">
+          <Label class="pageTitle" :text="'About' | L" />
+        </v-template>
+        <v-template if="$index == 1">
+          <StackLayout class="app-info">
+            <Image
+              class="icon"
+              src="res://ic_launcher_foreground"
+              stretch="none"
+            />
+            <Label class="name tb tac" :text="'EnRecipes' | L" />
+            <Label :text="getVersion" class="version tb tac" />
+
+            <Label class="info tac tw" :text="'appInfo' | L" />
+          </StackLayout>
+        </v-template>
+        <v-template if="$index == 6">
+          <StackLayout class="listSpace"> </StackLayout>
+        </v-template>
+        <v-template>
+          <GridLayout
+            columns="auto, *"
+            class="option"
+            @touch="touch($event, item.url)"
+          >
+            <Label class="ico" :text="icon[item.icon]" />
+            <Label 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 { Application, Observable, Utils } from "@nativescript/core";
+import { mapState } from "vuex";
+
+export default {
+  computed: {
+    ...mapState(["icon"]),
+    items() {
+      return [
+        {},
+        {},
+        {
+          icon: "gh",
+          title: "gh",
+          url: "https://github.com/vishnuraghavb/EnRecipes",
+        },
+        {
+          icon: "priv",
+          title: "priv",
+          url:
+            "https://github.com/vishnuraghavb/EnRecipes/blob/main/PRIVACY.md",
+        },
+        {
+          icon: "don",
+          title: "donate",
+          url: "https://www.vishnuraghav.com/donate",
+        },
+        {
+          icon: "trans",
+          title: "trnsl",
+          url: "https://hosted.weblate.org/projects/enrecipes/app-translations",
+        },
+        {},
+      ];
+    },
+    getVersion() {
+      let ctx = Application.android.context;
+      return (
+        "v" +
+        ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0)
+          .versionName
+      );
+    },
+  },
+  methods: {
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    // HELPERS
+    openURL(url) {
+      Utils.openUrl(url);
+    },
+    touch({ object, action }, url) {
+      object.className = action.match(/down|move/) ? "option fade" : "option";
+      if (action == "up") this.openURL(url);
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/BackupInfo.vue b/app/components/Settings/BackupInfo.vue
new file mode 100644
index 00000000..a75dfb91
--- /dev/null
+++ b/app/components/Settings/BackupInfo.vue
@@ -0,0 +1,15 @@
+<template>
+  <Page>
+    <GridLayout class="progressContainer" columns="*, 64">
+      <Progress col="0" :value="backupProgress" maxValue="100" />
+      <Label col="1" :text="`  ${backupProgress}%`" />
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/app/components/Settings/Database.vue b/app/components/Settings/Database.vue
new file mode 100644
index 00000000..91f406f9
--- /dev/null
+++ b/app/components/Settings/Database.vue
@@ -0,0 +1,446 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        @loaded="listViewLoad"
+        for="item in items"
+      >
+        <v-template if="$index == 0">
+          <Label class="pageTitle" :text="'db' | L" />
+        </v-template>
+        <v-template if="$index == 3">
+          <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 | L" class="sub" />
+            </StackLayout>
+          </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 {
+  ApplicationSettings,
+  path,
+  knownFolders,
+  File,
+  Folder,
+  Observable,
+} from "@nativescript/core";
+import * as Permissions from "@nativescript-community/perms";
+import { Zip } from "@nativescript/zip";
+// import * as Filepicker from "nativescript-plugin-filepicker";
+import { localize } from "@nativescript/localize";
+import ConfirmDialog from "../modal/ConfirmDialog.vue";
+import { mapState, mapActions } from "vuex";
+
+import * as utils from "~/shared/utils";
+
+export default {
+  data() {
+    return {
+      backupProgress: 0,
+      backupInProgress: false,
+    };
+  },
+  computed: {
+    ...mapState([
+      "icon",
+      "recipes",
+      "cuisines",
+      "categories",
+      "yieldUnits",
+      "units",
+      "mealPlans",
+      "importSummary",
+    ]),
+    items() {
+      return [
+        {},
+        {
+          icon: "exp",
+          title: "expBu",
+          subTitle: "buInfo",
+          action: this.exportCheck,
+        },
+        {
+          icon: "imp",
+          title: "impBu",
+          subTitle: "impInfo",
+          action: this.importCheck,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions([
+      "importListItemsAction",
+      "importRecipesAction",
+      "importMealPlansAction",
+      "unlinkBrokenImages",
+    ]),
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    // EXPORT HANDLERS
+    exportCheck() {
+      if (!this.recipes.length) {
+        // Toast.makeText(localize("aFBu")).show();
+      } else {
+        this.permissionCheck(
+          this.permissionConfirmation,
+          localize("reqAcc"),
+          this.exportBackup
+        );
+      }
+    },
+    exportBackup() {
+      this.exportFiles("create");
+      let date = new Date();
+      let formattedDate =
+        date.getFullYear() +
+        "-" +
+        ("0" + (date.getMonth() + 1)).slice(-2) +
+        "-" +
+        ("0" + date.getDate()).slice(-2) +
+        "_" +
+        ("0" + date.getHours()).slice(-2) +
+        ("0" + date.getMinutes()).slice(-2) +
+        ("0" + date.getSeconds()).slice(-2);
+      const sdDownloadPath = Folder.fromPath(
+        android.os.Environment.getExternalStorageDirectory().getAbsolutePath()
+      ).getFolder("Download").path;
+      let fromPath = path.join(knownFolders.documents().path, "EnRecipes");
+      let destPath = path.join(
+        sdDownloadPath,
+        `EnRecipes-Backup_${formattedDate}.zip`
+      );
+      this.backupInProgress = true;
+      Zip.zip({
+        directory: fromPath,
+        archive: destPath,
+        onProgress: (progress) => {
+          this.backupProgress = progress;
+        },
+      }).then((success) => {
+        // Toast.makeText(
+        //   "Backup file successfully saved to Download folder",
+        //   "long"
+        // ).show();
+        this.exportFiles("delete");
+        setTimeout((e) => (this.backupInProgress = false), 3000);
+      });
+    },
+    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;
+        default:
+          break;
+      }
+    },
+    writeDataToFile(file, data) {
+      file.writeText(JSON.stringify(data));
+    },
+    // IMPORT HANDLERS
+    importCheck() {
+      this.permissionCheck(
+        this.permissionConfirmation,
+        localize("reqAcc"),
+        this.openFilePicker
+      );
+    },
+    openFilePicker() {
+      // Filepicker.create({
+      //   mode: "single",
+      //   extensions: ["zip"],
+      // })
+      //   .present()
+      //   .then((selection) => {
+      //     // Toast.makeText(localize("vrfy") + "...").show();
+      //     let zipPath = selection[0];
+      //     this.validateZipContent(zipPath);
+      //   });
+    },
+    importDataToDB(data, db, zipPath) {
+      switch (db) {
+        case "EnRecipesDB":
+          this.importImages(zipPath);
+          this.importRecipesAction(data);
+          break;
+        case "userCuisinesDB":
+          this.importListItemsAction({
+            data,
+            listName: "cuisines",
+          });
+          break;
+        case "userCategoriesDB":
+          this.importListItemsAction({
+            data,
+            listName: "categories",
+          });
+          break;
+        case "userYieldUnitsDB":
+          this.importListItemsAction({
+            data,
+            listName: "yieldUnits",
+          });
+          break;
+        case "userUnitsDB":
+          this.importListItemsAction({
+            data,
+            listName: "units",
+          });
+          break;
+        case "mealPlansDB":
+          this.importMealPlansAction(data);
+          break;
+        default:
+          break;
+      }
+    },
+    hasValidJSON(data) {
+      try {
+        JSON.parse(data) && Array.isArray(JSON.parse(data));
+      } catch (e) {
+        return false;
+      }
+      return true;
+    },
+    isFileDataValid(file) {
+      const files = file.filter((e) => File.exists(e.path));
+      if (files.length) {
+        let isValid = files.map((e) => false);
+        files.forEach((file, i) => {
+          File.fromPath(file.path)
+            .readText()
+            .then((data) => {
+              isValid[i] = this.hasValidJSON(data);
+              if (!isValid[i]) {
+                this.failedImport(
+                  `${localize("buMod")}\n\n${localize("invFile")}: ${file.file}`
+                );
+                return 0;
+              }
+              if (isValid.every((e) => e === true)) {
+                files.forEach((file, i) => {
+                  File.fromPath(file.path)
+                    .readText()
+                    .then((data) => {
+                      this.importDataToDB(
+                        JSON.parse(data),
+                        file.db,
+                        file.zipPath
+                      );
+                    });
+                });
+              }
+            });
+        });
+      } else {
+        this.failedImport(localize("buEmp"));
+      }
+    },
+    failedImport(description) {
+      this.$showModal(ConfirmDialog, {
+        props: {
+          title: "impFail",
+          description,
+          okButtonText: "OK",
+        },
+      });
+    },
+    validateZipContent(zipPath) {
+      Zip.unzip({
+        archive: zipPath,
+        overwrite: true,
+      }).then((extractedFolderPath) => {
+        let cacheFolderPath = extractedFolderPath + "/EnRecipes";
+        const EnRecipesFilePath = cacheFolderPath + "/recipes.json";
+        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([
+            {
+              zipPath,
+              path: EnRecipesFilePath,
+              db: "EnRecipesDB",
+              file: "recipes.json",
+            },
+            {
+              zipPath,
+              path: userCuisinesFilePath,
+              db: "userCuisinesDB",
+              file: "userCuisines.json",
+            },
+            {
+              zipPath,
+              path: userCategoriesFilePath,
+              db: "userCategoriesDB",
+              file: "userCategories.json",
+            },
+            {
+              zipPath,
+              path: userYieldUnitsFilePath,
+              db: "userYieldUnitsDB",
+              file: "userYieldUnits.json",
+            },
+            {
+              zipPath,
+              path: userUnitsFilePath,
+              db: "userUnitsDB",
+              file: "userUnits.json",
+            },
+            {
+              zipPath,
+              path: mealPlansFilePath,
+              db: "mealPlansDB",
+              file: "mealPlans.json",
+            },
+          ]);
+        } else {
+          Folder.fromPath(extractedFolderPath).remove();
+          this.failedImport(localize("buInc"));
+        }
+        if (Folder.exists(cacheFolderPath + "/Images")) {
+          this.importImages(cacheFolderPath + "/Images");
+        }
+      });
+    },
+    importImages(sourcePath) {
+      let dest = knownFolders.documents().path;
+      Zip.unzip({
+        archive: sourcePath,
+        directory: dest,
+        overwrite: true,
+      }).then((res) => {
+        this.showImportSummary();
+        this.unlinkBrokenImages();
+      });
+    },
+    showImportSummary() {
+      let { found, imported, updated } = this.importSummary;
+      let exists = Math.abs(found - imported - updated) + updated;
+      let importedNote = `\n${imported} ${localize("recI")}`;
+      let existsNote = `\n${exists} ${localize("recE")}`;
+      let updatedNote = `\n${updated} ${localize("recU")}`;
+      this.$showModal(ConfirmDialog, {
+        props: {
+          title: "impSuc",
+          description: `${found} ${localize(
+            "recF"
+          )}${importedNote}${existsNote}${updatedNote}`,
+          okButtonText: "OK",
+        },
+      });
+    },
+    // PERMISSIONS HANDLER
+    permissionCheck(confirmation, description, action) {
+      if (!ApplicationSettings.getBoolean("storagePermissionAsked", false)) {
+        confirmation(description).then((e) => {
+          if (e) {
+            Permissions.request("photo").then((res) => {
+              let status = res[Object.keys(res)[0]];
+              if (status === "authorized") action();
+              if (status !== "denied")
+                ApplicationSettings.setBoolean("storagePermissionAsked", true);
+              // else Toast.makeText(localize("dend")).show();
+            });
+          }
+        });
+      } else {
+        Permissions.check("photo").then((res) => {
+          let status = res[Object.keys(res)[0]];
+          if (status !== "authorized") {
+            confirmation(description).then((e) => {
+              e && utils.openAppSettingsPage();
+            });
+          } else action();
+        });
+      }
+    },
+    permissionConfirmation(description) {
+      return this.$showModal(ConfirmDialog, {
+        props: {
+          title: "grant",
+          description,
+          cancelButtonText: "nNBtn",
+          okButtonText: "conBtn",
+        },
+      });
+    },
+    // 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/Help.vue b/app/components/Settings/Help.vue
new file mode 100644
index 00000000..0d68772c
--- /dev/null
+++ b/app/components/Settings/Help.vue
@@ -0,0 +1,78 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        for="item in items"
+        @loaded="listViewLoad"
+      >
+        <v-template if="$index == 0">
+          <Label class="pageTitle" :text="'help' | L" />
+        </v-template>
+        <v-template if="$index == 3">
+          <StackLayout class="listSpace"> </StackLayout>
+        </v-template>
+        <v-template>
+          <GridLayout
+            columns="auto, *"
+            class="option"
+            @touch="touch($event, item.url)"
+          >
+            <Label class="ico" :text="icon[item.icon]" />
+            <Label col="1" :text="item.title | L" class="info" />
+          </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, Utils } from "@nativescript/core";
+import { mapState } from "vuex";
+
+export default {
+  computed: {
+    ...mapState(["icon"]),
+    items() {
+      return [
+        {},
+        {
+          icon: "tg",
+          title: "joinTG",
+          url: "https://t.me/enrecipes",
+        },
+        {
+          icon: "help",
+          title: "guide",
+          url: "https://github.com/vishnuraghavb/EnRecipes/wiki/User-Guide",
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    // HELPERS
+    openURL(url) {
+      Utils.openUrl(url);
+    },
+    touch({ object, action }, url) {
+      object.className = action.match(/down|move/) ? "option fade" : "option";
+      if (action == "up") this.openURL(url);
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Interface.vue b/app/components/Settings/Interface.vue
new file mode 100644
index 00000000..eb3b62b5
--- /dev/null
+++ b/app/components/Settings/Interface.vue
@@ -0,0 +1,168 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        @loaded="listViewLoad"
+        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>
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button
+          class="ico"
+          :text="icon.back"
+          @tap="$navigateBack()"
+        />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import {
+  ApplicationSettings,
+  Observable,
+  Device,
+  Frame,
+} from "@nativescript/core";
+import { localize, overrideLocale } from "@nativescript/localize";
+import ActionDialog from "../modal/ActionDialog.vue";
+import ConfirmDialog from "../modal/ConfirmDialog.vue";
+import { mapState, mapActions } from "vuex";
+
+export default {
+  data() {
+    return {
+      appLanguage: "English",
+    };
+  },
+  computed: {
+    ...mapState(["icon", "language", "appTheme", "layout"]),
+    items() {
+      return [
+        {},
+        {
+          icon: "lang",
+          title: "lang",
+          subTitle: this.appLanguage,
+          action: this.selectAppLanguage,
+        },
+        {
+          icon: "theme",
+          title: "Theme",
+          subTitle: localize(this.appTheme),
+          action: this.selectThemes,
+        },
+        {
+          icon: "l1",
+          title: "listVM",
+          subTitle: localize(this.layout),
+          action: this.setLayoutMode,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setTheme", "setLayout"]),
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    // LANGUAGE SELECTION
+    selectAppLanguage() {
+      let languages = this.language.map((e) => e.title);
+      this.$showModal(ActionDialog, {
+        props: {
+          title: "lang",
+          list: [...languages],
+        },
+      }).then((action) => {
+        if (action && action !== "Cancel" && this.appLanguage !== action) {
+          let currentLocale = Device.language.split("-")[0];
+          let locale = this.language.filter((e) => e.title === action)[0]
+            .locale;
+          if (currentLocale !== locale) {
+            this.$showModal(ConfirmDialog, {
+              props: {
+                title: "appRst",
+                description: localize("nLangInfo"),
+                cancelButtonText: "cBtn",
+                okButtonText: "rst",
+              },
+            }).then((result) => {
+              if (result) {
+                this.appLanguage = action;
+                ApplicationSettings.setString("appLanguage", action);
+                overrideLocale(locale);
+                setTimeout(utils.restartApp, 250);
+              }
+            });
+          }
+        }
+      });
+    },
+    // THEME SELECTION
+    selectThemes() {
+      this.$showModal(ActionDialog, {
+        props: {
+          title: "Theme",
+          list: ["Light", "Dark", "Black"],
+        },
+      }).then((action) => {
+        if (action && action !== "Cancel" && this.appTheme !== action) {
+          this.setTheme(action);
+          Frame.reloadPage();
+        }
+      });
+    },
+    // LAYOUT MODE
+    setLayoutMode() {
+      this.$showModal(ActionDialog, {
+        props: {
+          title: "List view mode",
+          list: ["Detailed", "Grid", "Simple", "Minimal"],
+        },
+      }).then((action) => {
+        if (action && action !== "Cancel" && this.layoutMode !== action) {
+          let act = action.toLowerCase();
+          ApplicationSettings.setString("layout", act);
+          this.setLayout(act);
+        }
+      });
+    },
+    // HELPERS
+    touch({ object, action }, method) {
+      object.className = action.match(/down|move/) ? "option fade" : "option";
+      if (action == "up") method();
+    },
+  },
+  mounted() {
+    this.appLanguage = ApplicationSettings.getString(
+      "appLanguage",
+      localize("sysDef")
+    );
+  },
+};
+</script>
diff --git a/app/components/Settings/Options.vue b/app/components/Settings/Options.vue
new file mode 100644
index 00000000..871c4e3b
--- /dev/null
+++ b/app/components/Settings/Options.vue
@@ -0,0 +1,88 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        @loaded="listViewLoad"
+        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">
+              <Label :text="item.title | L" class="info" />
+              <Label :text="item.subTitle | L" class="sub" />
+            </StackLayout>
+            <Switch
+              :color="item.subAction ? '#ff5200' : '#858585'"
+              verticalAlignment="center"
+              col="2"
+              :checked="item.subAction"
+              @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 { ApplicationSettings, Observable } from "@nativescript/core";
+import { localize } from "@nativescript/localize";
+import { mapState, mapActions } from "vuex";
+import * as utils from "~/shared/utils";
+
+export default {
+  computed: {
+    ...mapState(["icon", "shakeEnabled"]),
+    items() {
+      return [
+        {},
+        {
+          type: "switch",
+          icon: "shuf",
+          title: "sVw",
+          subTitle: "sVwInfo",
+          action: this.toggleShake,
+          subAction: this.shakeEnabled,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setShakeAction"]),
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    // SHAKE VIEW RANDOM RECIPE
+    toggleShake(args) {
+      let checked = args.object.checked;
+      if (checked && !utils.hasAccelerometer()) {
+        args.object.checked = false;
+        // Toast.makeText(localize("noAccSensor"), "long").show();
+      } else {
+        ApplicationSettings.setBoolean("shakeEnabled", checked);
+        this.setShakeAction(checked);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Reset.vue b/app/components/Settings/Reset.vue
new file mode 100644
index 00000000..6c150ed5
--- /dev/null
+++ b/app/components/Settings/Reset.vue
@@ -0,0 +1,87 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <ListView
+        colSpan="2"
+        rowSpan="2"
+        class="options-list"
+        @loaded="listViewLoad"
+        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>
+      <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 { localize } from "@nativescript/localize";
+import { mapState, mapActions } from "vuex";
+
+export default {
+  computed: {
+    ...mapState(["icon"]),
+    items() {
+      return [
+        {},
+        {
+          type: "cuisines",
+          title: "restCuiL",
+        },
+        {
+          type: "categories",
+          title: "restCatL",
+        },
+        {
+          type: "yieldUnits",
+          title: "restYUL",
+        },
+        {
+          type: "units",
+          title: "restUL",
+        },
+        {},
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["resetListItemsAction"]),
+    onPageLoad(args) {
+      const page = args.object;
+      page.bindingContext = new Observable();
+    },
+    // RESET
+    resetListItems(listName) {
+      this.resetListItemsAction(listName);
+      // Toast.makeText(localize("restDone")).show();
+    },
+    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/ViewRecipe.vue b/app/components/ViewRecipe.vue
index 349998c8..225e002c 100644
--- a/app/components/ViewRecipe.vue
+++ b/app/components/ViewRecipe.vue
@@ -1,459 +1,263 @@
 <template>
-  <Page @loaded="onPageLoad" @unloaded="onPageUnload">
-    <ActionBar flat="true">
-      <GridLayout rows="48" columns="auto, *, auto">
-        <MDButton
-          variant="text"
-          row="0"
-          col="0"
-          class="er"
-          :text="icon.back"
-          automationText="Back"
-          @tap="$navigateBack()"
+  <Page @loaded="onPageLoad" @unloaded="onPageUnload" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="*">
+      <DockLayout stretchLastChild="true" rowSpan="2">
+        <GridLayout
+          dock="top"
+          rows="auto,auto"
+          columns="*, auto"
+          paddingBottom="8"
+          :class="{ topPlate: scrolled }"
+        >
+          <StackLayout>
+            <Label class="pageTitle" paddingBottom="8" :text="recipe.title" />
+            <StackLayout marginLeft="12" orientation="horizontal">
+              <Button
+                class="ico rate"
+                :class="{ rated: recipe.rating >= n }"
+                v-for="n in 5"
+                :key="n"
+                :text="recipe.rating < n ? icon.star : icon.starred"
+                @tap="
+                  recipe.rating == 1 && n == 1 ? setRating(0) : setRating(n)
+                "
+                @longPress="setRating(n)"
+              />
+            </StackLayout>
+          </StackLayout>
+          <Image
+            col="1"
+            v-if="recipe.imageSrc"
+            :src="recipe.imageSrc"
+            stretch="aspectFit"
+            class="photo"
+            decodeWidth="96"
+            decodeHeight="96"
+          />
+          <StackLayout row="1" colSpan="2" orientation="horizontal" margin="16">
+            <GridLayout
+              rows="48"
+              columns="auto, auto"
+              class="segment"
+              v-for="(item, index) in topmenu"
+              :key="index"
+              :class="{ select: selectedIndex == index }"
+              @touch="touchSelector($event, index, item.icon)"
+            >
+              <Label class="ico" :text="icon[item.icon]" />
+              <Label class="value" :text="item.count" col="1" />
+            </GridLayout>
+          </StackLayout>
+        </GridLayout>
+        <ScrollView
+          dock="bottom"
+          @loaded="onScrollLoad"
+          @scroll="!toast && onScroll($event)"
+        >
+          <StackLayout>
+            <StackLayout>
+              <GridLayout rows="auto" columns="*, *">
+                <StackLayout class="attribute">
+                  <Label class="title" :text="'cui' | L" />
+                  <Label class="value" :text="recipe.cuisine | L" />
+                </StackLayout>
+                <StackLayout class="attribute" col="1">
+                  <Label class="title" :text="'cat' | L" />
+                  <Label class="value" :text="recipe.category | L" />
+                </StackLayout>
+              </GridLayout>
+              <StackLayout v-if="recipe.tags.length" class="attribute">
+                <Label class="title" :text="'ts' | L" />
+                <Label class="value" :text="getTags(recipe.tags)" />
+              </StackLayout>
+              <GridLayout rows="auto" columns="*, *">
+                <StackLayout class="attribute" v-if="hasTime(recipe.prepTime)">
+                  <Label class="title" :text="'prepT' | L" />
+                  <Label class="value" :text="formattedTime(recipe.prepTime)" />
+                </StackLayout>
+                <StackLayout
+                  :col="hasTime(recipe.prepTime) ? 1 : 0"
+                  class="attribute"
+                  v-if="hasTime(recipe.cookTime)"
+                >
+                  <Label class="title" :text="'cookT' | L" />
+                  <Label class="value" :text="formattedTime(recipe.cookTime)" />
+                </StackLayout>
+              </GridLayout>
+              <GridLayout rows="auto" columns="*, *">
+                <StackLayout class="attribute">
+                  <Label class="title" :text="'yld' | L" />
+                  <Label
+                    @touch="touchYield"
+                    class="value clickable"
+                    :text="`${positiveYieldMultiplier} ${$options.filters.L(
+                      recipe.yield.unit
+                    )}`"
+                  />
+                </StackLayout>
+                <StackLayout class="attribute" col="1">
+                  <Label class="title" :text="'Difficulty level' | L" />
+                  <Label class="value" :text="recipe.difficulty | L" />
+                </StackLayout>
+              </GridLayout>
+            </StackLayout>
+            <StackLayout>
+              <Label
+                id="items"
+                padding="0 16"
+                class="sectionTitle"
+                v-show="recipe.ingredients.length"
+                :text="'ings' | L"
+              />
+              <StackLayout @loaded="onIngsLoad">
+                <GridLayout
+                  rows="auto"
+                  columns="auto, *"
+                  v-for="(item, index) in recipe.ingredients"
+                  :key="index + 'ing'"
+                  class="ingredient"
+                  @touch="touchIngredient($event, index)"
+                >
+                  <Button class="ico min" :text="icon.done" />
+                  <Label
+                    class="value tw"
+                    col="1"
+                    :text="`${
+                      roundedQuantity(item.quantity)
+                        ? roundedQuantity(item.quantity) + ' '
+                        : ''
+                    }${
+                      roundedQuantity(item.quantity)
+                        ? $options.filters.L(item.unit) + ' '
+                        : ''
+                    }${item.item}`"
+                  />
+                </GridLayout>
+              </StackLayout>
+              <Label
+                id="steps"
+                padding="0 16"
+                v-show="recipe.instructions.length"
+                class="sectionTitle"
+                :text="'ins' | L"
+              />
+              <StackLayout @loaded="onInsLoad">
+                <GridLayout
+                  @touch="touchInstruction"
+                  columns="auto ,*"
+                  v-for="(instruction, index) in recipe.instructions"
+                  :key="index + 'ins'"
+                  class="instruction"
+                >
+                  <Button class="count ico min" :text="index + 1" />
+                  <Label col="1" class="value tw" :text="instruction" />
+                </GridLayout>
+              </StackLayout>
+              <Label
+                id="comb"
+                padding="0 16"
+                v-show="recipe.combinations.length"
+                class="sectionTitle"
+                :text="'cmbs' | L"
+              />
+              <Button
+                v-for="(combination, index) in recipe.combinations"
+                :key="index + 'comb'"
+                class="combination"
+                :text="getCombinationTitle(combination)"
+                @tap="viewCombination(combination)"
+              />
+              <Label
+                id="notes"
+                padding="0 16"
+                v-show="recipe.notes.length"
+                class="sectionTitle"
+                :text="'nos' | L"
+              />
+              <StackLayout @loaded="onNosLoad" padding="0 16 72"> </StackLayout>
+            </StackLayout>
+          </StackLayout>
+        </ScrollView>
+      </DockLayout>
+
+      <GridLayout
+        row="1"
+        @loaded="onAppBarLoad"
+        class="appbar"
+        v-show="!toast"
+        columns="auto, *, auto, auto, auto, auto"
+      >
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+        <Button
+          col="2"
+          v-if="!filterTrylater"
+          class="ico"
+          :text="recipe.tried ? icon.try : icon.tried"
+          @tap="toggleTrylater"
         />
-        <FlexboxLayout row="0" col="2" alignItems="center">
-          <MDButton
-            v-if="!filterTrylater"
-            variant="text"
-            class="er"
-            :text="recipe.tried ? icon.try : icon.tried"
-            @tap="toggleTrylater"
-          />
-          <MDButton
-            v-else
-            variant="text"
-            class="er"
-            :text="icon.done"
-            @tap="recipeTried"
-          />
-          <MDButton
-            variant="text"
-            class="er"
-            :text="recipe.isFavorite ? icon.faved : icon.fav"
-            @tap="toggleFavourite"
-          />
-          <!-- <MDButton variant="text" class="er" :text="recipe.inBag ? icon.bagged : icon.bag" @tap="toggleCart" /> -->
-          <MDButton
-            variant="text"
-            v-if="!busy"
-            class="er"
-            :text="icon.edit"
-            @tap="editRecipe"
-          />
-          <MDActivityIndicator v-else :busy="busy" />
+        <Button
+          col="2"
+          v-else
+          class="ico"
+          :text="icon.done"
+          @tap="recipeTried"
+        />
+        <Button
+          col="3"
+          class="ico"
+          :text="recipe.isFavorite ? icon.faved : icon.fav"
+          @tap="toggleFavourite"
+        />
+        <Button
+          col="4"
+          v-if="!busy"
+          class="ico"
+          :text="icon.edit"
+          @tap="editRecipe"
+        />
+        <ActivityIndicator col="4" v-else :busy="busy" />
+        <Button
+          class="ico fab"
+          :text="icon.share"
+          col="5"
+          @tap="shareHandler"
+        />
+      </GridLayout>
+      <GridLayout
+        v-show="toast"
+        row="1"
+        class="appbar"
+        :class="hlMsg && 'hlMsg'"
+        columns="*"
+        @tap="toast = null"
+      >
+        <FlexboxLayout minHeight="48" alignItems="center">
+          <Label class="title msg" :text="toast" />
         </FlexboxLayout>
       </GridLayout>
-    </ActionBar>
-    <AbsoluteLayout>
-      <Tabs
-        width="100%"
-        height="100%"
-        :selectedIndex="selectedTabIndex"
-        @selectedIndexChange="selectedIndexChange"
-        class="viewRecipe"
-      >
-        <TabStrip androidElevation="1">
-          <TabStripItem>
-            <Label :text="'ovw' | L"></Label>
-          </TabStripItem>
-          <TabStripItem>
-            <Label :text="'ings' | L"></Label>
-          </TabStripItem>
-          <TabStripItem>
-            <Label :text="'Instructions' | L"></Label>
-          </TabStripItem>
-          <TabStripItem>
-            <Label :text="'nos' | L"></Label>
-          </TabStripItem>
-          <TabStripItem>
-            <Label :text="'cmbs' | L"></Label>
-          </TabStripItem>
-        </TabStrip>
-        <TabContentItem>
-          <ScrollView @loaded="overviewLoaded">
-            <StackLayout>
-              <StackLayout
-                width="100%"
-                :height="screenWidth"
-                verticalAlignment="center"
-                class="imageHolder"
-              >
-                <Image
-                  v-if="recipe.imageSrc"
-                  :src="recipe.imageSrc"
-                  stretch="aspectFill"
-                  width="100%"
-                  :height="screenWidth"
-                />
-                <Label
-                  v-else
-                  horizontalAlignment="center"
-                  class="er"
-                  fontSize="160"
-                  :text="icon.img"
-                />
-              </StackLayout>
-              <StackLayout margin="16 4 80">
-                <Label
-                  class="category"
-                  :text="`${$options.filters.L(
-                    recipe.cuisine
-                  )} • ${$options.filters.L(recipe.category)}`"
-                />
-                <Label
-                  class="title orkm"
-                  :text="recipe.title"
-                  textWrap="true"
-                />
-                <FlexboxLayout class="ratingContainer">
-                  <Label
-                    class="rate er"
-                    :class="{ rated: recipe.rating >= n }"
-                    v-for="n in 5"
-                    :key="n"
-                    :text="recipe.rating < n ? icon.star : icon.starred"
-                    @tap="
-                      recipe.rating == 1 && n == 1 ? setRating(0) : setRating(n)
-                    "
-                    @longPress="setRating(n)"
-                  />
-                </FlexboxLayout>
-                <Label
-                  class="attr"
-                  :text="`${$options.filters.L(
-                    'Difficulty level'
-                  )}: ${$options.filters.L(recipe.difficulty)}`"
-                  textWrap="true"
-                />
-                <Label
-                  class="attr"
-                  :text="`${$options.filters.L(
-                    'Preparation time'
-                  )}: ${formattedTime(recipe.prepTime)}`"
-                  textWrap="true"
-                />
-                <Label
-                  class="attr"
-                  :text="`${$options.filters.L(
-                    'Cooking time'
-                  )}: ${formattedTime(recipe.cookTime)}`"
-                  textWrap="true"
-                />
-                <FlexboxLayout
-                  v-if="recipe.tags.length"
-                  class="tagsContainer"
-                  flexWrap="wrap"
-                >
-                  <Label
-                    class="tagsTitle"
-                    :text="`${$options.filters.L('ts')}: `"
-                  />
-                  <Label
-                    v-for="(tag, index) in recipe.tags"
-                    :key="index"
-                    :text="tag"
-                    class="tag"
-                    textWrap="false"
-                  />
-                </FlexboxLayout>
-                <GridLayout
-                  rows="auto, auto"
-                  columns="*, *"
-                  class="overviewContainer"
-                >
-                  <GridLayout
-                    class="overviewItem mdr"
-                    row="0"
-                    col="0"
-                    rows="auto, auto"
-                    columns="*"
-                    @tap="selectedTabIndex = 1"
-                  >
-                    <Label row="0" class="er" :text="icon.items" />
-                    <Label
-                      row="1"
-                      class="itemCount"
-                      :text="`${recipe.ingredients.length} ${
-                        recipe.ingredients.length == 1
-                          ? $options.filters.L('ing')
-                          : $options.filters.L('ings')
-                      }`"
-                      textWrap="true"
-                    />
-                  </GridLayout>
-                  <GridLayout
-                    class="overviewItem mdr"
-                    row="0"
-                    col="1"
-                    rows="auto, auto"
-                    columns="*"
-                    @tap="selectedTabIndex = 2"
-                  >
-                    <Label row="0" class="er" :text="icon.steps" />
-                    <Label
-                      row="1"
-                      class="itemCount"
-                      :text="`${recipe.instructions.length} ${
-                        recipe.instructions.length == 1
-                          ? $options.filters.L('Instruction')
-                          : $options.filters.L('Instructions')
-                      }`"
-                      textWrap="true"
-                    />
-                  </GridLayout>
-                  <GridLayout
-                    class="overviewItem mdr"
-                    row="1"
-                    col="0"
-                    rows="auto, auto"
-                    columns="*"
-                    @tap="selectedTabIndex = 3"
-                  >
-                    <Label row="0" class="er" :text="icon.notes" />
-                    <Label
-                      row="1"
-                      class="itemCount"
-                      :text="`${recipe.notes.length} ${
-                        recipe.notes.length == 1
-                          ? $options.filters.L('no')
-                          : $options.filters.L('nos')
-                      }`"
-                      textWrap="true"
-                    />
-                  </GridLayout>
-                  <GridLayout
-                    class="overviewItem mdr"
-                    row="1"
-                    col="1"
-                    rows="auto, auto"
-                    columns="*"
-                    @tap="selectedTabIndex = 4"
-                  >
-                    <Label row="0" class="er" :text="icon.comb" />
-                    <Label
-                      row="1"
-                      class="itemCount"
-                      :text="`${recipe.combinations.length} ${
-                        recipe.combinations.length == 1
-                          ? $options.filters.L('cmb')
-                          : $options.filters.L('cmbs')
-                      }`"
-                      textWrap="true"
-                    />
-                  </GridLayout>
-                </GridLayout>
-                <Label
-                  class="attr small"
-                  :text="`${$options.filters.L(
-                    'Last updated'
-                  )}: ${formattedDate(recipe.lastModified)}`"
-                  textWrap="true"
-                />
-                <Label
-                  class="attr small"
-                  :text="`${$options.filters.L('Created')}: ${formattedDate(
-                    recipe.created
-                  )}`"
-                  textWrap="true"
-                />
-              </StackLayout>
-            </StackLayout>
-          </ScrollView>
-        </TabContentItem>
-        <TabContentItem>
-          <ScrollView>
-            <GridLayout
-              v-if="!recipe.ingredients.length"
-              rows="*, auto, *, 88"
-              columns="*"
-              class="emptyStateContainer"
-            >
-              <StackLayout col="0" row="1" class="emptyState">
-                <Label class="er icon" :text="icon.items" textWrap="true" />
-                <Label class="title orkm" :text="'pAIng' | L" textWrap="true" />
-              </StackLayout>
-            </GridLayout>
-            <StackLayout v-else padding="24 16 72">
-              <AbsoluteLayout class="inputField">
-                <TextField
-                  width="50%"
-                  v-model="yieldMultiplier"
-                  keyboardType="number"
-                />
-                <Label
-                  top="0"
-                  class="fieldLabel"
-                  :text="`${$options.filters.L('req')} ${$options.filters.L(
-                    recipe.yield.unit
-                  )}`"
-                />
-              </AbsoluteLayout>
-              <Label
-                padding="16 0 8"
-                class="title orkm"
-                :text="`${$options.filters.L(
-                  'ings'
-                )} (${positiveYieldMultiplier} ${$options.filters.L(
-                  recipe.yield.unit
-                )})`"
-                textWrap="true"
-              />
-              <check-box
-                v-for="(item, index) in recipe.ingredients"
-                :key="index"
-                class="ingredient"
-                :color="isLightMode ? '#1A1A1A' : '#e0e0e0'"
-                style="font-family: 'Orkney-Regular'"
-                :checkPadding="checkPadding"
-                marginLeft="4"
-                @checkedChange="checkChange"
-                :text="`${
-                  roundedQuantity(item.quantity)
-                    ? roundedQuantity(item.quantity) + ' '
-                    : ''
-                }${
-                  roundedQuantity(item.quantity)
-                    ? $options.filters.L(item.unit) + ' '
-                    : ''
-                }${item.item}`"
-              />
-            </StackLayout>
-          </ScrollView>
-        </TabContentItem>
-        <TabContentItem>
-          <ScrollView>
-            <GridLayout
-              v-if="!recipe.instructions.length"
-              rows="*, auto, *, 88"
-              columns="*"
-              class="emptyStateContainer"
-            >
-              <StackLayout col="0" row="1" class="emptyState">
-                <Label class="er icon" :text="icon.steps" textWrap="true" />
-                <Label class="title orkm" :text="'pAIns' | L" textWrap="true" />
-              </StackLayout>
-            </GridLayout>
-            <StackLayout v-else padding="28 16 62">
-              <GridLayout
-                @tap="stepDone"
-                columns="auto ,*"
-                v-for="(instruction, index) in recipe.instructions"
-                :key="index"
-              >
-                <Label
-                  col="0"
-                  colSpan="2"
-                  class="instruction"
-                  :class="{
-                    noBorder: index === recipe.instructions.length - 1,
-                  }"
-                  :text="instruction"
-                  textWrap="true"
-                />
-                <Label
-                  @loaded="centerLabel"
-                  class="count orkm"
-                  col="0"
-                  :text="index + 1"
-                />
-              </GridLayout>
-            </StackLayout>
-          </ScrollView>
-        </TabContentItem>
-        <TabContentItem>
-          <ScrollView>
-            <GridLayout
-              v-if="!recipe.notes.length"
-              rows="*, auto, *, 88"
-              columns="*"
-              class="emptyStateContainer"
-            >
-              <StackLayout col="0" row="1" class="emptyState">
-                <Label class="er icon" :text="icon.notes" textWrap="true" />
-                <Label class="title orkm" :text="'pANo' | L" textWrap="true" />
-              </StackLayout>
-            </GridLayout>
-            <StackLayout v-else padding="16 16 62" @loaded="createNotes">
-            </StackLayout>
-          </ScrollView>
-        </TabContentItem>
-        <TabContentItem>
-          <ScrollView>
-            <GridLayout
-              v-if="!recipe.combinations.length"
-              rows="*, auto, *, 88"
-              columns="*"
-              class="emptyStateContainer"
-            >
-              <StackLayout col="0" row="1" class="emptyState">
-                <Label class="er icon" :text="icon.comb" textWrap="true" />
-                <Label class="title orkm" :text="'pACmb' | L" textWrap="true" />
-              </StackLayout>
-            </GridLayout>
-            <StackLayout v-else padding="16 0 80">
-              <GridLayout
-                columns="*"
-                v-for="(combination, index) in recipe.combinations"
-                :key="index"
-                androidElevation="1"
-                class="combination mdr"
-                @tap="viewCombination(combination)"
-              >
-                <Label
-                  verticalAlignment="center"
-                  class="combinationTitle"
-                  :text="getCombinationTitle(combination)"
-                  textWrap="true"
-                />
-              </GridLayout>
-            </StackLayout>
-          </ScrollView>
-        </TabContentItem>
-      </Tabs>
-      <GridLayout id="btnFabContainer" rows="*, auto" columns="*, auto">
-        <transition name="bounce" appear>
-          <MDFloatingActionButton
-            row="1"
-            col="1"
-            src="res://share"
-            @tap="shareHandler"
-            v-if="showFab"
-          />
-        </transition>
-      </GridLayout>
-    </AbsoluteLayout>
+    </GridLayout>
   </Page>
 </template>
 
 <script>
 import {
   Application,
-  Color,
   ImageSource,
-  Screen,
   Utils,
   Span,
   FormattedString,
   Label,
-  GridLayout,
-  ItemSpec,
   Observable,
-  GestureTypes,
+  Screen,
 } from "@nativescript/core";
-import {
-  Feedback,
-  FeedbackType,
-  FeedbackPosition,
-} from "nativescript-feedback";
-import * as Toast from "nativescript-toast";
 import * as SocialShare from "@nativescript/social-share";
 import { localize } from "@nativescript/localize";
 const intl = require("nativescript-intl");
 import { mapActions, mapState } from "vuex";
 import EditRecipe from "./EditRecipe.vue";
-import ViewRecipe from "./ViewRecipe.vue";
-import ShareChooser from "./modal/ShareChooser.vue";
-let feedback = new Feedback();
+import ActionDialog from "./modal/ActionDialog.vue";
+import PromptDialog from "./modal/PromptDialog.vue";
+let toastTimer, scrollTimer;
 export default {
   props: ["filterTrylater", "recipeID"],
   data() {
@@ -461,37 +265,53 @@ export default {
       busy: false,
       yieldMultiplier: 1,
       recipe: null,
-      showFab: false,
-      selectedTabIndex: 0,
       currentRecipeID: this.recipeID,
-      hideActionBar: false,
-      overviewTab: null,
+      scrollview: null,
+      appbar: null,
+      ingcon: null,
+      inscon: null,
+      notescon: null,
       checks: [],
-      checkboxes: [],
       steps: [],
+      toast: null,
+      hlMsg: false,
+      selectedIndex: 0,
+      scrollingToId: false,
+      scrolled: false,
     };
   },
   computed: {
     ...mapState(["icon", "recipes"]),
-    screenWidth() {
-      return Screen.mainScreen.widthDIPs;
-    },
     positiveYieldMultiplier() {
       return Math.abs(this.yieldMultiplier) > 0
         ? Math.abs(parseFloat(this.yieldMultiplier))
         : 1;
     },
-    isLightMode() {
-      return Application.systemAppearance() === "light";
-    },
-    checkPadding() {
-      return `${Math.round(20 * Utils.layout.getDisplayDensity())},0,0,0`;
+    topmenu() {
+      return [
+        {
+          icon: "items",
+          count: this.recipe.ingredients.length,
+        },
+        {
+          icon: "steps",
+          count: this.recipe.instructions.length,
+        },
+        {
+          icon: "comb",
+          count: this.recipe.combinations.length,
+        },
+        {
+          icon: "notes",
+          count: this.recipe.notes.length,
+        },
+      ].filter((e) => e.count);
     },
   },
   methods: {
     ...mapActions([
       "toggleStateAction",
-      "setCurrentComponentAction",
+      "setComponent",
       "overwriteRecipeAction",
       "setRecipeAsTriedAction",
       "setRatingAction",
@@ -502,9 +322,8 @@ export default {
       page.bindingContext = new Observable();
       this.busy = false;
       setTimeout((e) => {
-        this.setCurrentComponentAction("ViewRecipe");
+        this.setComponent("ViewRecipe");
       }, 500);
-      this.showFab = true;
       if (this.yieldMultiplier == this.recipe.yield.quantity)
         this.yieldMultiplier = this.recipe.yield.quantity;
       this.keepScreenOn(true);
@@ -512,13 +331,76 @@ export default {
     },
     onPageUnload() {
       this.keepScreenOn(false);
-      feedback.hide();
     },
-    overviewLoaded(args) {
-      this.overviewTab = args;
+    onAppBarLoad({ object }) {
+      this.appbar = object;
+    },
+    onIngsLoad({ object }) {
+      this.ingcon = object;
+    },
+    onInsLoad({ object }) {
+      this.inscon = object;
+    },
+    onNosLoad({ object }) {
+      this.notescon = object;
+      this.createNotes();
     },
 
+    onScrollLoad(args) {
+      this.scrollview = args.object;
+    },
+    onScroll(args) {
+      if (!this.scrollingToId) {
+        let vm = this;
+        let h = Screen.mainScreen.heightDIPs;
+        function getPos(id) {
+          return vm.scrollview.getViewById(id).getLocationOnScreen().y + 144;
+        }
+        let items = getPos("items") <= h;
+        let steps = getPos("steps") <= h;
+        let comb = getPos("comb") <= h;
+        let notes = getPos("notes") <= h;
+        if (items) this.selectedIndex = 0;
+        if (steps) this.selectedIndex = 1;
+        if (comb) this.selectedIndex = 2;
+        if (notes) this.selectedIndex = 3;
+      }
+      this.scrolled = this.scrollview.verticalOffset != 0;
+      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.animateInOut(
+            250,
+            false,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+        else if (scrollUp && ab == 64)
+          this.animateInOut(
+            250,
+            true,
+            (val) => (this.appbar.translateY = val * 64)
+          );
+      }
+    },
     // HELPERS
+    changeYield() {
+      this.$showModal(PromptDialog, {
+        props: {
+          title: `${localize("req")} ${localize(this.recipe.yield.unit)}`,
+          placeholder: Math.abs(parseFloat(this.yieldMultiplier)),
+          action: "SET",
+        },
+      }).then((item) => {
+        if (item) this.yieldMultiplier = item;
+      });
+    },
+    hasTime(time) {
+      return time != "00:00";
+    },
     niceDate(time) {
       let lastTried = new Date(time).getTime();
       let now = new Date().getTime();
@@ -539,17 +421,12 @@ export default {
         (dayDiff > 365 && duration("ltAgo"))
       );
     },
-    selectedIndexChange(args) {
-      this.selectedTabIndex = args.object.selectedIndex;
-    },
     showLastTried() {
-      feedback.show({
-        title: `${localize("triedInfo")} ${this.niceDate(
-          this.recipe.lastTried
-        )}`,
-        titleColor: new Color(`${this.isLightMode ? "#fff" : "#1A1A1A"}`),
-        backgroundColor: new Color("#ff5200"),
-      });
+      this.showToast(
+        `${localize("triedInfo")} ${this.niceDate(this.recipe.lastTried)}`,
+        5,
+        true
+      );
     },
     roundedQuantity(quantity) {
       return Math.abs(
@@ -565,14 +442,8 @@ export default {
         Application.android.foregroundActivity ||
         Application.android.startActivity;
       let window = activity.getWindow();
-      if (boolean)
-        window.addFlags(
-          android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-        );
-      else
-        window.clearFlags(
-          android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-        );
+      let flag = android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
+      boolean ? window.addFlags(flag) : window.clearFlags(flag);
     },
     formattedTime(time) {
       let t = time.split(":");
@@ -614,36 +485,44 @@ export default {
         recipe: this.recipe,
       });
     },
-    checkChange(args, index) {
-      let check = args.object;
-      this.checkboxes.push(check);
+    checkChange(obj, index) {
       this.checks[index] = !this.checks[index];
+      obj.getChildAt(0).text = this.checks[index]
+        ? this.icon.succ
+        : this.icon.done;
     },
-    stepDone(args) {
-      let a = args.object;
-      this.steps.push(a);
-      if (a.className !== "done") a.className = "done";
-      else a.className = "";
-    },
-    centerLabel(args) {
-      args.object.android.setGravity(17);
+    touchIngredient({ object, action }, index) {
+      object.className = action.match(/down|move/)
+        ? "ingredient fade"
+        : "ingredient";
+      if (action == "up") this.checkChange(object, index);
     },
     clearChecks() {
-      this.checkboxes.forEach((e) => {
-        if (e.checked) e.checked = false;
-      });
-      this.checkboxes = [];
+      for (let i = 0; i < this.ingcon.getChildrenCount(); i++) {
+        this.ingcon.getChildAt(i).getChildAt(0).text = this.icon.done;
+      }
+    },
+    stepDone(object) {
+      let a = object;
+      a.className = a.className.includes("done")
+        ? "instruction"
+        : "instruction done";
+    },
+    touchInstruction({ object, action }) {
+      let hasDone = object.className.includes("done");
+      object.className = action.match(/down|move/)
+        ? `instruction fade ${hasDone ? "done" : ""}`
+        : `instruction ${hasDone ? "done" : ""}`;
+      if (action == "up") this.stepDone(object);
     },
     clearSteps() {
-      this.steps.forEach((e) => {
-        if (e.className === "done") e.className = "";
-      });
-      this.steps = [];
+      for (let i = 0; i < this.inscon.getChildrenCount(); i++) {
+        this.inscon.getChildAt(i).className = "instruction";
+      }
     },
 
     // NAVIGATION HANDLERS
     editRecipe() {
-      this.showFab = false;
       this.busy = true;
       this.$navigateTo(EditRecipe, {
         props: {
@@ -651,41 +530,37 @@ export default {
           filterTrylater: this.filterTrylater,
           recipeID: this.currentRecipeID,
         },
-        backstackVisible: false,
+        // backstackVisible: false,
       });
     },
     viewCombination(combination) {
+      this.scrollview.scrollToVerticalOffset(0, true);
       this.recipe = this.recipes.filter((e) => e.id === combination)[0];
       this.recipe.ingredients.forEach((e) => this.checks.push(false));
-      this.clearChecks();
       this.clearSteps();
+      this.clearChecks();
       this.currentRecipeID = combination;
       this.syncCombinations();
-      this.selectedTabIndex = 0;
-      this.overviewTab.object.scrollToVerticalOffset(0, true);
-      setTimeout(
-        (e) =>
-          this.recipe.tried && this.recipe.lastTried && this.showLastTried(),
-        500
-      );
+      this.createNotes();
+      this.recipe.tried && this.recipe.lastTried && this.showLastTried();
     },
 
     // SHARE ACTION
     shareHandler() {
       if (this.recipe.imageSrc) {
-        this.$showModal(ShareChooser, {
+        this.$showModal(ActionDialog, {
           props: {
             title: "shr",
-            helpIcon: "share",
+            list: ["pht", "rec"],
           },
         }).then((result) => {
           switch (result) {
-            case "photo":
+            case "pht":
               ImageSource.fromFile(this.recipe.imageSrc).then((res) => {
                 SocialShare.shareImage(res, "Share recipe photo using");
               });
               break;
-            case "recipe":
+            case "rec":
               this.shareRecipe();
               break;
             default:
@@ -754,6 +629,18 @@ export default {
     },
 
     // DATA HANDLERS
+    showToast(msg, dur, hl) {
+      clearInterval(toastTimer);
+      this.hlMsg = hl;
+      this.toast = msg;
+      toastTimer = setInterval(() => {
+        dur--;
+        if (dur == 0) {
+          this.toast = null;
+          clearInterval(toastTimer);
+        }
+      }, 1000);
+    },
     toggle(key, setDate) {
       this.toggleStateAction({
         id: this.currentRecipeID,
@@ -764,14 +651,14 @@ export default {
     },
     toggleFavourite() {
       this.recipe.isFavorite
-        ? Toast.makeText(localize("unfavd")).show()
-        : Toast.makeText(localize("favd")).show();
+        ? this.showToast(localize("unfavd"), 3)
+        : this.showToast(localize("favd"), 3);
       this.toggle("isFavorite");
     },
     toggleTrylater() {
       this.recipe.tried
-        ? Toast.makeText(localize("aTry")).show()
-        : Toast.makeText(localize("rmTry")).show();
+        ? this.showToast(localize("aTry"), 3)
+        : this.showToast(localize("rmTry"), 3);
       this.toggle("tried");
     },
     recipeTried() {
@@ -803,16 +690,13 @@ export default {
     },
 
     // NOTES
-    createNote(note, i) {
-      const vm = this;
+    createNote(note) {
       let regex = /(https?:\/\/[^\s]+)/g;
-      const grid = new GridLayout();
-      const firstCol = new ItemSpec(1, "star");
-      const label = new Label();
-      label.class = "note";
-      label.textWrap = true;
-      let formattedString = new FormattedString();
-      let textArray = note.split(regex);
+      const lbl = new Label();
+      lbl.class = "note";
+      lbl.textWrap = true;
+      let fString = new FormattedString();
+      let arr = note.split(regex);
 
       function createSpan(text, isUrl) {
         let span = new Span();
@@ -820,27 +704,57 @@ export default {
         span.fontSize = 14;
         if (isUrl) {
           span.textDecoration = "underline";
-          span.color = "#ff5200";
           span.on("linkTap", () => Utils.openUrl(text));
         }
-        formattedString.spans.push(span);
+        fString.spans.push(span);
       }
-      textArray.forEach((text) => {
+      arr.forEach((text) => {
         createSpan(text, regex.test(text));
       });
-      label.formattedText = formattedString;
-      grid.addChild(label);
-      GridLayout.setColumn(label, 0);
-      grid.addColumn(firstCol);
-      return grid;
+      lbl.formattedText = fString;
+      return lbl;
     },
-    createNotes(args) {
-      const stack = args.object;
-      if (!stack.getChildrenCount()) {
-        this.recipe.notes.forEach((note, i) => {
-          stack.addChild(this.createNote(note, i));
-        });
-      }
+    createNotes() {
+      const stack = this.notescon;
+      stack.removeChildren();
+      this.recipe.notes.forEach((note) =>
+        stack.addChild(this.createNote(note))
+      );
+    },
+    getTags(tags) {
+      return tags.join(" · ");
+    },
+
+    //HELPERS
+    touchSelector({ object, action }, index, id) {
+      let selected = this.selectedIndex == index;
+      object.className = action.match(/down|move/)
+        ? `segment ${selected ? "select" : "fade"}`
+        : `segment ${selected && "select"}`;
+      if (action == "up") this.scrollToId(index, id);
+    },
+    scrollToId(index, id) {
+      this.scrollingToId = true;
+      if (index != this.selectedIndex)
+        this.scrollview.scrollToVerticalOffset(
+          this.scrollview.getViewById(id).getLocationRelativeTo(this.scrollview)
+            .y + this.scrollview.verticalOffset,
+          true
+        );
+      clearInterval(scrollTimer);
+      scrollTimer = setInterval(() => {
+        if (this.selectedIndex == index) {
+          this.scrollingToId = false;
+          clearInterval(scrollTimer);
+        }
+      }, 1000);
+      this.selectedIndex = index;
+    },
+    touchYield({ object, action }) {
+      object.className = action.match(/down|move/)
+        ? "value clickable fade"
+        : "value clickable";
+      if (action == "up") this.changeYield();
     },
   },
   created() {
@@ -848,12 +762,8 @@ export default {
     this.recipe.ingredients.forEach((e) => this.checks.push(false));
   },
   mounted() {
-    this.showFab = true;
     this.yieldMultiplier = this.recipe.yield.quantity;
-    setTimeout(
-      (e) => this.recipe.tried && this.recipe.lastTried && this.showLastTried(),
-      500
-    );
+    this.recipe.tried && this.recipe.lastTried && this.showLastTried();
   },
 };
 </script>
diff --git a/app/components/modal/ActionDialog.vue b/app/components/modal/ActionDialog.vue
index ddcd3262..a9be9ff8 100644
--- a/app/components/modal/ActionDialog.vue
+++ b/app/components/modal/ActionDialog.vue
@@ -1,55 +1,40 @@
 <template>
-  <Page>
+  <Page @loaded="onPageLoad" backgroundColor="transparent" :class="appTheme">
     <GridLayout
       columns="*"
       :rows="`auto, auto, ${stretch ? '*' : 'auto'}, auto`"
-      class="dialogContainer"
-      :class="appTheme"
+      class="modal"
     >
-      <Label
-        row="0"
-        class="er dialogIcon"
-        backgroundColor="#858585"
-        :color="iconColor"
-        :text="icon[helpIcon]"
-      />
-      <Label row="1" class="dialogTitle orkm" :text="`${title}` | L" />
-      <ScrollView row="2" width="100%">
-        <StackLayout>
-          <MDButton
-            v-for="(item, index) in newList"
-            :key="index"
-            class="actionItem"
-            :class="{ orkm: title === 'srt' && sortType === item }"
-            :color="title === 'srt' && sortType === item ? '#ff5200' : ''"
-            variant="text"
-            :text="`${localized(item)}${
-              title === 'srt' && sortType === item ? '*' : ''
-            }`"
-            @loaded="centerLabel"
-            @tap="tapAction(item)"
-            @longPress="removeItem(index)"
-          />
-        </StackLayout>
-      </ScrollView>
-      <GridLayout
-        row="3"
-        rows="auto"
-        columns="auto, *, auto"
-        class="actionsContainer"
+      <Label class="title" :text="title | L" />
+      <ListView
+        rowHeight="48"
+        row="2"
+        @loaded="listViewLoad"
+        for="item in newList"
+        :height="stretch ? '100%' : listHeight"
       >
-        <MDButton
-          variant="text"
+        <v-template>
+          <Label
+            class="listItem"
+            :class="{ tb: title === 'srt' && sortType === item }"
+            :color="title === 'srt' && sortType === item ? '#ff5200' : ''"
+            :text="`${localized(item)}`"
+            @touch="touch"
+            @tap="tapAction(item)"
+            @longPress="removeItem(item)"
+          />
+        </v-template>
+      </ListView>
+      <GridLayout row="3" columns="auto, *, auto" class="actions">
+        <Button
           v-if="action"
-          col="0"
-          class="action orkm pull-left"
-          :text="`${action}` | L"
+          class="text sm"
+          :text="action | L"
           @tap="$modal.close(action)"
         />
-        <MDButton
-          variant="text"
+        <Button
           col="2"
-          class="action orkm pull-right"
+          class="text sm"
           :text="'cBtn' | L"
           @tap="$modal.close(false)"
         />
@@ -59,32 +44,35 @@
 </template>
 
 <script>
-import { Application, Color } from "@nativescript/core";
-import * as Toast from "nativescript-toast";
+import { Screen } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
 import ConfirmDialog from "./ConfirmDialog.vue";
+
 export default {
-  props: ["title", "list", "stretch", "action", "helpIcon"],
+  props: ["title", "list", "action"],
   data() {
     return {
       newList: this.list,
+      stretch: false,
+      listHeight: 0,
     };
   },
   computed: {
-    ...mapState(["sortType", "icon"]),
-    appTheme() {
-      return Application.systemAppearance();
-    },
-    isLightMode() {
-      return this.appTheme == "light";
-    },
-    iconColor() {
-      return this.isLightMode ? "#f0f0f0" : "#1A1A1A";
-    },
+    ...mapState(["sortType", "icon", "appTheme"]),
   },
   methods: {
     ...mapActions(["removeListItemAction"]),
+    onPageLoad(args) {
+      args.object._dialogFragment
+        .getDialog()
+        .getWindow()
+        .setBackgroundDrawable(
+          new android.graphics.drawable.ColorDrawable(
+            android.graphics.Color.TRANSPARENT
+          )
+        );
+    },
     localized(item) {
       if (this.title !== "lang") return localize(item);
       else return item;
@@ -92,9 +80,6 @@ export default {
     tapAction(item) {
       this.$modal.close(item);
     },
-    centerLabel(args) {
-      args.object.android.setGravity(16);
-    },
     deletionConfirmation(type, description) {
       return this.$showModal(ConfirmDialog, {
         props: {
@@ -102,13 +87,10 @@ export default {
           description,
           cancelButtonText: "cBtn",
           okButtonText: "rBtn",
-          helpIcon: "err",
-          bgColor: "#c92a2a",
         },
       });
     },
-    removeItem(index) {
-      let item = this.newList[index];
+    removeItem(item) {
       let vm = this;
 
       function removeListItem(type, listName, desc) {
@@ -139,6 +121,23 @@ export default {
         default:
       }
     },
+    touch({ object, action }) {
+      object.className = action.match(/down|move/)
+        ? "listItem fade"
+        : "listItem";
+    },
+  },
+  created() {
+    let screenHeight = Screen.mainScreen.heightDIPs;
+    let usableHeight = screenHeight - 144 - 24; // margin and statusbar
+    let count = this.newList.length;
+    let listHeight = 48 * count;
+    let modalHeight = 104 + listHeight; // header + actions height = 104
+    if (modalHeight < usableHeight) {
+      this.listHeight = listHeight;
+    } else {
+      this.stretch = true;
+    }
   },
 };
 </script>
diff --git a/app/components/modal/ActionDialogWithSearch.vue b/app/components/modal/ActionDialogWithSearch.vue
index 752b12d5..36909970 100644
--- a/app/components/modal/ActionDialogWithSearch.vue
+++ b/app/components/modal/ActionDialogWithSearch.vue
@@ -1,78 +1,49 @@
 <template>
-  <Page>
-    <GridLayout
-      columns="*"
-      rows="auto, auto, auto, *, auto"
-      class="dialogContainer"
-      :class="appTheme"
-    >
-      <Label
-        row="0"
-        class="er dialogIcon"
-        backgroundColor="#858585"
-        :color="iconColor"
-        :text="icon[helpIcon]"
-      />
-      <Label
-        row="1"
-        class="dialogTitle orkm"
-        :text="`${title}` | L"
-        textWrap="true"
-      />
+  <Page @loaded="onPageLoad" backgroundColor="transparent" :class="appTheme">
+    <GridLayout columns="*" rows="auto, auto, *, auto" class="modal">
+      <Label class="title" :text="title | L" />
       <StackLayout
-        row="2"
+        row="1"
         v-if="filteredRecipes.length || searchQuery"
-        padding="0 24 24"
+        class="input"
       >
-        <TextField :hint="'Search' | L" v-model="searchQuery" />
+        <TextField
+          class="modalInput"
+          :hint="'Search' | L"
+          v-model="searchQuery"
+        />
       </StackLayout>
-      <ScrollView row="3" width="100%" :height="height ? height : ''">
-        <StackLayout>
-          <MDButton
-            v-for="(recipe, index) in filteredRecipes"
-            :key="index"
-            class="actionItem"
-            variant="text"
+      <ListView row="2" for="recipe in filteredRecipes" @loaded="listViewLoad">
+        <v-template>
+          <Label
+            class="listItem"
             :text="recipe.title"
-            @loaded="centerLabel"
-            @tap="tapAction(recipe)"
+            @touch="touch($event, recipe)"
           />
-          <Label
-            padding="24"
-            lineHeight="6"
-            v-if="!filteredRecipes.length && !searchQuery"
-            :text="'recListEmp' | L"
-            textAlignment="center"
-            textWrap="true"
-          />
-          <Label
-            padding="24"
-            lineHeight="6"
-            v-if="!filteredRecipes.length && searchQuery"
-            :text="'noRecs' | L"
-            textAlignment="center"
-            textWrap="true"
-          />
-        </StackLayout>
-      </ScrollView>
-      <GridLayout
-        row="4"
-        rows="auto"
-        columns="auto, *, auto"
-        class="actionsContainer"
-      >
-        <MDButton
-          variant="text"
+        </v-template>
+      </ListView>
+      <Label
+        row="2"
+        class="noResInfo"
+        v-if="!filteredRecipes.length && !searchQuery"
+        :text="'recListEmp' | L"
+      />
+      <Label
+        row="2"
+        class="noResInfo"
+        v-if="!filteredRecipes.length && searchQuery"
+        :text="'noRecs' | L"
+      />
+      <GridLayout row="3" columns="auto, *, auto" class="actions">
+        <Button
           v-if="action"
-          col="0"
-          class="action orkm pull-left"
-          :text="`${action}` | L"
+          class="text sm"
+          :text="action | L"
           @tap="$modal.close(action)"
         />
-        <MDButton
-          variant="text"
+        <Button
           col="2"
-          class="action orkm pull-right"
+          class="text sm"
           :text="'CANCEL' | L"
           @tap="$modal.close(false)"
         />
@@ -82,26 +53,16 @@
 </template>
 
 <script>
-import { Application } from "@nativescript/core";
 import { mapState } from "vuex";
 export default {
-  props: ["title", "recipes", "height", "action", "helpIcon"],
+  props: ["title", "recipes", "height", "action"],
   data() {
     return {
       searchQuery: "",
     };
   },
   computed: {
-    ...mapState(["icon"]),
-    appTheme() {
-      return Application.systemAppearance();
-    },
-    isLightMode() {
-      return this.appTheme == "light";
-    },
-    iconColor() {
-      return this.isLightMode ? "#f0f0f0" : "#1A1A1A";
-    },
+    ...mapState(["icon", "appTheme"]),
     filteredRecipes() {
       return this.recipes
         .map((e, i) => {
@@ -118,6 +79,16 @@ export default {
     },
   },
   methods: {
+    onPageLoad(args) {
+      args.object._dialogFragment
+        .getDialog()
+        .getWindow()
+        .setBackgroundDrawable(
+          new android.graphics.drawable.ColorDrawable(
+            android.graphics.Color.TRANSPARENT
+          )
+        );
+    },
     tapAction(recipe) {
       this.$modal.close(recipe.id);
     },
@@ -134,6 +105,12 @@ export default {
         e.ingredients.includes(searchQuery)
       );
     },
+    touch({ object, action }, recipe) {
+      object.className = action.match(/down|move/)
+        ? "listItem fade"
+        : "listItem";
+      if (action == "up") this.tapAction(recipe);
+    },
   },
 };
 </script>
diff --git a/app/components/modal/ConfirmDialog.vue b/app/components/modal/ConfirmDialog.vue
index a103d379..959438e0 100644
--- a/app/components/modal/ConfirmDialog.vue
+++ b/app/components/modal/ConfirmDialog.vue
@@ -1,62 +1,62 @@
 <template>
-  <Page>
-    <StackLayout class="dialogContainer" :class="appTheme">
-      <Label
-        class="er dialogIcon"
-        :backgroundColor="bgColor"
-        :color="iconColor"
-        :text="icon[helpIcon]"
-      />
-      <Label class="dialogTitle orkm" :text="`${title}` | L" textWrap="true" />
+  <Page @loaded="onPageLoad" backgroundColor="transparent" :class="appTheme">
+    <GridLayout rows="auto, auto, auto" class="modal">
+      <Label class="title" :text="title | L" />
       <Label
+        row="1"
         v-if="description"
-        class="dialogDescription"
+        class="description tw"
         :text="description"
-        textWrap="true"
       />
-      <GridLayout rows="auto" columns="*, auto, auto" class="actionsContainer">
-        <MDButton
+      <GridLayout row="2" columns="auto, *, auto, auto" class="actions">
+        <Button
+          v-if="secondButtonText"
+          col="0"
+          class="text sm"
+          :text="secondButtonText | L"
+          @tap="$modal.close(-1)"
+        />
+        <Button
           v-if="cancelButtonText"
-          variant="text"
-          col="1"
-          class="action orkm"
-          :text="`${cancelButtonText}` | L"
+          col="2"
+          class="text sm"
+          :text="cancelButtonText | L"
           @tap="$modal.close(false)"
         />
-        <MDButton
-          variant="text"
-          col="2"
-          class="action orkm"
-          :text="`${okButtonText}` | L"
+        <Button
+          col="3"
+          class="text sm"
+          :text="okButtonText | L"
           @tap="$modal.close(true)"
         />
       </GridLayout>
-    </StackLayout>
+    </GridLayout>
   </Page>
 </template>
 
 <script>
-import { Application } from "@nativescript/core";
 import { mapState } from "vuex";
 export default {
   props: [
     "title",
     "description",
+    "secondButtonText",
     "cancelButtonText",
     "okButtonText",
-    "helpIcon",
-    "bgColor",
   ],
   computed: {
-    ...mapState(["icon"]),
-    appTheme() {
-      return Application.systemAppearance();
-    },
-    isLightMode() {
-      return this.appTheme == "light";
-    },
-    iconColor() {
-      return this.isLightMode ? "#f0f0f0" : "#1A1A1A";
+    ...mapState(["icon", "appTheme"]),
+  },
+  methods: {
+    onPageLoad(args) {
+      args.object._dialogFragment
+        .getDialog()
+        .getWindow()
+        .setBackgroundDrawable(
+          new android.graphics.drawable.ColorDrawable(
+            android.graphics.Color.TRANSPARENT
+          )
+        );
     },
   },
 };
diff --git a/app/components/modal/Filters.vue b/app/components/modal/Filters.vue
new file mode 100644
index 00000000..bcc2cd28
--- /dev/null
+++ b/app/components/modal/Filters.vue
@@ -0,0 +1,272 @@
+<template>
+  <Page @loaded="onPageLoad" backgroundColor="transparent" :class="appTheme">
+    <GridLayout rows="auto, auto, *, auto" columns="*" class="modal">
+      <Label class="title" :text="`fltr` | L" />
+      <ScrollView orientation="horizontal" row="1" @loaded="onScrollLoad">
+        <StackLayout class="filters" orientation="horizontal">
+          <GridLayout
+            rows="48"
+            columns="auto, auto"
+            class="segment"
+            v-for="(item, index) in pathList"
+            :key="index"
+            :class="{
+              select: filterType === item.type,
+            }"
+            @touch="touchSelector($event, item.type)"
+          >
+            <Label class="ico" :text="icon[item.type]" />
+            <Label v-if="item.title" class="value" :text="item.title" col="1" />
+          </GridLayout>
+        </StackLayout>
+      </ScrollView>
+      <ListView
+        row="2"
+        class="options-list"
+        @loaded="listViewLoad"
+        for="item in filterList"
+      >
+        <v-template>
+          <Label
+            class="listItem"
+            verticalAlignment="center"
+            col="1"
+            :text="item | L"
+            @touch="touch($event, item)"
+          />
+        </v-template>
+      </ListView>
+      <GridLayout row="3" columns="auto, *, auto, auto" class="actions">
+        <Button class="text sm" :text="'rest' | L" @tap="resetFilter" />
+        <Button
+          col="2"
+          class="text sm"
+          :text="'cBtn' | L"
+          @tap="$modal.close()"
+        />
+        <Button
+          col="3"
+          class="text sm"
+          :text="'apply' | L"
+          @tap="applyFilter"
+        />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { localize } from "@nativescript/localize";
+import { mapActions, mapState } from "vuex";
+let filterTimer;
+export default {
+  data() {
+    return {
+      filterType: "cuisine",
+      localCuisine: null,
+      localCategory: null,
+      localTag: null,
+      reset: false,
+    };
+  },
+  computed: {
+    ...mapState([
+      "icon",
+      "recipes",
+      "cuisines",
+      "categories",
+      "selectedCuisine",
+      "selectedCategory",
+      "selectedTag",
+      "appTheme",
+    ]),
+    pathList() {
+      let arr = [
+        {
+          type: "cuisine",
+          title: localize(this.localCuisine),
+        },
+        {
+          type: "category",
+          title: localize(this.localCategory),
+        },
+        {
+          type: "tag",
+          title: localize(this.localTag),
+        },
+      ];
+      switch (this.filterType) {
+        case "cuisine":
+          return arr.slice(0, -2);
+          break;
+        case "category":
+          return arr.slice(0, -1);
+          break;
+      }
+      return arr;
+    },
+    filterList() {
+      switch (this.filterType) {
+        case "cuisine":
+          return this.cuisineList;
+          break;
+        case "category":
+          return this.categoryList;
+          break;
+        case "tag":
+          return this.tagList;
+          break;
+      }
+    },
+    cuisineList() {
+      let arr = this.recipes.map((e) => e.cuisine).sort();
+      return arr.length ? ["allCuis", ...new Set(arr)] : [];
+    },
+    categoryList() {
+      let arr = this.recipes
+        .map(
+          (e) =>
+            (this.localCuisine === "allCuis" ||
+              e.cuisine === this.localCuisine) &&
+            e.category
+        )
+        .filter((e) => e)
+        .sort();
+      return arr.length ? ["allCats", ...new Set(arr)] : [];
+    },
+    tagList() {
+      let arr = this.recipes
+        .map((e) => {
+          if (
+            this.localCuisine === "allCuis" &&
+            this.localCategory === "allCats" &&
+            e.tags.length
+          )
+            return e.tags;
+          else if (
+            this.localCuisine === "allCuis" &&
+            e.category === this.localCategory &&
+            e.tags.length
+          )
+            return e.tags;
+          else if (
+            this.localCategory === "allCats" &&
+            e.cuisine === this.localCuisine &&
+            e.tags.length
+          )
+            return e.tags;
+          else if (
+            e.category === this.localCategory &&
+            e.cuisine === this.localCuisine &&
+            e.tags.length
+          )
+            return e.tags;
+        })
+        .flat()
+        .filter((e) => e)
+        .sort();
+      let showAllTags =
+        this.localCuisine === "allCuis" && this.localCategory === "allCats";
+      return arr.length
+        ? [!showAllTags && "allTs", ...new Set(arr)].filter((e) => e)
+        : [];
+    },
+  },
+  methods: {
+    ...mapActions([
+      "setComponent",
+      "setCuisine",
+      "setCategory",
+      "setTag",
+      "clearFilter",
+    ]),
+    onPageLoad(args) {
+      args.object._dialogFragment
+        .getDialog()
+        .getWindow()
+        .setBackgroundDrawable(
+          new android.graphics.drawable.ColorDrawable(
+            android.graphics.Color.TRANSPARENT
+          )
+        );
+      this.localCuisine = this.selectedCuisine;
+      this.localCategory = this.selectedCategory;
+      this.localTag = this.selectedTag;
+      if (this.localCuisine) this.filterType = "category";
+      if (this.localCategory || this.localTag) this.filterType = "tag";
+      this.scrollToRight();
+    },
+    onScrollLoad(args) {
+      this.scrollview = args.object;
+    },
+    setFilterType(type) {
+      this.filterType = type;
+      switch (type) {
+        case "cuisine":
+          this.localCategory = null;
+          this.localTag = null;
+          break;
+        case "category":
+          this.localTag = null;
+          break;
+        default:
+          break;
+      }
+    },
+    scrollToRight() {
+      setTimeout(
+        () =>
+          this.scrollview.scrollToHorizontalOffset(
+            this.scrollview.scrollableWidth,
+            true
+          ),
+        10
+      );
+    },
+    setRecipeFilter(item) {
+      this.reset = false;
+      switch (this.filterType) {
+        case "cuisine":
+          this.localCuisine = item;
+          this.filterType = "category";
+          break;
+        case "category":
+          this.localCategory = item;
+          if (this.tagList.length) this.filterType = "tag";
+          break;
+        default:
+          this.localTag = item;
+          break;
+      }
+      this.scrollToRight();
+    },
+    applyFilter() {
+      this.setCuisine(this.localCuisine);
+      this.setCategory(this.localCategory);
+      this.setTag(this.localTag);
+      this.filterFavourites = this.filterTrylater = false;
+      if (this.reset) this.setComponent("EnRecipes");
+      else this.setComponent("Filtered recipes");
+      this.$modal.close();
+    },
+    resetFilter() {
+      this.filterType = "cuisine";
+      this.localCuisine = this.localCategory = this.localTag = null;
+      this.reset = true;
+    },
+    touch({ object, action }, item) {
+      object.className = action.match(/down|move/)
+        ? "listItem fade"
+        : "listItem";
+      if (action == "up") this.setRecipeFilter(item);
+    },
+    touchSelector({ object, action }, type) {
+      let selected = this.filterType == type;
+      object.className = action.match(/down|move/)
+        ? `segment ${selected ? "select" : "fade"}`
+        : `segment ${selected && "select"}`;
+      if (action == "up") this.setFilterType(type);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/app/components/modal/ListPicker.vue b/app/components/modal/ListPicker.vue
index 613ad25a..d338339f 100644
--- a/app/components/modal/ListPicker.vue
+++ b/app/components/modal/ListPicker.vue
@@ -1,14 +1,9 @@
 <template>
-  <Page>
-    <StackLayout class="dialogContainer" :class="appTheme">
-      <Label
-        class="er dialogIcon"
-        backgroundColor="#858585"
-        :color="iconColor"
-        :text="icon.time"
-      />
-      <Label class="dialogTitle orkm" :text="`${title}` | L" />
+  <Page @loaded="onPageLoad" backgroundColor="transparent" :class="appTheme">
+    <GridLayout rows="auto, auto, auto" class="modal">
+      <Label class="title" :text="title | L" />
       <StackLayout
+        row="1"
         class="dialogListPicker"
         orientation="horizontal"
         horizontalAlignment="center"
@@ -26,23 +21,21 @@
           @selectedIndexChange="setMins"
         ></ListPicker>
       </StackLayout>
-      <GridLayout rows="auto" columns="*, auto, auto" class="actionsContainer">
-        <MDButton
-          variant="text"
+      <GridLayout row="2" columns="*, auto, auto" class="actions">
+        <Button
           col="1"
-          class="action orkm"
+          class="text sm"
           :text="'cBtn' | L"
           @tap="$modal.close(false)"
         />
-        <MDButton
-          variant="text"
+        <Button
           col="2"
-          class="action orkm"
-          :text="`${action}` | L"
+          class="text sm"
+          :text="action | L"
           @tap="$modal.close(selectedTime)"
         />
       </GridLayout>
-    </StackLayout>
+    </GridLayout>
   </Page>
 </template>
 
@@ -61,7 +54,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["icon"]),
+    ...mapState(["icon", "appTheme"]),
     hrsList() {
       let h = [...Array(24).keys()];
       this.hrs = h;
@@ -83,20 +76,21 @@ export default {
     minIndex() {
       return this.mins.indexOf(parseInt(this.selectedMin));
     },
-    appTheme() {
-      return Application.systemAppearance();
-    },
-    isLightMode() {
-      return this.appTheme == "light";
-    },
-    iconColor() {
-      return this.isLightMode ? "#f0f0f0" : "#1A1A1A";
-    },
     selectedTime() {
       return this.selectedHrs + ":" + this.selectedMins;
     },
   },
   methods: {
+    onPageLoad(args) {
+      args.object._dialogFragment
+        .getDialog()
+        .getWindow()
+        .setBackgroundDrawable(
+          new android.graphics.drawable.ColorDrawable(
+            android.graphics.Color.TRANSPARENT
+          )
+        );
+    },
     setHrs(args) {
       let hr = "0" + this.hrs[args.object.selectedIndex];
       this.selectedHrs = hr.slice(-2);
diff --git a/app/components/modal/PromptDialog.vue b/app/components/modal/PromptDialog.vue
index 034b801b..cb9ade52 100644
--- a/app/components/modal/PromptDialog.vue
+++ b/app/components/modal/PromptDialog.vue
@@ -1,75 +1,71 @@
 <template>
-  <Page>
-    <StackLayout class="dialogContainer" :class="appTheme">
-      <Label
-        class="er dialogIcon"
-        backgroundColor="#858585"
-        :color="iconColor"
-        :text="icon[helpIcon]"
-      />
-      <Label class="dialogTitle orkm" :text="`${title}` | L" textWrap="true" />
-      <StackLayout class="dialogInput">
+  <Page @loaded="onPageLoad" backgroundColor="transparent" :class="appTheme">
+    <GridLayout rows="auto, auto, auto" class="modal">
+      <Label class="title" :text="title | L" />
+      <StackLayout row="1" class="input">
         <TextField
+          class="modalInput"
           @loaded="focusField"
-          :hint="hint ? hint : ''"
-          v-model="category"
-          autocapitalizationType="words"
-          @returnPress="$modal.close(category)"
+          v-model="text"
+          @returnPress="$modal.close(text)"
         />
       </StackLayout>
-      <GridLayout rows="auto" columns="*, auto, auto" class="actionsContainer">
-        <MDButton
-          variant="text"
+      <GridLayout row="2" columns="*, auto, auto" class="actions">
+        <Button
           col="1"
-          class="action orkm"
+          class="text sm"
           :text="'cBtn' | L"
           @tap="$modal.close(false)"
         />
-        <MDButton
-          variant="text"
+        <Button
           col="2"
-          class="action orkm"
-          :text="`${action}` | L"
-          @tap="$modal.close(category)"
+          class="text sm"
+          :text="action | L"
+          @tap="$modal.close(text)"
         />
       </GridLayout>
-    </StackLayout>
+    </GridLayout>
   </Page>
 </template>
 
 <script>
-import { Application, Utils } from "@nativescript/core";
+import { Utils } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState } from "vuex";
 export default {
-  props: ["title", "hint", "text", "action", "helpIcon"],
+  props: ["title", "hint", "placeholder", "action"],
   data() {
     return {
-      category: null,
+      text: null,
     };
   },
   computed: {
-    ...mapState(["icon"]),
-    appTheme() {
-      return Application.systemAppearance();
-    },
-    isLightMode() {
-      return this.appTheme == "light";
-    },
-    iconColor() {
-      return this.isLightMode ? "#f0f0f0" : "#1A1A1A";
-    },
+    ...mapState(["icon", "appTheme"]),
   },
   methods: {
-    focusField(args) {
-      args.object.focus();
-      setTimeout((e) => Utils.ad.showSoftInput(args.object.android), 1);
+    onPageLoad(args) {
+      args.object._dialogFragment
+        .getDialog()
+        .getWindow()
+        .setBackgroundDrawable(
+          new android.graphics.drawable.ColorDrawable(
+            android.graphics.Color.TRANSPARENT
+          )
+        );
+    },
+    focusField({ object }) {
+      let a = this.placeholder;
+      typeof a == "number"
+        ? (object.keyboardType = "number")
+        : (object.autocapitalizationType = "words");
+      object.hint = this.hint;
+      object.focus();
+      setTimeout(() => Utils.ad.showSoftInput(object.android), 1);
     },
   },
-  mounted() {
-    if (this.text) {
-      this.category = localize(this.text);
-    }
+  created() {
+    let a = this.placeholder;
+    if (a) this.text = typeof a == "number" ? a : localize(a);
   },
 };
 </script>
diff --git a/app/components/modal/ShareChooser.vue b/app/components/modal/ShareChooser.vue
deleted file mode 100644
index f0ac003b..00000000
--- a/app/components/modal/ShareChooser.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <Page>
-    <StackLayout class="dialogContainer" :class="appTheme">
-      <Label
-        class="er dialogIcon"
-        backgroundColor="#858585"
-        :color="iconColor"
-        :text="icon[helpIcon]"
-      />
-      <Label class="dialogTitle orkm" :text="`${title}` | L" />
-      <GridLayout rows="auto, auto, auto" columns="*" class="actionsContainer">
-        <GridLayout
-          class="shareItem mdr"
-          :backgroundColor="bgColor"
-          row="0"
-          columns="*"
-          rows="auto, auto"
-          @tap="$modal.close('photo')"
-        >
-          <Label row="0" class="er" :text="icon.img" />
-          <Label row="1" class="item" :text="'pht' | L" textWrap="true" />
-        </GridLayout>
-        <GridLayout
-          class="shareItem mdr"
-          :backgroundColor="bgColor"
-          row="1"
-          columns="*"
-          rows="auto, auto"
-          @tap="$modal.close('recipe')"
-        >
-          <Label row="0" class="er" :text="icon.text" />
-          <Label row="1" class="item" :text="'rec' | L" textWrap="true" />
-        </GridLayout>
-        <!-- <GridLayout
-          class="shareItem mdr"
-          :backgroundColor="bgColor"
-          row="2"
-          columns="*"
-          rows="auto, auto"
-          @tap="$modal.close('file')"
-        >
-          <Label row="0" class="er" :text="icon.zip" />
-          <Label row="1" class="item" :text="'fil' | L" textWrap="true" />
-        </GridLayout> -->
-      </GridLayout>
-      <GridLayout rows="auto" columns="*, auto" class="actionsContainer">
-        <MDButton
-          variant="text"
-          col="1"
-          class="action orkm mdr"
-          :text="'cBtn' | L"
-          @tap="$modal.close()"
-        />
-      </GridLayout>
-    </StackLayout>
-  </Page>
-</template>
-
-<script>
-import { Application } from "@nativescript/core";
-import { mapState } from "vuex";
-export default {
-  props: ["title", "helpIcon"],
-  computed: {
-    ...mapState(["icon"]),
-    appTheme() {
-      return Application.systemAppearance();
-    },
-    isLightMode() {
-      return this.appTheme == "light";
-    },
-    iconColor() {
-      return this.isLightMode ? "#f0f0f0" : "#1A1A1A";
-    },
-    bgColor() {
-      return this.isLightMode ? "#fff" : "#292929";
-    },
-  },
-};
-</script>
diff --git a/app/fonts/Inter-Bold.otf b/app/fonts/Inter-Bold.otf
new file mode 100644
index 00000000..ed9019a5
Binary files /dev/null and b/app/fonts/Inter-Bold.otf differ
diff --git a/app/fonts/Inter-Medium.otf b/app/fonts/Inter-Medium.otf
new file mode 100644
index 00000000..01b0b4ae
Binary files /dev/null and b/app/fonts/Inter-Medium.otf differ
diff --git a/app/fonts/Orkney-Medium.otf b/app/fonts/Orkney-Medium.otf
deleted file mode 100755
index 55281263..00000000
Binary files a/app/fonts/Orkney-Medium.otf and /dev/null differ
diff --git a/app/fonts/Orkney-Regular.otf b/app/fonts/Orkney-Regular.otf
deleted file mode 100755
index b0df3f95..00000000
Binary files a/app/fonts/Orkney-Regular.otf and /dev/null differ
diff --git a/app/i18n/en-GB.default.json b/app/i18n/en-GB.default.json
index d3251eab..121abe98 100644
--- a/app/i18n/en-GB.default.json
+++ b/app/i18n/en-GB.default.json
@@ -126,7 +126,7 @@
   "aNoBtn": "ADD NOTE",
   "it": "Item",
   "stp": "Step",
-  "srt": "Sort by",
+  "srt": "Sort",
   "cBtn": "CANCEL",
   "rBtn": "REMOVE",
   "rmCuiInfo": "You are about to remove the cuisine:",
@@ -149,7 +149,6 @@
   "SET": "SET",
   "appRst": "App restart required",
   "rst": "RESTART",
-  "nThmInfo": "Restart EnRecipes to use the new theme",
   "nLangInfo": "Restart EnRecipes to use the new language",
   "grant": "Grant access",
   "reqAcc": "EnRecipes requires storage permission in order to set recipe photo, export and import data",
@@ -180,7 +179,7 @@
   "nwCat": "New category",
   "req": "Required",
   "recPic": "Recipe photo",
-  "repBtn": "REPLACE PHOTO",
+  "repBtn": "REPLACE",
   "cPic": "Crop photo",
   "breakfast": "Breakfast",
   "lunch": "lunch",
@@ -306,5 +305,9 @@
   "listVM": "List view mode",
   "detailed": "Detailed",
   "simple": "Simple",
-  "grid": "Grid"
+  "grid": "Grid",
+  "minimal": "Minimal",
+  "apply": "APPLY",
+  "fltr": "Filter",
+  "yld": "Yield"
 }
diff --git a/app/main.js b/app/main.js
index 5e8bfe8c..1196fb20 100644
--- a/app/main.js
+++ b/app/main.js
@@ -9,40 +9,14 @@ on(launchEvent, (args) => {
   }
 })
 import Vue from 'nativescript-vue'
-import App from './components/App'
+import EnRecipes from './components/EnRecipes'
 import store from './store'
 
-import { installMixins } from '@nativescript-community/ui-material-core'
-installMixins()
+import CollectionView from '@nativescript-community/ui-collectionview/vue'
+Vue.use(CollectionView)
 
-import { install } from '@nativescript-community/ui-drawer'
-install()
-
-import DrawerPlugin from '@nativescript-community/ui-drawer/vue'
-Vue.use(DrawerPlugin)
-
-import CollectionView from '@nativescript-community/ui-collectionview/vue';
-Vue.use(CollectionView);
-
-import ButtonPlugin from '@nativescript-community/ui-material-button/vue'
-Vue.use(ButtonPlugin)
-
-import ActivityIndicatorPlugin from '@nativescript-community/ui-material-activityindicator/vue'
-Vue.use(ActivityIndicatorPlugin)
-
-import FloatingActionButtonPlugin from '@nativescript-community/ui-material-floatingactionbutton/vue'
-Vue.use(FloatingActionButtonPlugin)
-
-import ProgressPlugin from '@nativescript-community/ui-material-progress/vue'
-Vue.use(ProgressPlugin)
-
-import { CheckBox } from '@nstudio/nativescript-checkbox'
-Vue.registerElement('CheckBox', () => CheckBox, {
-  model: {
-    prop: 'checked',
-    event: 'checkedChange',
-  },
-})
+import { lvMixin } from './shared/mixins.js'
+Vue.mixin(lvMixin)
 
 Vue.config.silent = TNS_ENV === 'production'
 
@@ -50,5 +24,5 @@ Vue.filter('L', localize)
 
 new Vue({
   store,
-  render: (h) => h('frame', [h(App)]),
+  render: (h) => h(EnRecipes),
 }).$start()
diff --git a/app/resources/Android/app.gradle b/app/resources/Android/app.gradle
index 892d5e36..92e68937 100644
--- a/app/resources/Android/app.gradle
+++ b/app/resources/Android/app.gradle
@@ -16,9 +16,9 @@
 android {
   defaultConfig {
     versionCode 7
-    versionName '1.3.1'
+    versionName '1.3.2'
     applicationId 'com.vishnuraghav.enrecipes'
-    minSdkVersion 21
+    minSdkVersion 22
     generatedDensities = []
     ndk {
       abiFilters.clear()
diff --git a/app/resources/Android/src/main/res/drawable-hdpi/cam.png b/app/resources/Android/src/main/res/drawable-hdpi/cam.png
deleted file mode 100644
index d036f0bc..00000000
Binary files a/app/resources/Android/src/main/res/drawable-hdpi/cam.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-hdpi/plus.png b/app/resources/Android/src/main/res/drawable-hdpi/plus.png
deleted file mode 100644
index 69dd03a9..00000000
Binary files a/app/resources/Android/src/main/res/drawable-hdpi/plus.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-hdpi/share.png b/app/resources/Android/src/main/res/drawable-hdpi/share.png
deleted file mode 100644
index cb15ef68..00000000
Binary files a/app/resources/Android/src/main/res/drawable-hdpi/share.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-ldpi/cam.png b/app/resources/Android/src/main/res/drawable-ldpi/cam.png
deleted file mode 100644
index 0a65ce44..00000000
Binary files a/app/resources/Android/src/main/res/drawable-ldpi/cam.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-ldpi/plus.png b/app/resources/Android/src/main/res/drawable-ldpi/plus.png
deleted file mode 100644
index d1cfb39b..00000000
Binary files a/app/resources/Android/src/main/res/drawable-ldpi/plus.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-ldpi/share.png b/app/resources/Android/src/main/res/drawable-ldpi/share.png
deleted file mode 100644
index 4779ed74..00000000
Binary files a/app/resources/Android/src/main/res/drawable-ldpi/share.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-mdpi/cam.png b/app/resources/Android/src/main/res/drawable-mdpi/cam.png
deleted file mode 100644
index 382e6b79..00000000
Binary files a/app/resources/Android/src/main/res/drawable-mdpi/cam.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-mdpi/plus.png b/app/resources/Android/src/main/res/drawable-mdpi/plus.png
deleted file mode 100644
index 79d1ad94..00000000
Binary files a/app/resources/Android/src/main/res/drawable-mdpi/plus.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-mdpi/share.png b/app/resources/Android/src/main/res/drawable-mdpi/share.png
deleted file mode 100644
index 05040c65..00000000
Binary files a/app/resources/Android/src/main/res/drawable-mdpi/share.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xhdpi/cam.png b/app/resources/Android/src/main/res/drawable-xhdpi/cam.png
deleted file mode 100644
index 38c9c9ad..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xhdpi/cam.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xhdpi/plus.png b/app/resources/Android/src/main/res/drawable-xhdpi/plus.png
deleted file mode 100644
index 8c00e160..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xhdpi/plus.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xhdpi/share.png b/app/resources/Android/src/main/res/drawable-xhdpi/share.png
deleted file mode 100644
index db1a7871..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xhdpi/share.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xxhdpi/cam.png b/app/resources/Android/src/main/res/drawable-xxhdpi/cam.png
deleted file mode 100644
index 05559eda..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xxhdpi/cam.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xxhdpi/plus.png b/app/resources/Android/src/main/res/drawable-xxhdpi/plus.png
deleted file mode 100644
index ff2fb329..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xxhdpi/plus.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xxhdpi/share.png b/app/resources/Android/src/main/res/drawable-xxhdpi/share.png
deleted file mode 100644
index 27408ce3..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xxhdpi/share.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xxxhdpi/cam.png b/app/resources/Android/src/main/res/drawable-xxxhdpi/cam.png
deleted file mode 100644
index 002cf813..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xxxhdpi/cam.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xxxhdpi/plus.png b/app/resources/Android/src/main/res/drawable-xxxhdpi/plus.png
deleted file mode 100644
index 016d25f9..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xxxhdpi/plus.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/drawable-xxxhdpi/share.png b/app/resources/Android/src/main/res/drawable-xxxhdpi/share.png
deleted file mode 100644
index 80ecf69f..00000000
Binary files a/app/resources/Android/src/main/res/drawable-xxxhdpi/share.png and /dev/null differ
diff --git a/app/resources/Android/src/main/res/values-ca-rAD/strings.xml b/app/resources/Android/src/main/res/values-ca-rAD/strings.xml
new file mode 100644
index 00000000..07aebea0
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-ca-rAD/strings.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="undo">""</string>
+  <string name="trnsl">""</string>
+  <string name="SAT">""</string>
+  <string name="FRI">""</string>
+  <string name="THU">""</string>
+  <string name="WED">""</string>
+  <string name="TUE">""</string>
+  <string name="MON">""</string>
+  <string name="SUN">""</string>
+  <string name="December">""</string>
+  <string name="November">""</string>
+  <string name="October">""</string>
+  <string name="September">""</string>
+  <string name="August">""</string>
+  <string name="July">""</string>
+  <string name="June">""</string>
+  <string name="May">""</string>
+  <string name="April">""</string>
+  <string name="March">""</string>
+  <string name="February">""</string>
+  <string name="January">""</string>
+  <string name="trySer">""</string>
+  <string name="help">""</string>
+  <string name="appInfo">""</string>
+  <string name="donate">""</string>
+  <string name="invFile">""</string>
+  <string name="buSuc">""</string>
+  <string name="buMod">""</string>
+  <string name="buEmp">""</string>
+  <string name="buInc">""</string>
+  <string name="impFail">""</string>
+  <string name="recRm">""</string>
+  <string name="untRec">""</string>
+  <string name="stars">""</string>
+  <string name="Created">""</string>
+  <string name="_Filtered_recipes_Z1alhhu">""</string>
+  <string name="OK">""</string>
+  <string name="recU">""</string>
+  <string name="recE">""</string>
+  <string name="recI">""</string>
+  <string name="recF">""</string>
+  <string name="impSuc">""</string>
+  <string name="tsInfo">""</string>
+  <string name="ts">""</string>
+  <string name="noTs">""</string>
+  <string name="allTs">""</string>
+  <string name="allCats">""</string>
+  <string name="Vietnamese">""</string>
+  <string name="Turkish">""</string>
+  <string name="Thai">""</string>
+  <string name="Swedish">""</string>
+  <string name="_Sri_Lankan_Z7GfBa">""</string>
+  <string name="Spanish">""</string>
+  <string name="Scottish">""</string>
+  <string name="Russian">""</string>
+  <string name="Portuguese">""</string>
+  <string name="Nigerian">""</string>
+  <string name="Mexican">""</string>
+  <string name="Korean">""</string>
+  <string name="Kenyan">""</string>
+  <string name="Jewish">""</string>
+  <string name="Japanese">""</string>
+  <string name="Jamaican">""</string>
+  <string name="Italian">""</string>
+  <string name="Irish">""</string>
+  <string name="Indian">""</string>
+  <string name="Greek">""</string>
+  <string name="German">""</string>
+  <string name="French">""</string>
+  <string name="Filipino">""</string>
+  <string name="English">""</string>
+  <string name="Egyptian">""</string>
+  <string name="Danish">""</string>
+  <string name="Chinese">""</string>
+  <string name="British">""</string>
+  <string name="Brazilian">""</string>
+  <string name="American">""</string>
+  <string name="allCuis">""</string>
+  <string name="cuis">""</string>
+  <string name="cui">""</string>
+  <string name="Unit">""</string>
+  <string name="newUnit">""</string>
+  <string name="newCui">""</string>
+  <string name="Challenging">""</string>
+  <string name="Moderate">""</string>
+  <string name="Easy">""</string>
+  <string name="_Oldest_first_Z6cq4h">""</string>
+  <string name="_Newest_first_2Sb3c">""</string>
+  <string name="_Last_updated_Z2gEbLD">""</string>
+  <string name="_Difficulty_level_cSL5d">""</string>
+  <string name="Rating">""</string>
+  <string name="_Slowest_first_hHjY6">""</string>
+  <string name="_Quickest_first_Z1CpP7N">""</string>
+  <string name="resNF">""</string>
+  <string name="restDone">""</string>
+  <string name="restInfo">""</string>
+  <string name="restUL">""</string>
+  <string name="restYUL">""</string>
+  <string name="restCatL">""</string>
+  <string name="restCuiL">""</string>
+  <string name="rest">""</string>
+  <string name="sVwInfo">""</string>
+  <string name="sVw">""</string>
+  <string name="opts">""</string>
+  <string name="guide">""</string>
+  <string name="priv">""</string>
+  <string name="gh">""</string>
+  <string name="appCrd">""</string>
+  <string name="vrfy">""</string>
+  <string name="ltAgo">""</string>
+  <string name="mAgo">""</string>
+  <string name="wAgo">""</string>
+  <string name="dAgo">""</string>
+  <string name="yesterday">""</string>
+  <string name="today">""</string>
+  <string name="triedInfo">""</string>
+  <string name="snacks">""</string>
+  <string name="dinner">""</string>
+  <string name="lunch">""</string>
+  <string name="breakfast">""</string>
+  <string name="cPic">""</string>
+  <string name="repBtn">""</string>
+  <string name="recPic">""</string>
+  <string name="req">""</string>
+  <string name="nwCat">""</string>
+  <string name="nwYiU">""</string>
+  <string name="rmCmb">""</string>
+  <string name="rmN">""</string>
+  <string name="rmIns">""</string>
+  <string name="rmIng">""</string>
+  <string name="kEdit">""</string>
+  <string name="disBtn">""</string>
+  <string name="disc">""</string>
+  <string name="unsaved">""</string>
+  <string name="ser">""</string>
+  <string name="dBtn">""</string>
+  <string name="sltd">""</string>
+  <string name="recs">""</string>
+  <string name="delRecsInfo">""</string>
+  <string name="delRecInfo">""</string>
+  <string name="conf">""</string>
+  <string name="rmTry">""</string>
+  <string name="aTry">""</string>
+  <string name="unfavd">""</string>
+  <string name="favd">""</string>
+  <string name="aFBu">""</string>
+  <string name="dend">""</string>
+  <string name="conBtn">""</string>
+  <string name="nNBtn">""</string>
+  <string name="reqAcc">""</string>
+  <string name="grant">""</string>
+  <string name="nLangInfo">""</string>
+  <string name="nThmInfo">""</string>
+  <string name="rst">""</string>
+  <string name="appRst">""</string>
+  <string name="SET">""</string>
+  <string name="aNBtn">""</string>
+  <string name="ovw">""</string>
+  <string name="fil">""</string>
+  <string name="rec">""</string>
+  <string name="pht">""</string>
+  <string name="shr">""</string>
+  <string name="min">""</string>
+  <string name="hr">""</string>
+  <string name="recTitle">""</string>
+  <string name="recListEmp">""</string>
+  <string name="selRec">""</string>
+  <string name="aBtn">""</string>
+  <string name="rmLIInfo">""</string>
+  <string name="rmUInfo">""</string>
+  <string name="rmYUInfo">""</string>
+  <string name="rmCatInfo">""</string>
+  <string name="rmCuiInfo">""</string>
+  <string name="rBtn">""</string>
+  <string name="cBtn">""</string>
+  <string name="srt">""</string>
+  <string name="stp">""</string>
+  <string name="it">""</string>
+  <string name="aNoBtn">""</string>
+  <string name="nos">""</string>
+  <string name="no">""</string>
+  <string name="addCmbBtn">""</string>
+  <string name="cmbs">""</string>
+  <string name="cmb">""</string>
+  <string name="aStpBtn">""</string>
+  <string name="inss">""</string>
+  <string name="ins">""</string>
+  <string name="aIngBtn">""</string>
+  <string name="ings">""</string>
+  <string name="ing">""</string>
+  <string name="yieldU">""</string>
+  <string name="yieldQ">""</string>
+  <string name="cookT">""</string>
+  <string name="prepT">""</string>
+  <string name="cat">""</string>
+  <string name="title">""</string>
+  <string name="editRec">""</string>
+  <string name="newRec">""</string>
+  <string name="tgInfo">""</string>
+  <string name="joinTG">""</string>
+  <string name="ver">""</string>
+  <string name="impInfo">""</string>
+  <string name="impBu">""</string>
+  <string name="buInfo">""</string>
+  <string name="expBu">""</string>
+  <string name="db">""</string>
+  <string name="Dark">""</string>
+  <string name="Light">""</string>
+  <string name="Theme">""</string>
+  <string name="sysDef">""</string>
+  <string name="lang">""</string>
+  <string name="intf">""</string>
+  <string name="noRecsInFtr">""</string>
+  <string name="noRecsInFavs">""</string>
+  <string name="noRecsInTL">""</string>
+  <string name="noRecs">""</string>
+  <string name="fsList">""</string>
+  <string name="noFavs">""</string>
+  <string name="tLInfo">""</string>
+  <string name="aD">""</string>
+  <string name="pANo">""</string>
+  <string name="pACmb">""</string>
+  <string name="pAIns">""</string>
+  <string name="pAIng">""</string>
+  <string name="plsAdd">""</string>
+  <string name="strAdd">""</string>
+  <string name="large">""</string>
+  <string name="medium">""</string>
+  <string name="small">""</string>
+  <string name="stick">""</string>
+  <string name="dozen">""</string>
+  <string name="drop">""</string>
+  <string name="pinch">""</string>
+  <string name="piece">""</string>
+  <string name="clove">""</string>
+  <string name="leaf">""</string>
+  <string name="in">""</string>
+  <string name="cm">""</string>
+  <string name="kg">""</string>
+  <string name="g">""</string>
+  <string name="mg">""</string>
+  <string name="lb">""</string>
+  <string name="oz">""</string>
+  <string name="l">""</string>
+  <string name="ml">""</string>
+  <string name="gal">""</string>
+  <string name="qt">""</string>
+  <string name="pt">""</string>
+  <string name="cup">""</string>
+  <string name="_fl_oz_72kqu">""</string>
+  <string name="tbsp">""</string>
+  <string name="dsp">""</string>
+  <string name="tsp">""</string>
+  <string name="unit">""</string>
+  <string name="Loaf">""</string>
+  <string name="Patty">""</string>
+  <string name="Roll">""</string>
+  <string name="Litre">""</string>
+  <string name="Millilitre">""</string>
+  <string name="Gallon">""</string>
+  <string name="Cup">""</string>
+  <string name="Kilogram">""</string>
+  <string name="Gram">""</string>
+  <string name="Pound">""</string>
+  <string name="Ounce">""</string>
+  <string name="_Fluid_Ounce_bd10L">""</string>
+  <string name="Tablespoon">""</string>
+  <string name="Teaspoon">""</string>
+  <string name="Piece">""</string>
+  <string name="Serving">""</string>
+  <string name="Vegetarian">""</string>
+  <string name="Vegan">""</string>
+  <string name="Undefined">""</string>
+  <string name="Soups">""</string>
+  <string name="Snacks">""</string>
+  <string name="_Side_dishes_Z1Et4Vg">""</string>
+  <string name="Seafood">""</string>
+  <string name="Sauces">""</string>
+  <string name="Salads">""</string>
+  <string name="Rice">""</string>
+  <string name="Poultry">""</string>
+  <string name="Pasta">""</string>
+  <string name="Noodles">""</string>
+  <string name="Meat">""</string>
+  <string name="_Main_dishes_u6RGQ">""</string>
+  <string name="Lunch">""</string>
+  <string name="Healthy">""</string>
+  <string name="Drinks">""</string>
+  <string name="Dinner">""</string>
+  <string name="Desserts">""</string>
+  <string name="Breakfast">""</string>
+  <string name="Breads">""</string>
+  <string name="Beverages">""</string>
+  <string name="Barbecue">""</string>
+  <string name="Appetizers">""</string>
+  <string name="About">""</string>
+  <string name="Settings">""</string>
+  <string name="grocery">""</string>
+  <string name="planner">""</string>
+  <string name="favourites">""</string>
+  <string name="trylater">""</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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
new file mode 100644
index 00000000..07aebea0
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-ca/strings.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="undo">""</string>
+  <string name="trnsl">""</string>
+  <string name="SAT">""</string>
+  <string name="FRI">""</string>
+  <string name="THU">""</string>
+  <string name="WED">""</string>
+  <string name="TUE">""</string>
+  <string name="MON">""</string>
+  <string name="SUN">""</string>
+  <string name="December">""</string>
+  <string name="November">""</string>
+  <string name="October">""</string>
+  <string name="September">""</string>
+  <string name="August">""</string>
+  <string name="July">""</string>
+  <string name="June">""</string>
+  <string name="May">""</string>
+  <string name="April">""</string>
+  <string name="March">""</string>
+  <string name="February">""</string>
+  <string name="January">""</string>
+  <string name="trySer">""</string>
+  <string name="help">""</string>
+  <string name="appInfo">""</string>
+  <string name="donate">""</string>
+  <string name="invFile">""</string>
+  <string name="buSuc">""</string>
+  <string name="buMod">""</string>
+  <string name="buEmp">""</string>
+  <string name="buInc">""</string>
+  <string name="impFail">""</string>
+  <string name="recRm">""</string>
+  <string name="untRec">""</string>
+  <string name="stars">""</string>
+  <string name="Created">""</string>
+  <string name="_Filtered_recipes_Z1alhhu">""</string>
+  <string name="OK">""</string>
+  <string name="recU">""</string>
+  <string name="recE">""</string>
+  <string name="recI">""</string>
+  <string name="recF">""</string>
+  <string name="impSuc">""</string>
+  <string name="tsInfo">""</string>
+  <string name="ts">""</string>
+  <string name="noTs">""</string>
+  <string name="allTs">""</string>
+  <string name="allCats">""</string>
+  <string name="Vietnamese">""</string>
+  <string name="Turkish">""</string>
+  <string name="Thai">""</string>
+  <string name="Swedish">""</string>
+  <string name="_Sri_Lankan_Z7GfBa">""</string>
+  <string name="Spanish">""</string>
+  <string name="Scottish">""</string>
+  <string name="Russian">""</string>
+  <string name="Portuguese">""</string>
+  <string name="Nigerian">""</string>
+  <string name="Mexican">""</string>
+  <string name="Korean">""</string>
+  <string name="Kenyan">""</string>
+  <string name="Jewish">""</string>
+  <string name="Japanese">""</string>
+  <string name="Jamaican">""</string>
+  <string name="Italian">""</string>
+  <string name="Irish">""</string>
+  <string name="Indian">""</string>
+  <string name="Greek">""</string>
+  <string name="German">""</string>
+  <string name="French">""</string>
+  <string name="Filipino">""</string>
+  <string name="English">""</string>
+  <string name="Egyptian">""</string>
+  <string name="Danish">""</string>
+  <string name="Chinese">""</string>
+  <string name="British">""</string>
+  <string name="Brazilian">""</string>
+  <string name="American">""</string>
+  <string name="allCuis">""</string>
+  <string name="cuis">""</string>
+  <string name="cui">""</string>
+  <string name="Unit">""</string>
+  <string name="newUnit">""</string>
+  <string name="newCui">""</string>
+  <string name="Challenging">""</string>
+  <string name="Moderate">""</string>
+  <string name="Easy">""</string>
+  <string name="_Oldest_first_Z6cq4h">""</string>
+  <string name="_Newest_first_2Sb3c">""</string>
+  <string name="_Last_updated_Z2gEbLD">""</string>
+  <string name="_Difficulty_level_cSL5d">""</string>
+  <string name="Rating">""</string>
+  <string name="_Slowest_first_hHjY6">""</string>
+  <string name="_Quickest_first_Z1CpP7N">""</string>
+  <string name="resNF">""</string>
+  <string name="restDone">""</string>
+  <string name="restInfo">""</string>
+  <string name="restUL">""</string>
+  <string name="restYUL">""</string>
+  <string name="restCatL">""</string>
+  <string name="restCuiL">""</string>
+  <string name="rest">""</string>
+  <string name="sVwInfo">""</string>
+  <string name="sVw">""</string>
+  <string name="opts">""</string>
+  <string name="guide">""</string>
+  <string name="priv">""</string>
+  <string name="gh">""</string>
+  <string name="appCrd">""</string>
+  <string name="vrfy">""</string>
+  <string name="ltAgo">""</string>
+  <string name="mAgo">""</string>
+  <string name="wAgo">""</string>
+  <string name="dAgo">""</string>
+  <string name="yesterday">""</string>
+  <string name="today">""</string>
+  <string name="triedInfo">""</string>
+  <string name="snacks">""</string>
+  <string name="dinner">""</string>
+  <string name="lunch">""</string>
+  <string name="breakfast">""</string>
+  <string name="cPic">""</string>
+  <string name="repBtn">""</string>
+  <string name="recPic">""</string>
+  <string name="req">""</string>
+  <string name="nwCat">""</string>
+  <string name="nwYiU">""</string>
+  <string name="rmCmb">""</string>
+  <string name="rmN">""</string>
+  <string name="rmIns">""</string>
+  <string name="rmIng">""</string>
+  <string name="kEdit">""</string>
+  <string name="disBtn">""</string>
+  <string name="disc">""</string>
+  <string name="unsaved">""</string>
+  <string name="ser">""</string>
+  <string name="dBtn">""</string>
+  <string name="sltd">""</string>
+  <string name="recs">""</string>
+  <string name="delRecsInfo">""</string>
+  <string name="delRecInfo">""</string>
+  <string name="conf">""</string>
+  <string name="rmTry">""</string>
+  <string name="aTry">""</string>
+  <string name="unfavd">""</string>
+  <string name="favd">""</string>
+  <string name="aFBu">""</string>
+  <string name="dend">""</string>
+  <string name="conBtn">""</string>
+  <string name="nNBtn">""</string>
+  <string name="reqAcc">""</string>
+  <string name="grant">""</string>
+  <string name="nLangInfo">""</string>
+  <string name="nThmInfo">""</string>
+  <string name="rst">""</string>
+  <string name="appRst">""</string>
+  <string name="SET">""</string>
+  <string name="aNBtn">""</string>
+  <string name="ovw">""</string>
+  <string name="fil">""</string>
+  <string name="rec">""</string>
+  <string name="pht">""</string>
+  <string name="shr">""</string>
+  <string name="min">""</string>
+  <string name="hr">""</string>
+  <string name="recTitle">""</string>
+  <string name="recListEmp">""</string>
+  <string name="selRec">""</string>
+  <string name="aBtn">""</string>
+  <string name="rmLIInfo">""</string>
+  <string name="rmUInfo">""</string>
+  <string name="rmYUInfo">""</string>
+  <string name="rmCatInfo">""</string>
+  <string name="rmCuiInfo">""</string>
+  <string name="rBtn">""</string>
+  <string name="cBtn">""</string>
+  <string name="srt">""</string>
+  <string name="stp">""</string>
+  <string name="it">""</string>
+  <string name="aNoBtn">""</string>
+  <string name="nos">""</string>
+  <string name="no">""</string>
+  <string name="addCmbBtn">""</string>
+  <string name="cmbs">""</string>
+  <string name="cmb">""</string>
+  <string name="aStpBtn">""</string>
+  <string name="inss">""</string>
+  <string name="ins">""</string>
+  <string name="aIngBtn">""</string>
+  <string name="ings">""</string>
+  <string name="ing">""</string>
+  <string name="yieldU">""</string>
+  <string name="yieldQ">""</string>
+  <string name="cookT">""</string>
+  <string name="prepT">""</string>
+  <string name="cat">""</string>
+  <string name="title">""</string>
+  <string name="editRec">""</string>
+  <string name="newRec">""</string>
+  <string name="tgInfo">""</string>
+  <string name="joinTG">""</string>
+  <string name="ver">""</string>
+  <string name="impInfo">""</string>
+  <string name="impBu">""</string>
+  <string name="buInfo">""</string>
+  <string name="expBu">""</string>
+  <string name="db">""</string>
+  <string name="Dark">""</string>
+  <string name="Light">""</string>
+  <string name="Theme">""</string>
+  <string name="sysDef">""</string>
+  <string name="lang">""</string>
+  <string name="intf">""</string>
+  <string name="noRecsInFtr">""</string>
+  <string name="noRecsInFavs">""</string>
+  <string name="noRecsInTL">""</string>
+  <string name="noRecs">""</string>
+  <string name="fsList">""</string>
+  <string name="noFavs">""</string>
+  <string name="tLInfo">""</string>
+  <string name="aD">""</string>
+  <string name="pANo">""</string>
+  <string name="pACmb">""</string>
+  <string name="pAIns">""</string>
+  <string name="pAIng">""</string>
+  <string name="plsAdd">""</string>
+  <string name="strAdd">""</string>
+  <string name="large">""</string>
+  <string name="medium">""</string>
+  <string name="small">""</string>
+  <string name="stick">""</string>
+  <string name="dozen">""</string>
+  <string name="drop">""</string>
+  <string name="pinch">""</string>
+  <string name="piece">""</string>
+  <string name="clove">""</string>
+  <string name="leaf">""</string>
+  <string name="in">""</string>
+  <string name="cm">""</string>
+  <string name="kg">""</string>
+  <string name="g">""</string>
+  <string name="mg">""</string>
+  <string name="lb">""</string>
+  <string name="oz">""</string>
+  <string name="l">""</string>
+  <string name="ml">""</string>
+  <string name="gal">""</string>
+  <string name="qt">""</string>
+  <string name="pt">""</string>
+  <string name="cup">""</string>
+  <string name="_fl_oz_72kqu">""</string>
+  <string name="tbsp">""</string>
+  <string name="dsp">""</string>
+  <string name="tsp">""</string>
+  <string name="unit">""</string>
+  <string name="Loaf">""</string>
+  <string name="Patty">""</string>
+  <string name="Roll">""</string>
+  <string name="Litre">""</string>
+  <string name="Millilitre">""</string>
+  <string name="Gallon">""</string>
+  <string name="Cup">""</string>
+  <string name="Kilogram">""</string>
+  <string name="Gram">""</string>
+  <string name="Pound">""</string>
+  <string name="Ounce">""</string>
+  <string name="_Fluid_Ounce_bd10L">""</string>
+  <string name="Tablespoon">""</string>
+  <string name="Teaspoon">""</string>
+  <string name="Piece">""</string>
+  <string name="Serving">""</string>
+  <string name="Vegetarian">""</string>
+  <string name="Vegan">""</string>
+  <string name="Undefined">""</string>
+  <string name="Soups">""</string>
+  <string name="Snacks">""</string>
+  <string name="_Side_dishes_Z1Et4Vg">""</string>
+  <string name="Seafood">""</string>
+  <string name="Sauces">""</string>
+  <string name="Salads">""</string>
+  <string name="Rice">""</string>
+  <string name="Poultry">""</string>
+  <string name="Pasta">""</string>
+  <string name="Noodles">""</string>
+  <string name="Meat">""</string>
+  <string name="_Main_dishes_u6RGQ">""</string>
+  <string name="Lunch">""</string>
+  <string name="Healthy">""</string>
+  <string name="Drinks">""</string>
+  <string name="Dinner">""</string>
+  <string name="Desserts">""</string>
+  <string name="Breakfast">""</string>
+  <string name="Breads">""</string>
+  <string name="Beverages">""</string>
+  <string name="Barbecue">""</string>
+  <string name="Appetizers">""</string>
+  <string name="About">""</string>
+  <string name="Settings">""</string>
+  <string name="grocery">""</string>
+  <string name="planner">""</string>
+  <string name="favourites">""</string>
+  <string name="trylater">""</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 aeeff25b..e05f056f 100644
--- a/app/resources/Android/src/main/res/values-da/strings.xml
+++ b/app/resources/Android/src/main/res/values-da/strings.xml
@@ -1,29 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="_Import_failed_Z1dbs6t">"Kunne ikke importere"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
+  <string name="undo">""</string>
+  <string name="trnsl">""</string>
+  <string name="SAT">""</string>
+  <string name="FRI">""</string>
+  <string name="THU">""</string>
+  <string name="WED">""</string>
+  <string name="TUE">""</string>
+  <string name="MON">""</string>
+  <string name="SUN">""</string>
+  <string name="December">""</string>
+  <string name="November">""</string>
+  <string name="October">""</string>
+  <string name="September">""</string>
+  <string name="August">""</string>
+  <string name="July">""</string>
+  <string name="June">""</string>
+  <string name="May">""</string>
+  <string name="April">""</string>
+  <string name="March">""</string>
+  <string name="February">""</string>
+  <string name="January">""</string>
+  <string name="trySer">""</string>
+  <string name="help">""</string>
+  <string name="appInfo">""</string>
+  <string name="donate">""</string>
+  <string name="invFile">""</string>
+  <string name="buSuc">""</string>
+  <string name="buMod">""</string>
+  <string name="buEmp">""</string>
+  <string name="buInc">""</string>
+  <string name="impFail">""</string>
+  <string name="recRm">""</string>
+  <string name="untRec">""</string>
+  <string name="stars">""</string>
   <string name="Created">"Created"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
+  <string name="_Filtered_recipes_Z1alhhu">""</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
+  <string name="recU">""</string>
+  <string name="recE">""</string>
+  <string name="recI">""</string>
+  <string name="recF">""</string>
+  <string name="impSuc">""</string>
+  <string name="tsInfo">""</string>
+  <string name="ts">""</string>
+  <string name="noTs">""</string>
+  <string name="allTs">""</string>
+  <string name="allCats">""</string>
   <string name="Vietnamese">"Vietnamese"</string>
   <string name="Turkish">"Turkish"</string>
   <string name="Thai">"Thai"</string>
@@ -54,17 +77,12 @@
   <string name="British">"British"</string>
   <string name="Brazilian">"Brazilian"</string>
   <string name="American">"American"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
+  <string name="allCuis">""</string>
+  <string name="cuis">""</string>
+  <string name="cui">""</string>
+  <string name="Unit">"Enhed"</string>
+  <string name="newUnit">""</string>
+  <string name="newCui">""</string>
   <string name="Challenging">"Challenging"</string>
   <string name="Moderate">"Moderate"</string>
   <string name="Easy">"Easy"</string>
@@ -75,139 +93,139 @@
   <string name="Rating">"Rating"</string>
   <string name="_Slowest_first_hHjY6">"Slowest first"</string>
   <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Bidragyder"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Deles via EnRecipes. Få det på Play Butik eller fra F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Tilladelse nægtet"</string>
-  <string name="_Import_successful_2bLM3e">"Import vellykket"</string>
-  <string name="_Verifying____cS102">"Check..."</string>
-  <string name="_long_time_ago_1nwlFA">"lang tid siden"</string>
-  <string name="_months_ago_Z1TsskA">"Måneder før"</string>
-  <string name="_weeks_ago_Z2sT1GA">"Uger før"</string>
-  <string name="_days_ago_2iCYkm">"Dage før"</string>
+  <string name="resNF">""</string>
+  <string name="restDone">""</string>
+  <string name="restInfo">""</string>
+  <string name="restUL">""</string>
+  <string name="restYUL">""</string>
+  <string name="restCatL">""</string>
+  <string name="restCuiL">""</string>
+  <string name="rest">""</string>
+  <string name="sVwInfo">""</string>
+  <string name="sVw">""</string>
+  <string name="opts">""</string>
+  <string name="guide">""</string>
+  <string name="priv">""</string>
+  <string name="gh">""</string>
+  <string name="appCrd">""</string>
+  <string name="vrfy">""</string>
+  <string name="ltAgo">""</string>
+  <string name="mAgo">""</string>
+  <string name="wAgo">""</string>
+  <string name="dAgo">""</string>
   <string name="yesterday">"i går"</string>
   <string name="today">"dag"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Du har prøvet denne opskrift:"</string>
+  <string name="triedInfo">""</string>
   <string name="snacks">"Snackbar"</string>
   <string name="dinner">"Aftensmad"</string>
   <string name="lunch">"Frokost"</string>
   <string name="breakfast">"Morgenmad"</string>
-  <string name="_Crop_photo_1VL04J">"Beskæring af et foto"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"UDSKIFT FOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Opskrift Foto"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes kræver opbevaring tilladelse til at sætte opskriften fotos."</string>
-  <string name="Required">"Nødvendig"</string>
-  <string name="_New_category_Weg73">"Neue-kategori"</string>
-  <string name="_New_yield_unit_1Oevd2">"Nyt Udbytte Enhed"</string>
-  <string name="_Remove_note__2wyMVE">"Bemærk fjerne?"</string>
-  <string name="_Remove_combination__1dr2LS">"Kombination fjerne?"</string>
-  <string name="_Remove_instruction__vkJfi">"Forberedelse fjerne?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Ingredienser fjerne?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KASSERE"</string>
-  <string name="DISCARD">"KASSERE"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Vil du kassere ikke-gemte ændringer i denne opskrift?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Ikke-Gemte Ændringer"</string>
-  <string name="Search">"Søge"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Vil du virkelig slette opskriften"</string>
-  <string name="DELETE">"SLETTE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Slet opskrift?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Fjernet fra senere prøve"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Tilføjet i prøve senere"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Fjernet fra favoritter"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Tilføjet Til Favoritter"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Tilføj mindst en opskrift for at udføre en sikkerhedskopi"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes kræver tilladelse til opbevaring for at sikkerhedskopiere dine data på denne enhed."</string>
-  <string name="CONTINUE">"FORTSÆTTE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"IKKE NU"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes hukommelse krævede tilladelse til at importere dine data fra en tidligere sikkerhedskopi."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Give tilladelse"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes skal genstartes, for at det nyligt indstillede sprog ændres"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes skal genstartes for at emneændringen kan træde i kraft."</string>
-  <string name="RESTART">"GENSTARTE"</string>
-  <string name="_Restart_required_Z22YINL">"En genstart er påkrævet"</string>
+  <string name="cPic">""</string>
+  <string name="repBtn">""</string>
+  <string name="recPic">""</string>
+  <string name="req">""</string>
+  <string name="nwCat">""</string>
+  <string name="nwYiU">""</string>
+  <string name="rmCmb">""</string>
+  <string name="rmN">""</string>
+  <string name="rmIns">""</string>
+  <string name="rmIng">""</string>
+  <string name="kEdit">""</string>
+  <string name="disBtn">""</string>
+  <string name="disc">""</string>
+  <string name="unsaved">""</string>
+  <string name="ser">""</string>
+  <string name="dBtn">""</string>
+  <string name="sltd">""</string>
+  <string name="recs">""</string>
+  <string name="delRecsInfo">""</string>
+  <string name="delRecInfo">""</string>
+  <string name="conf">""</string>
+  <string name="rmTry">""</string>
+  <string name="aTry">""</string>
+  <string name="unfavd">""</string>
+  <string name="favd">""</string>
+  <string name="aFBu">""</string>
+  <string name="dend">""</string>
+  <string name="conBtn">""</string>
+  <string name="nNBtn">""</string>
+  <string name="reqAcc">""</string>
+  <string name="grant">""</string>
+  <string name="nLangInfo">""</string>
+  <string name="nThmInfo">""</string>
+  <string name="rst">""</string>
+  <string name="appRst">""</string>
   <string name="SET">"INDSTILLE"</string>
-  <string name="_ADD_NEW_Zv8FjM">"OPRET NYE"</string>
-  <string name="Share">"Dele"</string>
-  <string name="Overview">"Oversigt"</string>
-  <string name="Recipe">"Opskrift"</string>
-  <string name="Photo">"Foto"</string>
+  <string name="aNBtn">""</string>
+  <string name="ovw">""</string>
+  <string name="fil">""</string>
+  <string name="rec">""</string>
+  <string name="pht">""</string>
+  <string name="shr">""</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Min Sunde Opskrift"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Der er intet her! Tilføj nogle opskrifter og prøv igen."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Opskrift vælg"</string>
-  <string name="ADD">"TILFØJE"</string>
-  <string name="REMOVE">"FJERNE"</string>
-  <string name="CANCEL">"ANNULLERE"</string>
-  <string name="_Sort_by_Zq01TF">"Sorter efter"</string>
-  <string name="Step">"Trin"</string>
-  <string name="Item">"Element"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"TILFØJ NOTER"</string>
-  <string name="Notes">"Noter"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"TILFØJE KOMBINATION"</string>
-  <string name="Combinations">"Kombinationer"</string>
-  <string name="_ADD_STEP_ZyMPOe">"TILFØJ TRIN"</string>
-  <string name="Instructions">"Forberedelser"</string>
-  <string name="Instruction">"Forberedelse"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"TILFØJE INGREDIENS"</string>
-  <string name="Ingredients">"Ingredienser"</string>
-  <string name="Ingredient">"Ingrediens"</string>
-  <string name="_Yield_measured_in_2OoRT">"Udbytte målt i"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Udbyttebeløb"</string>
-  <string name="_Cooking_time_2w2fEw">"Tilberedningstid"</string>
-  <string name="_Preparation_time_15BfxT">"Forberedelsestid"</string>
-  <string name="Category">"kategori"</string>
-  <string name="Title">"Titel"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Opskrift Rediger"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Ny Opskrift"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Forfatter"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"til rapportering af problemer, forslag og Feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Deltag i telegram-gruppen"</string>
-  <string name="Version">"version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Understøtter fuld sikkerhedskopier eksporteret af denne App"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import fra Backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Opretter en fileip-fil, der indeholder alle data. Denne fil kan importeres igen."</string>
-  <string name="_Export_a_full_backup_TJfra">"Eksporter til en sikkerhedskopi"</string>
-  <string name="Database">"Database"</string>
+  <string name="recTitle">""</string>
+  <string name="recListEmp">""</string>
+  <string name="selRec">""</string>
+  <string name="aBtn">""</string>
+  <string name="rmLIInfo">""</string>
+  <string name="rmUInfo">""</string>
+  <string name="rmYUInfo">""</string>
+  <string name="rmCatInfo">""</string>
+  <string name="rmCuiInfo">""</string>
+  <string name="rBtn">""</string>
+  <string name="cBtn">""</string>
+  <string name="srt">""</string>
+  <string name="stp">""</string>
+  <string name="it">""</string>
+  <string name="aNoBtn">""</string>
+  <string name="nos">""</string>
+  <string name="no">""</string>
+  <string name="addCmbBtn">""</string>
+  <string name="cmbs">""</string>
+  <string name="cmb">""</string>
+  <string name="aStpBtn">""</string>
+  <string name="inss">""</string>
+  <string name="ins">""</string>
+  <string name="aIngBtn">""</string>
+  <string name="ings">""</string>
+  <string name="ing">""</string>
+  <string name="yieldU">""</string>
+  <string name="yieldQ">""</string>
+  <string name="cookT">""</string>
+  <string name="prepT">""</string>
+  <string name="cat">""</string>
+  <string name="title">""</string>
+  <string name="editRec">""</string>
+  <string name="newRec">""</string>
+  <string name="tgInfo">""</string>
+  <string name="joinTG">""</string>
+  <string name="ver">"Version"</string>
+  <string name="impInfo">""</string>
+  <string name="impBu">"Importer data"</string>
+  <string name="buInfo">""</string>
+  <string name="expBu">"Eksporter komplet sikkerhedskopi"</string>
+  <string name="db">"Database"</string>
   <string name="Dark">"Mørk"</string>
   <string name="Light">"Lyst"</string>
   <string name="Theme">"Emne"</string>
-  <string name="_System_default_Z1jruVS">"Systemstandard"</string>
-  <string name="_App_language_DzFsk">"App Sprog"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Din søgning matchede ikke Opskrifter i din senere prøveliste"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Din søgning matchede ikke Opskrifter i dine favoritter"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Din søgning stemte ikke overens med opskrifter i denne kategori"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Din søgning stemte ikke overens med opskrifter"</string>
-  <string name="_No_recipes_found_Z125IxD">"Ingen opskrifter fundet"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Kategori er tom"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Opskrifter, som du markerer som favoritter, er vist her"</string>
-  <string name="_No_favourites_yet_aPSoG">"Ingen favoritter endnu"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Opskrifter, der er markeret med try later, vises her"</string>
-  <string name="_All_done__72KYl">"Alle gjort!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Brug pen-ikonet til at tilføje nogle noter"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Brug pennikonet til at tilføje nogle kombinationer"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Brug penikonet til at tilføje nogle forberedelser"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Brug pen-ikonet til at tilføje nogle ingredienser"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Brug plusknappen til at tilføje en"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Begynd at tilføje dine opskrifter!"</string>
+  <string name="sysDef">"System standard"</string>
+  <string name="lang">"Sprog"</string>
+  <string name="intf">"Interface"</string>
+  <string name="noRecsInFtr">""</string>
+  <string name="noRecsInFavs">""</string>
+  <string name="noRecsInTL">"Ingen opskrifter matchede din søgning i \'Prøv Senere\' listen"</string>
+  <string name="noRecs">"Ingen opskrifter matchede din søgning"</string>
+  <string name="fsList">"Dine favorit opskrifter er vist her"</string>
+  <string name="noFavs">"Endnu ingen favoritter"</string>
+  <string name="tLInfo">"Opskrifter du vil prøve senere, er vist her"</string>
+  <string name="aD">"Fuldendt!"</string>
+  <string name="pANo">""</string>
+  <string name="pACmb">""</string>
+  <string name="pAIns">""</string>
+  <string name="pAIng">""</string>
+  <string name="plsAdd">"Brug knappen for at tilføje en"</string>
+  <string name="strAdd">"Begynd at tilføje dine opskrifter"</string>
   <string name="large">"stor"</string>
   <string name="medium">"medium"</string>
   <string name="small">"lille"</string>
@@ -228,14 +246,13 @@
   <string name="l">"l"</string>
   <string name="ml">"ml"</string>
   <string name="gal">"gal"</string>
-  <string name="qt">"qt"</string>
+  <string name="qt">"kvart"</string>
   <string name="pt">"pt"</string>
   <string name="cup">"Kop"</string>
   <string name="_fl_oz_72kqu">"fl"</string>
-  <string name="tbsp">"EL"</string>
+  <string name="tbsp">"spsk"</string>
   <string name="dsp">"SL"</string>
-  <string name="tsp">"TL"</string>
-  <string name="Unit">"Enhed"</string>
+  <string name="tsp">"tsk."</string>
   <string name="unit">"enhed"</string>
   <string name="Loaf">"Brød"</string>
   <string name="Patty">"Patty"</string>
@@ -280,194 +297,21 @@
   <string name="Appetizers">"Forret"</string>
   <string name="About">"Om"</string>
   <string name="Settings">"Indstilling"</string>
-  <string name="Categories">"Kategori"</string>
-  <string name="_Meal_Planner_2aq4oj">"Måltid planner"</string>
-  <string name="Favourites">"Favorit"</string>
-  <string name="_Try_Later_If7PG">"Prøv senere"</string>
+  <string name="grocery">"Indkøbsliste"</string>
+  <string name="planner">"Måltids planlægger"</string>
+  <string name="favourites">"Favoritter"</string>
+  <string name="trylater">"Prøv senere"</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>
-  <string name="undo">"Undo"</string>
-  <string name="trnsl">"Translate"</string>
-  <string name="SAT">"SAT"</string>
-  <string name="FRI">"FRI"</string>
-  <string name="THU">"THU"</string>
-  <string name="WED">"WED"</string>
-  <string name="TUE">"TUE"</string>
-  <string name="MON">"MON"</string>
-  <string name="SUN">"SUN"</string>
-  <string name="December">"December"</string>
-  <string name="November">"November"</string>
-  <string name="October">"October"</string>
-  <string name="September">"September"</string>
-  <string name="August">"August"</string>
-  <string name="July">"July"</string>
-  <string name="June">"June"</string>
-  <string name="May">"May"</string>
-  <string name="April">"April"</string>
-  <string name="March">"March"</string>
-  <string name="February">"February"</string>
-  <string name="January">"January"</string>
-  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
-  <string name="help">"Help"</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="donate">"Donate"</string>
-  <string name="invFile">"Invalid file"</string>
-  <string name="buSuc">"Backup saved successfully to the Download folder"</string>
-  <string name="buMod">"The backup file was modified elsewhere"</string>
-  <string name="buEmp">"The backup file is empty"</string>
-  <string name="buInc">"Malformed or corrupt backup file"</string>
-  <string name="impFail">"Import failed"</string>
-  <string name="recRm">"Recipe removed"</string>
-  <string name="untRec">"Untitled Recipe"</string>
-  <string name="stars">"Star rating"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
-  <string name="recU">"recipes updated"</string>
-  <string name="recE">"recipes already exists"</string>
-  <string name="recI">"recipes imported"</string>
-  <string name="recF">"recipes found"</string>
-  <string name="impSuc">"Import success"</string>
-  <string name="tsInfo">"separate with spaces"</string>
-  <string name="ts">"Tags"</string>
-  <string name="noTs">"No tags available"</string>
-  <string name="allTs">"All Tags"</string>
-  <string name="allCats">"All Categories"</string>
-  <string name="allCuis">"All Cuisines"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="newUnit">"New unit"</string>
-  <string name="newCui">"New cuisine"</string>
-  <string name="resNF">"Recipe not found"</string>
-  <string name="restDone">"Reset done"</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="restUL">"Reset unit list"</string>
-  <string name="restYUL">"Reset yield unit list"</string>
-  <string name="restCatL">"Reset category list"</string>
-  <string name="restCuiL">"Reset cuisine list"</string>
-  <string name="rest">"Reset"</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="opts">"Options"</string>
-  <string name="guide">"User guide"</string>
-  <string name="priv">"Privacy policy"</string>
-  <string name="gh">"View on GitHub"</string>
-  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
-  <string name="vrfy">"Verifying"</string>
-  <string name="ltAgo">"a long time ago"</string>
-  <string name="mAgo">"months ago"</string>
-  <string name="wAgo">"weeks ago"</string>
-  <string name="dAgo">"days ago"</string>
-  <string name="triedInfo">"You tried this recipe:"</string>
-  <string name="cPic">"Crop photo"</string>
-  <string name="repBtn">"REPLACE PHOTO"</string>
-  <string name="recPic">"Recipe photo"</string>
-  <string name="req">"Required"</string>
-  <string name="nwCat">"New category"</string>
-  <string name="nwYiU">"New yield unit"</string>
-  <string name="rmCmb">"Combination removed"</string>
-  <string name="rmN">"Note removed"</string>
-  <string name="rmIns">"Instruction removed"</string>
-  <string name="rmIng">"Ingredient removed"</string>
-  <string name="kEdit">"KEEP EDITING"</string>
-  <string name="disBtn">"DISCARD"</string>
-  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
-  <string name="unsaved">"Unsaved changes"</string>
-  <string name="ser">"Search"</string>
-  <string name="dBtn">"DELETE"</string>
-  <string name="sltd">"selected"</string>
-  <string name="recs">"recipes"</string>
-  <string name="delRecsInfo">"You are about to permanently delete:"</string>
-  <string name="delRecInfo">"You are about to permanently delete the recipe:"</string>
-  <string name="conf">"Confirm"</string>
-  <string name="rmTry">"Removed from Try Later"</string>
-  <string name="aTry">"Added to Try Later"</string>
-  <string name="unfavd">"Removed from Favourites"</string>
-  <string name="favd">"Added to Favourites"</string>
-  <string name="aFBu">"Add a recipe to perform a backup"</string>
-  <string name="dend">"Access denied"</string>
-  <string name="conBtn">"CONTINUE"</string>
-  <string name="nNBtn">"NOT NOW"</string>
-  <string name="reqAcc">"EnRecipes requires storage permission in order to set recipe photo, export and import data"</string>
-  <string name="grant">"Grant access"</string>
-  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
-  <string name="nThmInfo">"Restart EnRecipes to use the new theme"</string>
-  <string name="rst">"RESTART"</string>
-  <string name="appRst">"App restart required"</string>
-  <string name="aNBtn">"ADD NEW"</string>
-  <string name="ovw">"Overview"</string>
-  <string name="fil">"Recipe as file"</string>
-  <string name="rec">"Recipe as text"</string>
-  <string name="pht">"Recipe photo"</string>
-  <string name="shr">"Share"</string>
-  <string name="recTitle">"My Healthy Recipe"</string>
-  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
-  <string name="selRec">"Select recipe"</string>
-  <string name="aBtn">"ADD"</string>
-  <string name="rmLIInfo">"Existing recipes will not be affected"</string>
-  <string name="rmUInfo">"You are about to remove the unit:"</string>
-  <string name="rmYUInfo">"You are about to remove the yield unit:"</string>
-  <string name="rmCatInfo">"You are about to remove the category:"</string>
-  <string name="rmCuiInfo">"You are about to remove the cuisine:"</string>
-  <string name="rBtn">"REMOVE"</string>
-  <string name="cBtn">"CANCEL"</string>
-  <string name="srt">"Sort by"</string>
-  <string name="stp">"Step"</string>
-  <string name="it">"Item"</string>
-  <string name="aNoBtn">"ADD NOTE"</string>
-  <string name="nos">"Notes"</string>
-  <string name="no">"Note"</string>
-  <string name="addCmbBtn">"ADD COMBINATION"</string>
-  <string name="cmbs">"Combinations"</string>
-  <string name="cmb">"Combination"</string>
-  <string name="aStpBtn">"ADD STEP"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="aIngBtn">"ADD INGREDIENT"</string>
-  <string name="ings">"Ingredients"</string>
-  <string name="ing">"Ingredient"</string>
-  <string name="yieldU">"Yield unit"</string>
-  <string name="yieldQ">"Yield quantity"</string>
-  <string name="cookT">"Cooking time"</string>
-  <string name="prepT">"Preparation time"</string>
-  <string name="cat">"Category"</string>
-  <string name="title">"Title"</string>
-  <string name="editRec">"Edit recipe"</string>
-  <string name="newRec">"New recipe"</string>
-  <string name="tgInfo">"For reporting issues, suggestions and feedback"</string>
-  <string name="joinTG">"Join the Telegram group"</string>
-  <string name="ver">"Version"</string>
-  <string name="impInfo">"Supports full backups exported by this app"</string>
-  <string name="impBu">"Import data"</string>
-  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
-  <string name="expBu">"Export full backup"</string>
-  <string name="db">"Database"</string>
-  <string name="sysDef">"System default"</string>
-  <string name="lang">"Language"</string>
-  <string name="intf">"Interface"</string>
-  <string name="noRecsInFtr">"No recipes match your search in the Filtered recipes"</string>
-  <string name="noRecsInFavs">"No recipes match your search in the Favourites list"</string>
-  <string name="noRecsInTL">"No recipes match your search in the Try Later list"</string>
-  <string name="noRecs">"No recipes match your search"</string>
-  <string name="fsList">"Your favourite recipes are listed here"</string>
-  <string name="noFavs">"No favourites yet"</string>
-  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
-  <string name="aD">"All done!"</string>
-  <string name="pANo">"Use the pencil button to add notes"</string>
-  <string name="pACmb">"Use the pencil button to add combinations"</string>
-  <string name="pAIns">"Use the pencil button to add instructions"</string>
-  <string name="pAIng">"Use the pencil button to add ingredients"</string>
-  <string name="plsAdd">"Use the plus button to add one"</string>
-  <string name="strAdd">"Start adding your recipes!"</string>
-  <string name="grocery">"Grocery List"</string>
-  <string name="planner">"Meal Planner"</string>
-  <string name="favourites">"Favourites"</string>
-  <string name="trylater">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 53b0da7e..17ca6ae9 100644
--- a/app/resources/Android/src/main/res/values-de/strings.xml
+++ b/app/resources/Android/src/main/res/values-de/strings.xml
@@ -1,207 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Rückgängig"</string>
   <string name="trnsl">"Übersetzen"</string>
-  <string name="delRecsInfo">"Du bist dabei, dies dauerhaft zu löschen:"</string>
-  <string name="recs">"Rezepte"</string>
-  <string name="sltd">"ausgewählt"</string>
-  <string name="January">"Januar"</string>
-  <string name="February">"Februar"</string>
-  <string name="March">"März"</string>
-  <string name="April">"April"</string>
-  <string name="May">"Mai"</string>
-  <string name="June">"Juni"</string>
-  <string name="July">"Juli"</string>
-  <string name="August">"August"</string>
-  <string name="September">"September"</string>
-  <string name="October">"Oktober"</string>
-  <string name="November">"November"</string>
-  <string name="December">"Dezember"</string>
-  <string name="SUN">"So."</string>
-  <string name="MON">"Mo."</string>
-  <string name="TUE">"Di."</string>
-  <string name="WED">"Mi."</string>
-  <string name="THU">"Do."</string>
-  <string name="FRI">"Fr."</string>
   <string name="SAT">"Sa."</string>
-  <string name="impBu">"Daten importieren"</string>
-  <string name="buInfo">"Erzeugt eine ZIP-Datei mit all deinen Daten, die zurück importiert werden können"</string>
-  <string name="rmLIInfo">"Vorhandene Rezepte sind nicht betroffen"</string>
-  <string name="recListEmp">"Hier ist nichts! Füge einige Rezepte hinzu und versuche es erneut"</string>
-  <string name="fil">"Rezept als Datei"</string>
-  <string name="nThmInfo">"Starte EnRecipes neu, um das neue Design zu verwenden"</string>
-  <string name="nLangInfo">"Starte EnRecipes neu, um die neue Sprache zu verwenden"</string>
-  <string name="grant">"Zugriff gewähren"</string>
-  <string name="reqAcc">"EnRecipes benötigt eine Speicherberechtigung, um Rezeptfotos festzulegen, Daten zu exportieren und zu importieren"</string>
-  <string name="nNBtn">"NICHT JETZT"</string>
-  <string name="favd">"Zu Favoriten hinzugefügt"</string>
-  <string name="unfavd">"Aus Favoriten entfernt"</string>
-  <string name="aTry">"In Später ausprobieren hinzugefügt"</string>
-  <string name="rmTry">"Aus Später ausprobieren entfernt"</string>
-  <string name="disc">"Dieses Rezept hat nicht gespeicherte Änderungen. Was möchtest du tun?"</string>
-  <string name="disBtn">"VERWERFEN"</string>
-  <string name="kEdit">"WEITER BEARBEITEN"</string>
-  <string name="rmIng">"Zutat entfernt"</string>
-  <string name="rmIns">"Zubereitung entfernt"</string>
-  <string name="rmN">"Notiz entfernt"</string>
-  <string name="rmCmb">"Kombination entfernt"</string>
-  <string name="noRecsInTL">"In der Liste Später ausprobieren gibt es keine Rezepte, die deiner Suche entsprechen"</string>
-  <string name="noRecsInFavs">"In der Favoritenliste gibt es keine Rezepte, die deiner Suche entsprechen"</string>
-  <string name="nwCat">"Neue Kategorie"</string>
-  <string name="req">"Erforderlich"</string>
-  <string name="dAgo">"Tage zuvor"</string>
-  <string name="wAgo">"Wochen zuvor"</string>
-  <string name="mAgo">"Monate zuvor"</string>
-  <string name="ltAgo">"vor langer Zeit"</string>
-  <string name="vrfy">"Überprüfen"</string>
-  <string name="appCrd">"Über EnRecipes geteilt. Hol es dir auf F-Droid, IzzyOnDroid oder im Play Store."</string>
-  <string name="gh">"Auf GitHub ansehen"</string>
-  <string name="sVw">"Schütteln, um ein zufälliges Rezept anzuzeigen"</string>
-  <string name="sVwInfo">"Hilft dir, wenn du dich nicht entscheiden kannst, was gekocht werden soll"</string>
-  <string name="rest">"Zurücksetzen"</string>
-  <string name="restCatL">"Kategorieliste zurücksetzen"</string>
-  <string name="restUL">"Einheitenliste zurücksetzen"</string>
-  <string name="restInfo">"Durch das Zurücksetzen einer Liste werden vom Benutzer erstellte Einträge gelöscht und Standardeinträge wiederhergestellt. Bestehende Rezepte sind davon nicht betroffen."</string>
-  <string name="restDone">"Zurücksetzen durchgeführt"</string>
-  <string name="resNF">"Rezept nicht gefunden"</string>
-  <string name="newUnit">"Neue Einheit"</string>
-  <string name="allCats">"Alle Kategorien"</string>
-  <string name="tsInfo">"mit Leerzeichen trennen"</string>
-  <string name="impSuc">"Import erfolgreich"</string>
-  <string name="recF">"Rezepte gefunden"</string>
-  <string name="recI">"Rezepte importiert"</string>
-  <string name="recE">"Rezepte existieren bereits"</string>
-  <string name="recU">"Rezepte aktualisiert"</string>
-  <string name="untRec">"Unbenanntes Rezept"</string>
-  <string name="recRm">"Rezept entfernt"</string>
-  <string name="impFail">"Import fehlgeschlagen"</string>
-  <string name="rmCatInfo">"Du bist dabei, die Kategorie zu entfernen:"</string>
-  <string name="rmYUInfo">"Du bist dabei, die Ertragseinheit zu entfernen:"</string>
-  <string name="rmUInfo">"Du bist dabei, die Einheit zu entfernen:"</string>
-  <string name="delRecInfo">"Du bist dabei, das Rezept dauerhaft zu löschen:"</string>
-  <string name="nwYiU">"Neue Ertragseinheit"</string>
-  <string name="restCuiL">"Küchenliste zurücksetzen"</string>
-  <string name="restYUL">"Ertragseinheitenliste zurücksetzen"</string>
-  <string name="newCui">"Neue Küche"</string>
-  <string name="cui">"Küche"</string>
-  <string name="cuis">"Küchen"</string>
-  <string name="allCuis">"Alle Küchen"</string>
-  <string name="allTs">"Alle Markierungen"</string>
-  <string name="noTs">"Keine Markierungen vorhanden"</string>
-  <string name="ts">"Markierungen"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Gefilterte Rezepte"</string>
-  <string name="stars">"Bewertung in Sternen"</string>
-  <string name="noRecsInFtr">"In den gefilterten Rezepten gibt es keine Rezepte, die deiner Suche entsprechen"</string>
-  <string name="trylater">"Später ausprobieren"</string>
-  <string name="strAdd">"Beginne deine Rezepte hinzuzufügen!"</string>
-  <string name="plsAdd">"Verwende das Plus-Symbol, um eins hinzuzufügen"</string>
-  <string name="pAIng">"Verwende den Stift-Symbol, um Zutaten hinzuzufügen"</string>
-  <string name="pAIns">"Verwende das Stift-Symbol, um einige Zubereitungen hinzuzufügen"</string>
-  <string name="pACmb">"Verwende das Stift-Symbol, um einige Kombinationen hinzuzufügen"</string>
-  <string name="pANo">"Verwende das Stift-Symbol, um einige Notizen hinzuzufügen"</string>
-  <string name="aD">"Fertig!"</string>
-  <string name="tLInfo">"Rezepte, die du später ausprobieren willst, sind hier aufgelistet"</string>
-  <string name="noFavs">"Noch keine Favoriten"</string>
-  <string name="fsList">"Deine Lieblingsrezepte findest du hier"</string>
-  <string name="noRecs">"Keine Rezepte passen zu deiner Suche"</string>
-  <string name="intf">"Benutzeroberfläche"</string>
-  <string name="lang">"Sprache"</string>
-  <string name="sysDef">"Systemstandard"</string>
-  <string name="db">"Datenbank"</string>
-  <string name="ver">"Version"</string>
-  <string name="joinTG">"Tritt der Telegram-Gruppe bei"</string>
-  <string name="tgInfo">"für die Meldung von Problemen, Anregungen und Rückmeldung"</string>
-  <string name="newRec">"Neues Rezept"</string>
-  <string name="editRec">"Rezept bearbeiten"</string>
-  <string name="title">"Titel"</string>
-  <string name="cat">"Kategorie"</string>
-  <string name="prepT">"Vorbereitungszeit"</string>
-  <string name="cookT">"Kochzeit"</string>
-  <string name="yieldQ">"Ertragsmenge"</string>
-  <string name="yieldU">"Ertragseinheit"</string>
-  <string name="ing">"Zutat"</string>
-  <string name="ings">"Zutaten"</string>
-  <string name="aIngBtn">"ZUTAT HINZUFÜGEN"</string>
-  <string name="ins">"Zubereitung"</string>
-  <string name="inss">"Zubereitung"</string>
-  <string name="aStpBtn">"SCHRITT HINZUFÜGEN"</string>
-  <string name="cmb">"Kombination"</string>
-  <string name="cmbs">"Kombinationen"</string>
-  <string name="addCmbBtn">"KOMBINATION HINZUFÜGEN"</string>
-  <string name="no">"Notiz"</string>
-  <string name="nos">"Notizen"</string>
-  <string name="aNoBtn">"NOTIZ HINZUFÜGEN"</string>
-  <string name="it">"Element"</string>
-  <string name="stp">"Schritt"</string>
-  <string name="srt">"Sortieren nach"</string>
-  <string name="cBtn">"ABBRECHEN"</string>
-  <string name="rBtn">"ENTFERNEN"</string>
-  <string name="rmCuiInfo">"Du bist dabei, die Küche zu entfernen:"</string>
-  <string name="aBtn">"HINZUFÜGEN"</string>
-  <string name="selRec">"Rezept auswählen"</string>
-  <string name="recTitle">"Mein gesundes Rezept"</string>
-  <string name="pht">"Rezeptfoto"</string>
-  <string name="rec">"Rezept als Text"</string>
-  <string name="ovw">"Überblick"</string>
-  <string name="shr">"Teilen"</string>
-  <string name="aNBtn">"NEU ANLEGEN"</string>
-  <string name="appRst">"Neustart der Anwendung erforderlich"</string>
-  <string name="rst">"NEU STARTEN"</string>
-  <string name="conBtn">"FORTSETZEN"</string>
-  <string name="dend">"Zugriff verweigert"</string>
-  <string name="conf">"Bestätigen"</string>
-  <string name="delRec">"Löschbestätigung"</string>
-  <string name="dBtn">"LÖSCHEN"</string>
-  <string name="ser">"Suchen"</string>
-  <string name="unsaved">"Nicht gespeicherte Änderungen"</string>
-  <string name="recPic">"Rezeptfoto"</string>
-  <string name="repBtn">"FOTO ERSETZEN"</string>
-  <string name="cPic">"Foto zuschneiden"</string>
-  <string name="triedInfo">"Du hast dieses Rezept ausprobiert:"</string>
-  <string name="priv">"Datenschutz"</string>
-  <string name="guide">"Anleitung"</string>
-  <string name="opts">"Optionen"</string>
-  <string name="invFile">"Ungültige Datei"</string>
-  <string name="donate">"Spenden"</string>
-  <string name="appInfo">"EnRecipes ist ein quelloffenes, datenschutzfreundliches, digitales Kochbuch, mit dem du deine Rezepte erstellen, verwalten und teilen kannst"</string>
-  <string name="help">"Hilfe"</string>
+  <string name="FRI">"Fr."</string>
+  <string name="THU">"Do."</string>
+  <string name="WED">"Mi."</string>
+  <string name="TUE">"Di."</string>
+  <string name="MON">"Mo."</string>
+  <string name="SUN">"So."</string>
+  <string name="December">"Dezember"</string>
+  <string name="November">"November"</string>
+  <string name="October">"Oktober"</string>
+  <string name="September">"September"</string>
+  <string name="August">"August"</string>
+  <string name="July">"Juli"</string>
+  <string name="June">"Juni"</string>
+  <string name="May">"Mai"</string>
+  <string name="April">"April"</string>
+  <string name="March">"März"</string>
+  <string name="February">"Februar"</string>
+  <string name="January">"Januar"</string>
   <string name="trySer">"IN ALLEN REZEPTEN SUCHEN?"</string>
-  <string name="expBu">"Vollständinge Datensicherung exportieren"</string>
-  <string name="impInfo">"Unterstützt vollständige Datensicherungen, die von dieser Anwendung exportiert werden"</string>
-  <string name="expReq">"Zum Exportieren einer Sicherung ist eine Speicherberechtigung erforderlich."</string>
-  <string name="aFBu">"Füge zuerst ein Rezept hinzu, um eine Datensicherung durchzuführen"</string>
-  <string name="buInc">"Fehlerhafte oder beschädigte Sicherungsdatei"</string>
-  <string name="buEmp">"Die Sicherungsdatei ist leer"</string>
-  <string name="buMod">"Die Sicherungsdatei wurde an anderer Stelle geändert"</string>
+  <string name="help">"Hilfe"</string>
+  <string name="appInfo">"EnRecipes ist ein quelloffenes, datenschutzfreundliches, digitales Kochbuch, mit dem du deine Rezepte erstellen, verwalten und teilen kannst"</string>
+  <string name="donate">"Spenden"</string>
+  <string name="invFile">"Ungültige Datei"</string>
   <string name="buSuc">"Sicherung erfolgreich im Download-Ordner gespeichert"</string>
-  <string name="favourites">"Favoriten"</string>
-  <string name="planner">"Essensplaner"</string>
-  <string name="grocery">"Einkaufsliste"</string>
-  <string name="Donate">"Spenden"</string>
-  <string name="Combination">"Kombination"</string>
-  <string name="_Invalid_file__Z2bRAst">"Ungültige Datei:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Sicherungsdatei an anderer Stelle geändert."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Die Datensicherung ist leer."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Fehlerhafte oder beschädigte Sicherungsdatei."</string>
-  <string name="_Import_failed_Z1dbs6t">"Import fehlgeschlagen"</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Entferne Rezept von Imbiss?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Entferne Rezept von Abendessen?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Entferne Rezept von Mittagessen?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Entferne Rezept von Frühstück?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Unbenanntes Rezept"</string>
-  <string name="_Star_rating_Z11p4Kw">"Sternebewertung"</string>
+  <string name="buMod">"Die Sicherungsdatei wurde an anderer Stelle geändert"</string>
+  <string name="buEmp">"Die Sicherungsdatei ist leer"</string>
+  <string name="buInc">"Fehlerhafte oder beschädigte Sicherungsdatei"</string>
+  <string name="impFail">"Import fehlgeschlagen"</string>
+  <string name="recRm">"Rezept entfernt"</string>
+  <string name="untRec">"Unbenanntes Rezept"</string>
+  <string name="stars">"Bewertung in Sternen"</string>
   <string name="Created">"Erstellt"</string>
-  <string name="_Filtered_result_1AMEXe">"gefiltertes Ergebnis"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Gefilterte Rezepte"</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"Rezepte aktualisiert"</string>
-  <string name="_recipes_already_exists_2jqW2s">"Rezept existiert bereits"</string>
-  <string name="_recipes_imported_1NGeRw">"Rezepte importiert"</string>
-  <string name="_recipes_found_ZDdUgV">"Rezepte gefunden"</string>
-  <string name="_Import_summary_244SkL">"Importzusammenfassung"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"trennen mit Leerzeichen"</string>
-  <string name="Tags">"Markierungen"</string>
-  <string name="_No_tags_available_Z1C5GqD">"Keine Markierungen vorhanden"</string>
-  <string name="_All_Tags_28gMyY">"Alle Markierungen"</string>
-  <string name="_All_Categories_Z23JSTS">"Alle Kategorien"</string>
+  <string name="recU">"Rezepte aktualisiert"</string>
+  <string name="recE">"Rezepte existieren bereits"</string>
+  <string name="recI">"Rezepte importiert"</string>
+  <string name="recF">"Rezepte gefunden"</string>
+  <string name="impSuc">"Import erfolgreich"</string>
+  <string name="tsInfo">"mit Leerzeichen trennen"</string>
+  <string name="ts">"Markierungen"</string>
+  <string name="noTs">"Keine Markierungen vorhanden"</string>
+  <string name="allTs">"Alle Markierungen"</string>
+  <string name="allCats">"Alle Kategorien"</string>
   <string name="Vietnamese">"Vietnamesisch"</string>
   <string name="Turkish">"Türkisch"</string>
   <string name="Thai">"Thailändisch"</string>
@@ -232,17 +77,12 @@
   <string name="British">"Britisch"</string>
   <string name="Brazilian">"Brazilianisch"</string>
   <string name="American">"Amerikanisch"</string>
-  <string name="_All_Cuisines_2hjCp9">"Alle Küchen"</string>
-  <string name="Cuisines">"Küchen"</string>
-  <string name="Cuisine">"Küche"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Bist du sicher, dass du löschen möchtest"</string>
-  <string name="Units">"Einheiten"</string>
-  <string name="_Remove_unit__2x26yq">"Einheit löschen?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Ertragseinheit löschen?"</string>
-  <string name="_Remove_category__2reaxz">"Kategorie löschen?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Küche löschen?"</string>
-  <string name="_New_unit_1CVEEA">"Neue Einheit"</string>
-  <string name="_New_cuisine_Zrvs3z">"Neue Küche"</string>
+  <string name="allCuis">"Alle Küchen"</string>
+  <string name="cuis">"Küchen"</string>
+  <string name="cui">"Küche"</string>
+  <string name="Unit">"Einheit"</string>
+  <string name="newUnit">"Neue Einheit"</string>
+  <string name="newCui">"Neue Küche"</string>
   <string name="Challenging">"Herausfordernd"</string>
   <string name="Moderate">"Moderat"</string>
   <string name="Easy">"Einfach"</string>
@@ -253,139 +93,139 @@
   <string name="Rating">"Bewertung"</string>
   <string name="_Slowest_first_hHjY6">"Langsamste zuerst"</string>
   <string name="_Quickest_first_Z1CpP7N">"Schnellste zuerst"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Konnte keine solchen Rezepte finden."</string>
-  <string name="_Recipe_not_found_2qGveM">"Rezept nicht gefunden"</string>
-  <string name="_Reset_successful_YxqWK">"Zurücksetzen erledigt"</string>
-  <string name="_Reset_units_list_msRS3">"Einheiten-Liste zurücksetzen"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Ertragseinheiten-Liste zurücksetzen"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Kategorien-Liste zurücksetzen"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Küchen-Liste zurücksetzen"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Durch das Zurücksetzen von Listen werden nur gelöschte Standardeinträge wiederhergestellt. Bestehende Einträge werden nicht gelöscht."</string>
-  <string name="Reset">"Zurücksetzen"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Hilft dir, wenn du dich nicht entscheiden kannst, was du kochen willst"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Schütteln, um ein zufälliges Rezept zu erhalten"</string>
-  <string name="Options">"Optionen"</string>
-  <string name="_User_guide_2uDJCF">"Anleitung"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Datenschutz"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Auf GitHub ansehen"</string>
-  <string name="Translator">"Übersetzt von"</string>
-  <string name="Contributors">"Mitwirkende"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Über EnRecipes geteilt. Hol es dir auf F-Droid, IzzyOnDroid oder im Play Store."</string>
-  <string name="_Permission_denied_Z7wlWK">"Berechtigung verweigert"</string>
-  <string name="_Import_successful_2bLM3e">"Importiert"</string>
-  <string name="_Verifying____cS102">"Überprüfen …"</string>
-  <string name="_long_time_ago_1nwlFA">"vor langer Zeit"</string>
-  <string name="_months_ago_Z1TsskA">"Monate zuvor"</string>
-  <string name="_weeks_ago_Z2sT1GA">"Wochen zuvor"</string>
-  <string name="_days_ago_2iCYkm">"Tage zuvor"</string>
+  <string name="resNF">"Rezept nicht gefunden"</string>
+  <string name="restDone">"Zurücksetzen durchgeführt"</string>
+  <string name="restInfo">"Durch das Zurücksetzen einer Liste werden vom Benutzer erstellte Einträge gelöscht und Standardeinträge wiederhergestellt. Bestehende Rezepte sind davon nicht betroffen."</string>
+  <string name="restUL">"Einheitenliste zurücksetzen"</string>
+  <string name="restYUL">"Ertragseinheitenliste zurücksetzen"</string>
+  <string name="restCatL">"Kategorieliste zurücksetzen"</string>
+  <string name="restCuiL">"Küchenliste zurücksetzen"</string>
+  <string name="rest">"Zurücksetzen"</string>
+  <string name="sVwInfo">"Hilft dir, wenn du dich nicht entscheiden kannst, was gekocht werden soll"</string>
+  <string name="sVw">"Schütteln, um ein zufälliges Rezept anzuzeigen"</string>
+  <string name="opts">"Optionen"</string>
+  <string name="guide">"Anleitung"</string>
+  <string name="priv">"Datenschutz"</string>
+  <string name="gh">"Auf GitHub ansehen"</string>
+  <string name="appCrd">"Über EnRecipes geteilt. Hol es dir auf F-Droid, IzzyOnDroid oder im Play Store."</string>
+  <string name="vrfy">"Überprüfen"</string>
+  <string name="ltAgo">"vor langer Zeit"</string>
+  <string name="mAgo">"Monate zuvor"</string>
+  <string name="wAgo">"Wochen zuvor"</string>
+  <string name="dAgo">"Tage zuvor"</string>
   <string name="yesterday">"gestern"</string>
   <string name="today">"heute"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Du hast dieses Rezept ausprobiert:"</string>
+  <string name="triedInfo">"Du hast dieses Rezept ausprobiert:"</string>
   <string name="snacks">"Imbiss"</string>
   <string name="dinner">"Abendessen"</string>
   <string name="lunch">"Mittagessen"</string>
   <string name="breakfast">"Frühstück"</string>
-  <string name="_Crop_photo_1VL04J">"Foto zuschneiden"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"FOTO ERSETZEN"</string>
-  <string name="_Recipe_photo_eqm9B">"Rezeptfoto"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"Erteile die Speicherberechtigung zum Speichern eines Rezeptfotos."</string>
-  <string name="Required">"Erforderlich"</string>
-  <string name="_New_category_Weg73">"Neue Kategorie"</string>
-  <string name="_New_yield_unit_1Oevd2">"Neue Ertragseinheit"</string>
-  <string name="_Remove_note__2wyMVE">"Notiz entfernen?"</string>
-  <string name="_Remove_combination__1dr2LS">"Kombination entfernen?"</string>
-  <string name="_Remove_instruction__vkJfi">"Zubereitung entfernen?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Zutaten entfernen?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"WEITER BEARBEITEN"</string>
-  <string name="DISCARD">"VERWERFEN"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Alle nicht gespeicherten Änderungen an diesem Rezept verwerfen?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Nicht gespeicherte Änderungen"</string>
-  <string name="Search">"Suche"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Das Rezept löschen"</string>
-  <string name="DELETE">"LÖSCHEN"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Rezept löschen?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Aus Später ausprobieren entfernt"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"In Später ausprobieren hinzugefügt"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Aus Favoriten entfernt"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Zu Favoriten hinzugefügt"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Füge zuerst ein Rezept hinzu, um eine Sicherung durchzuführen."</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"Erteile die Speicherberechtigung zum Sichern von EnRecipe-Daten auf dem Gerät."</string>
-  <string name="CONTINUE">"FORTSETZEN"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NICHT JETZT"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"Erteile die Speicherberechtigung zum Importieren deiner Daten aus einer vorherigen Sicherung."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Erlaubnis erteilen"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"Starte EnRecipes neu, um die neue Sprache zu verwenden."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"Starte EnRecipes neu, um das neue Thema zu verwenden."</string>
-  <string name="RESTART">"NEUSTARTEN"</string>
-  <string name="_Restart_required_Z22YINL">"Neustart der Anwendung erforderlich"</string>
+  <string name="cPic">"Foto zuschneiden"</string>
+  <string name="repBtn">"FOTO ERSETZEN"</string>
+  <string name="recPic">"Rezeptfoto"</string>
+  <string name="req">"Erforderlich"</string>
+  <string name="nwCat">"Neue Kategorie"</string>
+  <string name="nwYiU">"Neue Ertragseinheit"</string>
+  <string name="rmCmb">"Kombination entfernt"</string>
+  <string name="rmN">"Notiz entfernt"</string>
+  <string name="rmIns">"Zubereitung entfernt"</string>
+  <string name="rmIng">"Zutat entfernt"</string>
+  <string name="kEdit">"WEITER BEARBEITEN"</string>
+  <string name="disBtn">"VERWERFEN"</string>
+  <string name="disc">"Dieses Rezept hat nicht gespeicherte Änderungen. Was möchtest du tun?"</string>
+  <string name="unsaved">"Nicht gespeicherte Änderungen"</string>
+  <string name="ser">"Suchen"</string>
+  <string name="dBtn">"LÖSCHEN"</string>
+  <string name="sltd">"ausgewählt"</string>
+  <string name="recs">"Rezepte"</string>
+  <string name="delRecsInfo">"Du bist dabei, dies dauerhaft zu löschen:"</string>
+  <string name="delRecInfo">"Du bist dabei, das Rezept dauerhaft zu löschen:"</string>
+  <string name="conf">"Bestätigen"</string>
+  <string name="rmTry">"Aus Später ausprobieren entfernt"</string>
+  <string name="aTry">"In Später ausprobieren hinzugefügt"</string>
+  <string name="unfavd">"Aus Favoriten entfernt"</string>
+  <string name="favd">"Zu Favoriten hinzugefügt"</string>
+  <string name="aFBu">"Füge zuerst ein Rezept hinzu, um eine Datensicherung durchzuführen"</string>
+  <string name="dend">"Zugriff verweigert"</string>
+  <string name="conBtn">"FORTSETZEN"</string>
+  <string name="nNBtn">"NICHT JETZT"</string>
+  <string name="reqAcc">"EnRecipes benötigt eine Speicherberechtigung, um Rezeptfotos festzulegen, Daten zu exportieren und zu importieren"</string>
+  <string name="grant">"Zugriff gewähren"</string>
+  <string name="nLangInfo">"Starte EnRecipes neu, um die neue Sprache zu verwenden"</string>
+  <string name="nThmInfo">"Starte EnRecipes neu, um das neue Design zu verwenden"</string>
+  <string name="rst">"NEU STARTEN"</string>
+  <string name="appRst">"Neustart der Anwendung erforderlich"</string>
   <string name="SET">"EINSTELLEN"</string>
-  <string name="_ADD_NEW_Zv8FjM">"NEU ANLEGEN"</string>
-  <string name="Share">"Teilen"</string>
-  <string name="Overview">"Überblick"</string>
-  <string name="Recipe">"Rezept"</string>
-  <string name="Photo">"Foto"</string>
+  <string name="aNBtn">"NEU ANLEGEN"</string>
+  <string name="ovw">"Überblick"</string>
+  <string name="fil">"Rezept als Datei"</string>
+  <string name="rec">"Rezept als Text"</string>
+  <string name="pht">"Rezeptfoto"</string>
+  <string name="shr">"Teilen"</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Mein Gesundes Rezept"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Füge Rezepte hinzu, um sie hier zu sehen."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Rezept auswählen"</string>
-  <string name="ADD">"HINZUFÜGEN"</string>
-  <string name="REMOVE">"ENTFERNEN"</string>
-  <string name="CANCEL">"ABBRECHEN"</string>
-  <string name="_Sort_by_Zq01TF">"Sortieren nach"</string>
-  <string name="Step">"Schritt"</string>
-  <string name="Item">"Posten"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"NOTIZEN HINZUFÜGEN"</string>
-  <string name="Notes">"Notizen"</string>
-  <string name="Note">"Notiz"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"KOMBINATION HINZUFÜGEN"</string>
-  <string name="Combinations">"Kombinationen"</string>
-  <string name="_ADD_STEP_ZyMPOe">"SCHRITT HINZUFÜGEN"</string>
-  <string name="Instructions">"Zubereitungen"</string>
-  <string name="Instruction">"Zubereitung"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ZUTAT HINZUFÜGEN"</string>
-  <string name="Ingredients">"Zutaten"</string>
-  <string name="Ingredient">"Zutat"</string>
-  <string name="_Yield_measured_in_2OoRT">"Ertrag gemessen in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Ertragsmenge"</string>
-  <string name="_Cooking_time_2w2fEw">"Kochzeit"</string>
-  <string name="_Preparation_time_15BfxT">"Vorbereitungszeit"</string>
-  <string name="Category">"Kategorie"</string>
-  <string name="Title">"Titel"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Rezept bearbeiten"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Neues Rezept"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Autor"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"für die Meldung von Problemen, Anregungen und Rückmeldung"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Tritt der Telegrammgruppe bei"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Unterstützt vollständige Datensicherungen, die von dieser Anwendung exportiert werden"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Von der Datensicherung importieren"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generiert eine ZIP-Datei mit all deinen Daten, die du an anderer Stelle importieren kannst."</string>
-  <string name="_Export_a_full_backup_TJfra">"Eine vollständinge Datensicherung exportieren"</string>
-  <string name="Database">"Datenbank"</string>
+  <string name="recTitle">"Mein gesundes Rezept"</string>
+  <string name="recListEmp">"Hier ist nichts! Füge einige Rezepte hinzu und versuche es erneut"</string>
+  <string name="selRec">"Rezept auswählen"</string>
+  <string name="aBtn">"HINZUFÜGEN"</string>
+  <string name="rmLIInfo">"Vorhandene Rezepte sind nicht betroffen"</string>
+  <string name="rmUInfo">"Du bist dabei, die Einheit zu entfernen:"</string>
+  <string name="rmYUInfo">"Du bist dabei, die Ertragseinheit zu entfernen:"</string>
+  <string name="rmCatInfo">"Du bist dabei, die Kategorie zu entfernen:"</string>
+  <string name="rmCuiInfo">"Du bist dabei, die Küche zu entfernen:"</string>
+  <string name="rBtn">"ENTFERNEN"</string>
+  <string name="cBtn">"ABBRECHEN"</string>
+  <string name="srt">"Sortieren nach"</string>
+  <string name="stp">"Schritt"</string>
+  <string name="it">"Element"</string>
+  <string name="aNoBtn">"NOTIZ HINZUFÜGEN"</string>
+  <string name="nos">"Notizen"</string>
+  <string name="no">"Notiz"</string>
+  <string name="addCmbBtn">"KOMBINATION HINZUFÜGEN"</string>
+  <string name="cmbs">"Kombinationen"</string>
+  <string name="cmb">"Kombination"</string>
+  <string name="aStpBtn">"SCHRITT HINZUFÜGEN"</string>
+  <string name="inss">"Zubereitung"</string>
+  <string name="ins">"Zubereitung"</string>
+  <string name="aIngBtn">"ZUTAT HINZUFÜGEN"</string>
+  <string name="ings">"Zutaten"</string>
+  <string name="ing">"Zutat"</string>
+  <string name="yieldU">"Ertragseinheit"</string>
+  <string name="yieldQ">"Ertragsmenge"</string>
+  <string name="cookT">"Kochzeit"</string>
+  <string name="prepT">"Vorbereitungszeit"</string>
+  <string name="cat">"Kategorie"</string>
+  <string name="title">"Titel"</string>
+  <string name="editRec">"Rezept bearbeiten"</string>
+  <string name="newRec">"Neues Rezept"</string>
+  <string name="tgInfo">"für die Meldung von Problemen, Anregungen und Rückmeldung"</string>
+  <string name="joinTG">"Tritt der Telegram-Gruppe bei"</string>
+  <string name="ver">"Version"</string>
+  <string name="impInfo">"Unterstützt vollständige Datensicherungen, die von dieser Anwendung exportiert werden"</string>
+  <string name="impBu">"Daten importieren"</string>
+  <string name="buInfo">"Erzeugt eine ZIP-Datei mit all deinen Daten, die zurück importiert werden können"</string>
+  <string name="expBu">"Vollständinge Datensicherung exportieren"</string>
+  <string name="db">"Datenbank"</string>
   <string name="Dark">"Dunkel"</string>
   <string name="Light">"Hell"</string>
   <string name="Theme">"Thema"</string>
-  <string name="_System_default_Z1jruVS">"System"</string>
-  <string name="_App_language_DzFsk">"Sprache"</string>
-  <string name="Interface">"Benutzeroberfläche"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Solche „später auszuprobieren Rezepte“ konnten nicht gefunden werden."</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Solche Favoriten konnten nicht gefunden werden."</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Solche Rezepte konnte in dieser Kategorie nicht gefunden werden."</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Solche Rezepte konnten nicht gefunden werden."</string>
-  <string name="_No_recipes_found_Z125IxD">"Keine Rezepte gefunden"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Füge Kategorien hinzu, um sie hier zu sehen."</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Markiere Rezepte als Favorit markierst, um sie hier zu sehen."</string>
-  <string name="_No_favourites_yet_aPSoG">"Noch keine Favoriten"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Rezepte, die du später ausprobieren willst, sind hier aufgelistet."</string>
-  <string name="_All_done__72KYl">"Alles fertig!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Verwende das Stift-Symbol, um einige Notizen hinzuzufügen."</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Verwende das Stift-Symbol, um einige Kombinationen hinzuzufügen."</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Verwende das Stift-Symbol, um einige Zubereitungen hinzuzufügen."</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Verwende das Stift-Symbol, um einige Zutaten hinzuzufügen."</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Verwende das Plus-Symbol, um eins hinzuzufügen."</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Beginne deine Rezepte hinzuzufügen!"</string>
+  <string name="sysDef">"Systemstandard"</string>
+  <string name="lang">"Sprache"</string>
+  <string name="intf">"Benutzeroberfläche"</string>
+  <string name="noRecsInFtr">"In den gefilterten Rezepten gibt es keine Rezepte, die deiner Suche entsprechen"</string>
+  <string name="noRecsInFavs">"In der Favoritenliste gibt es keine Rezepte, die deiner Suche entsprechen"</string>
+  <string name="noRecsInTL">"In der Liste Später ausprobieren gibt es keine Rezepte, die deiner Suche entsprechen"</string>
+  <string name="noRecs">"Keine Rezepte passen zu deiner Suche"</string>
+  <string name="fsList">"Deine Lieblingsrezepte findest du hier"</string>
+  <string name="noFavs">"Noch keine Favoriten"</string>
+  <string name="tLInfo">"Rezepte, die du später ausprobieren willst, sind hier aufgelistet"</string>
+  <string name="aD">"Fertig!"</string>
+  <string name="pANo">"Verwende das Stift-Symbol, um einige Notizen hinzuzufügen"</string>
+  <string name="pACmb">"Verwende das Stift-Symbol, um einige Kombinationen hinzuzufügen"</string>
+  <string name="pAIns">"Verwende das Stift-Symbol, um einige Zubereitungen hinzuzufügen"</string>
+  <string name="pAIng">"Verwende den Stift-Symbol, um Zutaten hinzuzufügen"</string>
+  <string name="plsAdd">"Verwende das Plus-Symbol, um eins hinzuzufügen"</string>
+  <string name="strAdd">"Beginne deine Rezepte hinzuzufügen!"</string>
   <string name="large">"groß"</string>
   <string name="medium">"medium"</string>
   <string name="small">"klein"</string>
@@ -413,7 +253,6 @@
   <string name="tbsp">"EL"</string>
   <string name="dsp">"DL"</string>
   <string name="tsp">"TL"</string>
-  <string name="Unit">"Einheit"</string>
   <string name="unit">"Einheit"</string>
   <string name="Loaf">"Laib"</string>
   <string name="Patty">"Pastete"</string>
@@ -458,16 +297,21 @@
   <string name="Appetizers">"Vorspeisen"</string>
   <string name="About">"Über"</string>
   <string name="Settings">"Einstellungen"</string>
-  <string name="Categories">"Kategorien"</string>
-  <string name="_Meal_Planner_2aq4oj">"Essensplaner"</string>
-  <string name="Favourites">"Favoriten"</string>
-  <string name="_Try_Later_If7PG">"Später versuchen"</string>
+  <string name="grocery">"Einkaufsliste"</string>
+  <string name="planner">"Essensplaner"</string>
+  <string name="favourites">"Favoriten"</string>
+  <string name="trylater">"Später ausprobieren"</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>
-  <string name="undo">"Undo"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 3d52a981..3e4d7d02 100644
--- a/app/resources/Android/src/main/res/values-es/strings.xml
+++ b/app/resources/Android/src/main/res/values-es/strings.xml
@@ -1,29 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="_Import_failed_Z1dbs6t">"Error en la importación"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Receta sin título"</string>
-  <string name="_Star_rating_Z11p4Kw">"Valoración por estrellas"</string>
+  <string name="undo">"Deshacer"</string>
+  <string name="trnsl">"Traducir"</string>
+  <string name="SAT">"SAB"</string>
+  <string name="FRI">"VIE"</string>
+  <string name="THU">"JUE"</string>
+  <string name="WED">"MIE"</string>
+  <string name="TUE">"MAR"</string>
+  <string name="MON">"LUN"</string>
+  <string name="SUN">"DOM"</string>
+  <string name="December">"Diciembre"</string>
+  <string name="November">"Noviembre"</string>
+  <string name="October">"Octubre"</string>
+  <string name="September">"Septiembre"</string>
+  <string name="August">"Agosto"</string>
+  <string name="July">"Julio"</string>
+  <string name="June">"Junio"</string>
+  <string name="May">"Mayo"</string>
+  <string name="April">"Abril"</string>
+  <string name="March">"Marzo"</string>
+  <string name="February">"Febrero"</string>
+  <string name="January">"Enero"</string>
+  <string name="trySer">"¿BUSCAR EN TODAS LAS RECETAS?"</string>
+  <string name="help">"Ayuda"</string>
+  <string name="appInfo">"EnRecipes es un libro de cocinas de código abierto, amigo de tu privacidad, que te deja crear, manejar y compartir tus recetas"</string>
+  <string name="donate">"Donar"</string>
+  <string name="invFile">"Archivo invalido"</string>
+  <string name="buSuc">"El backup fue guardado satisfactoriamente en la carpeta Descargas"</string>
+  <string name="buMod">"El archivo de backup fue modificado en alguna parte"</string>
+  <string name="buEmp">"El archivode backup está vacío"</string>
+  <string name="buInc">"Archivo de backup corrupto"</string>
+  <string name="impFail">"Importación fallida"</string>
+  <string name="recRm">"Receta removida"</string>
+  <string name="untRec">"Receta sin título"</string>
+  <string name="stars">"Valoración"</string>
   <string name="Created">"Creado"</string>
-  <string name="_Filtered_result_1AMEXe">"Resultados filtrados"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Recetas filtradas"</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"recetas actualizadas"</string>
-  <string name="_recipes_already_exists_2jqW2s">"la receta ya existe"</string>
-  <string name="_recipes_imported_1NGeRw">"recetas importadas"</string>
-  <string name="_recipes_found_ZDdUgV">"recetas encontradas"</string>
-  <string name="_Import_summary_244SkL">"Resumen de importación"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separar con espacios"</string>
-  <string name="Tags">"Etiquetas"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No hay etiquetas disponibles"</string>
-  <string name="_All_Tags_28gMyY">"Todas las etiquetas"</string>
-  <string name="_All_Categories_Z23JSTS">"Todas las categorías"</string>
+  <string name="recU">"recetas actualizadas"</string>
+  <string name="recE">"recetas existentes"</string>
+  <string name="recI">"recetas importadas"</string>
+  <string name="recF">"recetas encontradas"</string>
+  <string name="impSuc">"Importación satisfactoria"</string>
+  <string name="tsInfo">"separa con espacios"</string>
+  <string name="ts">"Etiquetas"</string>
+  <string name="noTs">"No hay etiquetas disponibles"</string>
+  <string name="allTs">"Todas las etiquetas"</string>
+  <string name="allCats">"Todas las categorías"</string>
   <string name="Vietnamese">"Vietnamita"</string>
   <string name="Turkish">"Turca"</string>
   <string name="Thai">"Thai"</string>
@@ -54,17 +77,12 @@
   <string name="British">"Británica"</string>
   <string name="Brazilian">"Brasileña"</string>
   <string name="American">"Americana"</string>
-  <string name="_All_Cuisines_2hjCp9">"Todas las cocinas"</string>
-  <string name="Cuisines">"Comidas"</string>
-  <string name="Cuisine">"Comida"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Seguro deseas eliminar"</string>
-  <string name="Units">"Unidades"</string>
-  <string name="_Remove_unit__2x26yq">"¿Remover unidad?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"¿Remover unidad de medida?"</string>
-  <string name="_Remove_category__2reaxz">"¿Remover categoría?"</string>
-  <string name="_Remove_cuisine__22ftcL">"¿Remover comida?"</string>
-  <string name="_New_unit_1CVEEA">"Nueva unidad"</string>
-  <string name="_New_cuisine_Zrvs3z">"Nueva comida"</string>
+  <string name="allCuis">"Todas las cocinas"</string>
+  <string name="cuis">"Cocinas"</string>
+  <string name="cui">"Cocinas"</string>
+  <string name="Unit">"Unidad"</string>
+  <string name="newUnit">"Nueva unidad"</string>
+  <string name="newCui">"Nueva cocina"</string>
   <string name="Challenging">"Desafiante"</string>
   <string name="Moderate">"Moderada"</string>
   <string name="Easy">"Fácil"</string>
@@ -75,139 +93,139 @@
   <string name="Rating">"Rating"</string>
   <string name="_Slowest_first_hHjY6">"La más lenta primero"</string>
   <string name="_Quickest_first_Z1CpP7N">"La más rápida primero"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Tu búsqueda no encajó con ninguna receta de los resultados filtrados"</string>
-  <string name="_Recipe_not_found_2qGveM">"Receta no encontrada"</string>
-  <string name="_Reset_successful_YxqWK">"Reseteo satisfactorio"</string>
-  <string name="_Reset_units_list_msRS3">"Resetea el listado de unidades"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Resetea el listado de unidad de medidas"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Resetea el listado de categorías"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Resetea el listado de comidas"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetear un listado NO borrará tus entradas existentes pero restaurará las eliminadas por default."</string>
-  <string name="Reset">"Reiniciar"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Ayuda a decidir que cocinar cuando no sabes que cocinar"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Sacude para ver una receta aleatoria"</string>
-  <string name="Options">"Opciones"</string>
-  <string name="_User_guide_2uDJCF">"Guía de usuario"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Política de privacidad"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Visita en GitHub"</string>
-  <string name="Translator">"Traductor"</string>
-  <string name="Contributors">"Contribuyentes"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Compartido via EnRecipes. Consíguela en Play Store o F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permiso denegado"</string>
-  <string name="_Import_successful_2bLM3e">"Importado satisfactoriamente"</string>
-  <string name="_Verifying____cS102">"Verificando…"</string>
-  <string name="_long_time_ago_1nwlFA">"hace mucho tiempo"</string>
-  <string name="_months_ago_Z1TsskA">"hace meses"</string>
-  <string name="_weeks_ago_Z2sT1GA">"semanas atrás"</string>
-  <string name="_days_ago_2iCYkm">"algunos dias atrás"</string>
+  <string name="resNF">"Receta no encontrada"</string>
+  <string name="restDone">"Reinicio completo"</string>
+  <string name="restInfo">"Reiniciar una lista va a eliminar las entradas creadas por el usuario y restaurar las entradas por default. Las recetas existentes no se verán afectadas."</string>
+  <string name="restUL">"Reiniciar la lista de unidades"</string>
+  <string name="restYUL">"Reiniciar el listado de unidad de medida"</string>
+  <string name="restCatL">"Reiniciar el listado de categorías"</string>
+  <string name="restCuiL">"Reiniciar el listado culinario"</string>
+  <string name="rest">"Reiniciar"</string>
+  <string name="sVwInfo">"Te ayuda a elegir que cocinar cuando no podés decidirte"</string>
+  <string name="sVw">"Agita para ver una receta aleatoria"</string>
+  <string name="opts">"Opciones"</string>
+  <string name="guide">"Guía de usuario"</string>
+  <string name="priv">"Política de privacidad"</string>
+  <string name="gh">"Mira en GitHub"</string>
+  <string name="appCrd">"Compartido vía EnRecipes. Obtenlo en F-Droid, IzzyOnDroid o Play Store."</string>
+  <string name="vrfy">"Verificando"</string>
+  <string name="ltAgo">"hace tiempo"</string>
+  <string name="mAgo">"meses atrás"</string>
+  <string name="wAgo">"semanas atrás"</string>
+  <string name="dAgo">"días atrás"</string>
   <string name="yesterday">"ayer"</string>
   <string name="today">"hoy"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Haz intentado esta receta:"</string>
+  <string name="triedInfo">"Probaste esta receta:"</string>
   <string name="snacks">"bocadillos"</string>
   <string name="dinner">"cena"</string>
   <string name="lunch">"almuerzo"</string>
-  <string name="breakfast">"desayuno"</string>
-  <string name="_Crop_photo_1VL04J">"Recortar foto"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REEMPLAZAR FOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Foto de receta"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requiere el permiso de almacenamiento para colocar la foto de receta."</string>
-  <string name="Required">"Requerido"</string>
-  <string name="_New_category_Weg73">"Nueva categoría"</string>
-  <string name="_New_yield_unit_1Oevd2">"Nueva unidad de medida"</string>
-  <string name="_Remove_note__2wyMVE">"¿Remover nota?"</string>
-  <string name="_Remove_combination__1dr2LS">"¿Remover combinación?"</string>
-  <string name="_Remove_instruction__vkJfi">"¿Remover instrucción?"</string>
-  <string name="_Remove_ingredient__2puvMO">"¿Remover ingrediente?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"CONTINUAR EDITANDO"</string>
-  <string name="DISCARD">"DESCARTAR"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"¿Seguro que quieres descartar los cambios no guardados de esta receta?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Cambios no guardados"</string>
-  <string name="Search">"Buscar"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Seguro que quieres borrar la receta"</string>
-  <string name="DELETE">"BORRAR"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"¿Borrar receta?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Remueve de Intentar luego"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Agrega a Intentar luego"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Remover de favoritos"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Agregar a favoritos"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Agrega al menos una receta para realizar un respaldo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requiere el permiso de almacenamiento para respaldar los datos en este dispositivo"</string>
-  <string name="CONTINUE">"CONTINUAR"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NO AHORA"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requiere el permiso de almacenamiento para importar tus datos de un respaldo previo."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Dar permmiso"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes debe reiniciarse para que el cambio de lenguaje surta efecto."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes debe reiniciarse para que el cambio de tema surta efecto."</string>
-  <string name="RESTART">"REINICIAR"</string>
-  <string name="_Restart_required_Z22YINL">"Reinicio requerido"</string>
+  <string name="breakfast">"Desayuno"</string>
+  <string name="cPic">"Cortar foto"</string>
+  <string name="repBtn">"REEMPLAZAR FOTO"</string>
+  <string name="recPic">"Receta foto"</string>
+  <string name="req">"Requerido"</string>
+  <string name="nwCat">"Nueva categoría"</string>
+  <string name="nwYiU">"Nueva unidad de medida"</string>
+  <string name="rmCmb">"Combinación removida"</string>
+  <string name="rmN">"Nota removida"</string>
+  <string name="rmIns">"Instrucción removida"</string>
+  <string name="rmIng">"Ingrediente removido"</string>
+  <string name="kEdit">"SEGUIR EDITANDO"</string>
+  <string name="disBtn">"DESCARTAR"</string>
+  <string name="disc">"La receta tiene cambios no guardados. ¿Qué te gustaría hacer?"</string>
+  <string name="unsaved">"Cambios no guardados"</string>
+  <string name="ser">"Buscar"</string>
+  <string name="dBtn">"ELIMINAR"</string>
+  <string name="sltd">"seleccionada"</string>
+  <string name="recs">"recetas"</string>
+  <string name="delRecsInfo">"Estás por eliminar permanentemente:"</string>
+  <string name="delRecInfo">"Estás por eliminar para siempre esta receta:"</string>
+  <string name="conf">"Confirmar"</string>
+  <string name="rmTry">"Removida de intentar luego"</string>
+  <string name="aTry">"Agregada a Intentar luego"</string>
+  <string name="unfavd">"Eliminado de Favoritos"</string>
+  <string name="favd">"Añadido a Favoritos"</string>
+  <string name="aFBu">"Añade una receta para hacer una copia de seguridad"</string>
+  <string name="dend">"Acceso denegado"</string>
+  <string name="conBtn">"CONTINUAR"</string>
+  <string name="nNBtn">"AHORA NO"</string>
+  <string name="reqAcc">"EnRecipes requiere permiso para almacenar para establecer fotos de recetas, exportar e importar datos"</string>
+  <string name="grant">"Conceder acceso"</string>
+  <string name="nLangInfo">"Reiniciar EnRecipes para usar el idioma nuevo"</string>
+  <string name="nThmInfo">"Reiniciar EnRecipes para usar el tema nuevo"</string>
+  <string name="rst">"REINICIAR"</string>
+  <string name="appRst">"Se requiere reiniciar la aplicación"</string>
   <string name="SET">"ESTABLECER"</string>
-  <string name="_ADD_NEW_Zv8FjM">"AGREGAR NUEVA"</string>
-  <string name="Share">"Compartir"</string>
-  <string name="Overview">"Resumen"</string>
-  <string name="Recipe">"Receta"</string>
-  <string name="Photo">"Foto"</string>
+  <string name="aNBtn">"AÑADIR NUEVO"</string>
+  <string name="ovw">"Resumen"</string>
+  <string name="fil">"Archivo de la receta"</string>
+  <string name="rec">"Texto de la receta"</string>
+  <string name="pht">"Foto de la receta"</string>
+  <string name="shr">"Compartir"</string>
   <string name="min">"min"</string>
   <string name="hr">"hr"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Mi receta saludable"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"¡Nada por aquí! Agregar algunas recetas e intenta nuevamente."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Elegir una receta"</string>
-  <string name="ADD">"AGREGAR"</string>
-  <string name="REMOVE">"REMOVER"</string>
-  <string name="CANCEL">"CANCELAR"</string>
-  <string name="_Sort_by_Zq01TF">"Ordenada por"</string>
-  <string name="Step">"Paso"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"AGREGAR NOTA"</string>
-  <string name="Notes">"Notas"</string>
-  <string name="Note">"Nota"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"AGREGA COMBINACIÓN"</string>
-  <string name="Combinations">"Combinaciones"</string>
-  <string name="_ADD_STEP_ZyMPOe">"AGREGAR PASO"</string>
-  <string name="Instructions">"Instrucciones"</string>
-  <string name="Instruction">"Instrucción"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"AGREGAR INGREDIENTE"</string>
-  <string name="Ingredients">"Ingredientes"</string>
-  <string name="Ingredient">"Ingrediente"</string>
-  <string name="_Yield_measured_in_2OoRT">"Cantidad medida en"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Cantidad"</string>
-  <string name="_Cooking_time_2w2fEw">"Tiempo de cocción"</string>
-  <string name="_Preparation_time_15BfxT">"Tiempo de preparación"</string>
-  <string name="Category">"Categoria"</string>
-  <string name="Title">"Titulo"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Editar receta"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Nueva receta"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Autor"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"para reportar problemas, sugerencias y devoluciones"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Únete al grupo de Telegram"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Soporta respaldos completos exportados por esta app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Importar de un respaldo"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generar un archivo zip con tus datos. Este puede ser importado nuevamente."</string>
-  <string name="_Export_a_full_backup_TJfra">"Exportar un respaldo completo"</string>
-  <string name="Database">"Base de datos"</string>
+  <string name="recTitle">"Mi Receta Saludable"</string>
+  <string name="recListEmp">"¡Aquí no hay nada! Añade alguna receta y vuelve a intentarlo"</string>
+  <string name="selRec">"Selecciona una receta"</string>
+  <string name="aBtn">"AÑADIR"</string>
+  <string name="rmLIInfo">"Recetas en existencia no se verán afectadas"</string>
+  <string name="rmUInfo">"Vas a eliminar la unidad:"</string>
+  <string name="rmYUInfo">"Estas por eliminar la unidad de medida:"</string>
+  <string name="rmCatInfo">"Vas a eliminar la categoría:"</string>
+  <string name="rmCuiInfo">"Vas a eliminar el plato:"</string>
+  <string name="rBtn">"ELIMINAR"</string>
+  <string name="cBtn">"CANCELAR"</string>
+  <string name="srt">"Ordenar por"</string>
+  <string name="stp">"Paso"</string>
+  <string name="it">"Artículo"</string>
+  <string name="aNoBtn">"AÑADIR NOTA"</string>
+  <string name="nos">"Notas"</string>
+  <string name="no">"Nota"</string>
+  <string name="addCmbBtn">"AÑADIR COMBINACIÓN"</string>
+  <string name="cmbs">"Combinaciones"</string>
+  <string name="cmb">"Combinación"</string>
+  <string name="aStpBtn">"AÑADIR PASO"</string>
+  <string name="inss">"Instrucciones"</string>
+  <string name="ins">"Instrucción"</string>
+  <string name="aIngBtn">"AÑADIR INGREDIENTE"</string>
+  <string name="ings">"Ingredientes"</string>
+  <string name="ing">"Ingrediente"</string>
+  <string name="yieldU">"Unidad de medida"</string>
+  <string name="yieldQ">"Cantidad de rendimiento"</string>
+  <string name="cookT">"Tiempo para cocinar"</string>
+  <string name="prepT">"Tiempo de preparación"</string>
+  <string name="cat">"Categoría"</string>
+  <string name="title">"Título"</string>
+  <string name="editRec">"Editar receta"</string>
+  <string name="newRec">"Nueva receta"</string>
+  <string name="tgInfo">"Para reportar problemas, sugerencias y comentarios"</string>
+  <string name="joinTG">"Únete al grupo de Telegram"</string>
+  <string name="ver">"Versión"</string>
+  <string name="impInfo">"Soporta copias de seguridad completas exportadas por esta aplicación"</string>
+  <string name="impBu">"Importar datos"</string>
+  <string name="buInfo">"Genera un archivo ZIP con todos tus datos que se puede volver a importar"</string>
+  <string name="expBu">"Exportar copia de seguridad completa"</string>
+  <string name="db">"Base de datos"</string>
   <string name="Dark">"Oscuro"</string>
   <string name="Light">"Claro"</string>
   <string name="Theme">"Tema"</string>
-  <string name="_System_default_Z1jruVS">"Default del sistema"</string>
-  <string name="_App_language_DzFsk">"Lenguaje"</string>
-  <string name="Interface">"Interfaz"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Tu búsqueda no concuerda con recetas en tu listado de intentar luego"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Tu búsqueda no concuerda con recetas en tus favoritos"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Tu búsqueda no concuerda con recetas de esta categoría"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Tu búsqueda no concuerda con recetas"</string>
-  <string name="_No_recipes_found_Z125IxD">"No se encontraron recetas"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Categoría vacía"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Las recetas que marques como favoritas serán listadas aquí"</string>
-  <string name="_No_favourites_yet_aPSoG">"No tienes favoritos todavía"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Las recetas que marques como intentar luego serán listadas aquí"</string>
-  <string name="_All_done__72KYl">"¡Listo!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Usa el botón del lapiz para agregar notas"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Usa el botón del lapiz para agregar mezclas"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Usa el boton del lapiz para agregar instrucciones"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Usa el lapiz para agregar ingredientes"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Usa el botón más para agregar una"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"¡Comienza a agregar tus recetas!"</string>
+  <string name="sysDef">"Por defecto del Sistema"</string>
+  <string name="lang">"Idioma"</string>
+  <string name="intf">"Interfaz"</string>
+  <string name="noRecsInFtr">"Ninguna receta coincide con tu búsqueda en las recetas filtradas"</string>
+  <string name="noRecsInFavs">"Ninguna receta coincide con tu búsqueda en la lista de Favoritos"</string>
+  <string name="noRecsInTL">"Ninguna receta coincide con tu búsqueda en la lista de Probar Más Tarde"</string>
+  <string name="noRecs">"No hay recetas que coincidan con tu búsqueda"</string>
+  <string name="fsList">"Aquí se enumeran tus recetas favoritas"</string>
+  <string name="noFavs">"Aún no hay favoritos"</string>
+  <string name="tLInfo">"Las recetas que el usuario quería probar más tarde están listadas aquí"</string>
+  <string name="aD">"¡Listo!"</string>
+  <string name="pANo">"Usa el botón del lápiz para añadir notas"</string>
+  <string name="pACmb">"Usa el botón del lápiz para añadir combinaciones"</string>
+  <string name="pAIns">"Usa el botón del lápiz para añadir instrucciones"</string>
+  <string name="pAIng">"Usa el botón del lápiz para añadir ingredientes"</string>
+  <string name="plsAdd">"Usa el botón + para añadir una"</string>
+  <string name="strAdd">"¡Empieza a añadir tus recetas!"</string>
   <string name="large">"grande"</string>
   <string name="medium">"mediano"</string>
   <string name="small">"pequeño"</string>
@@ -233,9 +251,8 @@
   <string name="cup">"taza"</string>
   <string name="_fl_oz_72kqu">"oz liq"</string>
   <string name="tbsp">"tbsp"</string>
-  <string name="dsp">"dsp"</string>
-  <string name="tsp">"tsp"</string>
-  <string name="Unit">"Unidad"</string>
+  <string name="dsp">"cucharilla"</string>
+  <string name="tsp">"cdt"</string>
   <string name="unit">"unidad"</string>
   <string name="Loaf">"Hogaza"</string>
   <string name="Patty">"Empanada"</string>
@@ -270,7 +287,7 @@
   <string name="_Main_dishes_u6RGQ">"Platos principales"</string>
   <string name="Lunch">"Almuerzo"</string>
   <string name="Healthy">"Saludable"</string>
-  <string name="Drinks">"Drinks"</string>
+  <string name="Drinks">"Bebidas"</string>
   <string name="Dinner">"Cena"</string>
   <string name="Desserts">"Postres"</string>
   <string name="Breakfast">"Desayuno"</string>
@@ -280,194 +297,21 @@
   <string name="Appetizers">"Aperitivos"</string>
   <string name="About">"Acerca de"</string>
   <string name="Settings">"Ajustes"</string>
-  <string name="Categories">"Categorías"</string>
-  <string name="_Meal_Planner_2aq4oj">"Planificador de comida"</string>
-  <string name="Favourites">"Favoritos"</string>
-  <string name="_Try_Later_If7PG">"Probar luego"</string>
+  <string name="grocery">"Lista de la compra"</string>
+  <string name="planner">"Planificador de comidas"</string>
+  <string name="favourites">"Favoritos"</string>
+  <string name="trylater">"Probar luego"</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>
-  <string name="undo">"Undo"</string>
-  <string name="trnsl">"Translate"</string>
-  <string name="SAT">"SAT"</string>
-  <string name="FRI">"FRI"</string>
-  <string name="THU">"THU"</string>
-  <string name="WED">"WED"</string>
-  <string name="TUE">"TUE"</string>
-  <string name="MON">"MON"</string>
-  <string name="SUN">"SUN"</string>
-  <string name="December">"December"</string>
-  <string name="November">"November"</string>
-  <string name="October">"October"</string>
-  <string name="September">"September"</string>
-  <string name="August">"August"</string>
-  <string name="July">"July"</string>
-  <string name="June">"June"</string>
-  <string name="May">"May"</string>
-  <string name="April">"April"</string>
-  <string name="March">"March"</string>
-  <string name="February">"February"</string>
-  <string name="January">"January"</string>
-  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
-  <string name="help">"Help"</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="donate">"Donate"</string>
-  <string name="invFile">"Invalid file"</string>
-  <string name="buSuc">"Backup saved successfully to the Download folder"</string>
-  <string name="buMod">"The backup file was modified elsewhere"</string>
-  <string name="buEmp">"The backup file is empty"</string>
-  <string name="buInc">"Malformed or corrupt backup file"</string>
-  <string name="impFail">"Import failed"</string>
-  <string name="recRm">"Recipe removed"</string>
-  <string name="untRec">"Untitled Recipe"</string>
-  <string name="stars">"Star rating"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
-  <string name="recU">"recipes updated"</string>
-  <string name="recE">"recipes already exists"</string>
-  <string name="recI">"recipes imported"</string>
-  <string name="recF">"recipes found"</string>
-  <string name="impSuc">"Import success"</string>
-  <string name="tsInfo">"separate with spaces"</string>
-  <string name="ts">"Tags"</string>
-  <string name="noTs">"No tags available"</string>
-  <string name="allTs">"All Tags"</string>
-  <string name="allCats">"All Categories"</string>
-  <string name="allCuis">"All Cuisines"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="newUnit">"New unit"</string>
-  <string name="newCui">"New cuisine"</string>
-  <string name="resNF">"Recipe not found"</string>
-  <string name="restDone">"Reset done"</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="restUL">"Reset unit list"</string>
-  <string name="restYUL">"Reset yield unit list"</string>
-  <string name="restCatL">"Reset category list"</string>
-  <string name="restCuiL">"Reset cuisine list"</string>
-  <string name="rest">"Reset"</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="opts">"Options"</string>
-  <string name="guide">"User guide"</string>
-  <string name="priv">"Privacy policy"</string>
-  <string name="gh">"View on GitHub"</string>
-  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
-  <string name="vrfy">"Verifying"</string>
-  <string name="ltAgo">"a long time ago"</string>
-  <string name="mAgo">"months ago"</string>
-  <string name="wAgo">"weeks ago"</string>
-  <string name="dAgo">"days ago"</string>
-  <string name="triedInfo">"You tried this recipe:"</string>
-  <string name="cPic">"Crop photo"</string>
-  <string name="repBtn">"REPLACE PHOTO"</string>
-  <string name="recPic">"Recipe photo"</string>
-  <string name="req">"Required"</string>
-  <string name="nwCat">"New category"</string>
-  <string name="nwYiU">"New yield unit"</string>
-  <string name="rmCmb">"Combination removed"</string>
-  <string name="rmN">"Note removed"</string>
-  <string name="rmIns">"Instruction removed"</string>
-  <string name="rmIng">"Ingredient removed"</string>
-  <string name="kEdit">"KEEP EDITING"</string>
-  <string name="disBtn">"DISCARD"</string>
-  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
-  <string name="unsaved">"Unsaved changes"</string>
-  <string name="ser">"Search"</string>
-  <string name="dBtn">"DELETE"</string>
-  <string name="sltd">"selected"</string>
-  <string name="recs">"recipes"</string>
-  <string name="delRecsInfo">"You are about to permanently delete:"</string>
-  <string name="delRecInfo">"You are about to permanently delete the recipe:"</string>
-  <string name="conf">"Confirm"</string>
-  <string name="rmTry">"Removed from Try Later"</string>
-  <string name="aTry">"Added to Try Later"</string>
-  <string name="unfavd">"Removed from Favourites"</string>
-  <string name="favd">"Added to Favourites"</string>
-  <string name="aFBu">"Add a recipe to perform a backup"</string>
-  <string name="dend">"Access denied"</string>
-  <string name="conBtn">"CONTINUE"</string>
-  <string name="nNBtn">"NOT NOW"</string>
-  <string name="reqAcc">"EnRecipes requires storage permission in order to set recipe photo, export and import data"</string>
-  <string name="grant">"Grant access"</string>
-  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
-  <string name="nThmInfo">"Restart EnRecipes to use the new theme"</string>
-  <string name="rst">"RESTART"</string>
-  <string name="appRst">"App restart required"</string>
-  <string name="aNBtn">"ADD NEW"</string>
-  <string name="ovw">"Overview"</string>
-  <string name="fil">"Recipe as file"</string>
-  <string name="rec">"Recipe as text"</string>
-  <string name="pht">"Recipe photo"</string>
-  <string name="shr">"Share"</string>
-  <string name="recTitle">"My Healthy Recipe"</string>
-  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
-  <string name="selRec">"Select recipe"</string>
-  <string name="aBtn">"ADD"</string>
-  <string name="rmLIInfo">"Existing recipes will not be affected"</string>
-  <string name="rmUInfo">"You are about to remove the unit:"</string>
-  <string name="rmYUInfo">"You are about to remove the yield unit:"</string>
-  <string name="rmCatInfo">"You are about to remove the category:"</string>
-  <string name="rmCuiInfo">"You are about to remove the cuisine:"</string>
-  <string name="rBtn">"REMOVE"</string>
-  <string name="cBtn">"CANCEL"</string>
-  <string name="srt">"Sort by"</string>
-  <string name="stp">"Step"</string>
-  <string name="it">"Item"</string>
-  <string name="aNoBtn">"ADD NOTE"</string>
-  <string name="nos">"Notes"</string>
-  <string name="no">"Note"</string>
-  <string name="addCmbBtn">"ADD COMBINATION"</string>
-  <string name="cmbs">"Combinations"</string>
-  <string name="cmb">"Combination"</string>
-  <string name="aStpBtn">"ADD STEP"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="aIngBtn">"ADD INGREDIENT"</string>
-  <string name="ings">"Ingredients"</string>
-  <string name="ing">"Ingredient"</string>
-  <string name="yieldU">"Yield unit"</string>
-  <string name="yieldQ">"Yield quantity"</string>
-  <string name="cookT">"Cooking time"</string>
-  <string name="prepT">"Preparation time"</string>
-  <string name="cat">"Category"</string>
-  <string name="title">"Title"</string>
-  <string name="editRec">"Edit recipe"</string>
-  <string name="newRec">"New recipe"</string>
-  <string name="tgInfo">"For reporting issues, suggestions and feedback"</string>
-  <string name="joinTG">"Join the Telegram group"</string>
-  <string name="ver">"Version"</string>
-  <string name="impInfo">"Supports full backups exported by this app"</string>
-  <string name="impBu">"Import data"</string>
-  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
-  <string name="expBu">"Export full backup"</string>
-  <string name="db">"Database"</string>
-  <string name="sysDef">"System default"</string>
-  <string name="lang">"Language"</string>
-  <string name="intf">"Interface"</string>
-  <string name="noRecsInFtr">"No recipes match your search in the Filtered recipes"</string>
-  <string name="noRecsInFavs">"No recipes match your search in the Favourites list"</string>
-  <string name="noRecsInTL">"No recipes match your search in the Try Later list"</string>
-  <string name="noRecs">"No recipes match your search"</string>
-  <string name="fsList">"Your favourite recipes are listed here"</string>
-  <string name="noFavs">"No favourites yet"</string>
-  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
-  <string name="aD">"All done!"</string>
-  <string name="pANo">"Use the pencil button to add notes"</string>
-  <string name="pACmb">"Use the pencil button to add combinations"</string>
-  <string name="pAIns">"Use the pencil button to add instructions"</string>
-  <string name="pAIng">"Use the pencil button to add ingredients"</string>
-  <string name="plsAdd">"Use the plus button to add one"</string>
-  <string name="strAdd">"Start adding your recipes!"</string>
-  <string name="grocery">"Grocery List"</string>
-  <string name="planner">"Meal Planner"</string>
-  <string name="favourites">"Favourites"</string>
-  <string name="trylater">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 58f3abee..ce59fd42 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,210 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Annuler"</string>
   <string name="trnsl">"Traduire"</string>
-  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement :"</string>
-  <string name="recs">"recettes"</string>
-  <string name="sltd">"sélectionné"</string>
-  <string name="January">"janvier"</string>
-  <string name="February">"février"</string>
-  <string name="March">"mars"</string>
-  <string name="April">"avril"</string>
-  <string name="May">"mai"</string>
-  <string name="June">"juin"</string>
-  <string name="July">"juillet"</string>
-  <string name="August">"aout"</string>
-  <string name="September">"septembre"</string>
-  <string name="October">"octobre"</string>
-  <string name="November">"novembre"</string>
-  <string name="December">"décembre"</string>
-  <string name="SUN">"dim"</string>
-  <string name="MON">"lun"</string>
-  <string name="TUE">"mar"</string>
-  <string name="WED">"mer"</string>
-  <string name="THU">"jeu"</string>
-  <string name="FRI">"ven"</string>
   <string name="SAT">"sam"</string>
-  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
-  <string name="fil">"Recette comme fichier"</string>
-  <string name="trylater">"Essayer plus tard"</string>
-  <string name="favourites">"Favoris"</string>
-  <string name="planner">"Organisateur de repas"</string>
-  <string name="grocery">"Liste de courses"</string>
-  <string name="strAdd">"Commencez à ajouter vos recettes !"</string>
-  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
-  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
-  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
-  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
-  <string name="aD">"Terminé !"</string>
-  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
-  <string name="noFavs">"Pas encore de favoris"</string>
-  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
-  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
-  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
-  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
-  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
-  <string name="intf">"Interface"</string>
-  <string name="lang">"Langue"</string>
-  <string name="sysDef">"Selon le système"</string>
-  <string name="db">"Base de données"</string>
-  <string name="expBu">"Exporter une sauvegarde complète"</string>
-  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
-  <string name="impBu">"Importer les données"</string>
-  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
-  <string name="ver">"Version"</string>
-  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
-  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
-  <string name="newRec">"Nouvelle recette"</string>
-  <string name="editRec">"Modifier la recette"</string>
-  <string name="title">"Titre"</string>
-  <string name="cat">"Catégorie"</string>
-  <string name="prepT">"Temps de préparation"</string>
-  <string name="cookT">"Temps de cuisson"</string>
-  <string name="yieldQ">"Quantité de rendement"</string>
-  <string name="yieldU">"Unité de rendement"</string>
-  <string name="ing">"Ingrédient"</string>
-  <string name="ings">"Ingrédients"</string>
-  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
-  <string name="cmb">"Combinaison"</string>
-  <string name="cmbs">"Combinaisons"</string>
-  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
-  <string name="no">"Note"</string>
-  <string name="nos">"Notes"</string>
-  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
-  <string name="it">"Élément"</string>
-  <string name="stp">"Étape"</string>
-  <string name="srt">"Trier par"</string>
-  <string name="cBtn">"ANNULER"</string>
-  <string name="rBtn">"RETIRER"</string>
-  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine :"</string>
-  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie :"</string>
-  <string name="rmYUInfo">"Vous êtes sur le point de retirer l’unité de rendement :"</string>
-  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité :"</string>
-  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
-  <string name="aBtn">"AJOUTER"</string>
-  <string name="selRec">"Sélectionner une recette"</string>
-  <string name="recListEmp">"Rien ici ! Ajoutez quelques recettes et réessayez"</string>
-  <string name="recTitle">"Ma recette saine"</string>
-  <string name="pht">"Photo de recette"</string>
-  <string name="rec">"Recette comme texte"</string>
-  <string name="ovw">"Aperçu"</string>
-  <string name="shr">"Partager"</string>
-  <string name="aNBtn">"AJOUTER"</string>
-  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
-  <string name="rst">"REDÉMARRER"</string>
-  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
-  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
-  <string name="grant">"Accorder l’accès"</string>
-  <string name="expReq">"Une autorisation de stockage est requise pour exporter une sauvegarde."</string>
-  <string name="impReq">"Une autorisation de stockage est requise pour importer des données."</string>
-  <string name="phtReq">"Une autorisation de stockage est requise pour définir une photo de recette."</string>
-  <string name="nNBtn">"PAS MAINTENANT"</string>
-  <string name="conBtn">"CONTINUER"</string>
-  <string name="dend">"Accès refusé"</string>
-  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
-  <string name="favd">"Ajouté aux Favoris"</string>
-  <string name="unfavd">"Retiré des Favoris"</string>
-  <string name="aTry">"Ajouté à Essayer plus tard"</string>
-  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
-  <string name="conf">"Confirmer"</string>
-  <string name="delRec">"Confirmation de suppression"</string>
-  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette :"</string>
-  <string name="dBtn">"SUPPRIMER"</string>
-  <string name="ser">"Chercher"</string>
-  <string name="unsaved">"Modifications non enregistrées"</string>
-  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire ?"</string>
-  <string name="disBtn">"IGNORER"</string>
-  <string name="kEdit">"CONTINUER"</string>
-  <string name="rmIng">"Ingrédient retiré"</string>
-  <string name="rmIns">"Instruction retirée"</string>
-  <string name="rmN">"Note retirée"</string>
-  <string name="rmCmb">"Combinaison retirée"</string>
-  <string name="nwYiU">"Nouvelle unité de rendement"</string>
-  <string name="nwCat">"Nouvelle catégorie"</string>
-  <string name="req">"Obligatoire"</string>
-  <string name="recPic">"Photo de recette"</string>
-  <string name="repBtn">"REMPLACER LA PHOTO"</string>
-  <string name="cPic">"Recadrer la photo"</string>
-  <string name="triedInfo">"Vous avez essayé cette recette :"</string>
-  <string name="dAgo">"jours de ça"</string>
-  <string name="wAgo">"semaines de ça"</string>
-  <string name="mAgo">"mois de ça"</string>
-  <string name="ltAgo">"il y a longtemps"</string>
-  <string name="vrfy">"Vérification"</string>
-  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
-  <string name="gh">"Voir sur GitHub"</string>
-  <string name="priv">"Politique de confidentialité"</string>
-  <string name="guide">"Guide d’utilisation"</string>
-  <string name="opts">"Options"</string>
-  <string name="sVw">"Secouez pour voir une recette au hasard"</string>
-  <string name="sVwInfo">"Vous aide à choisir quoi cuisiner quand vous ne pouvez pas vous décider"</string>
-  <string name="rest">"Réinitialiser"</string>
-  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
-  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
-  <string name="restYUL">"Réinitialiser la liste des unités de rendement"</string>
-  <string name="restUL">"Réinitialiser la liste des unités"</string>
-  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
-  <string name="restDone">"Réinitialisation terminée"</string>
-  <string name="resNF">"Recette introuvable"</string>
-  <string name="newCui">"Nouvelle cuisine"</string>
-  <string name="newUnit">"Nouvelle unité"</string>
-  <string name="Unit">"Unité"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="allCuis">"Toutes les cuisines"</string>
-  <string name="allCats">"Toutes les catégories"</string>
-  <string name="allTs">"Toutes les étiquettes"</string>
-  <string name="noTs">"Aucune étiquette disponible"</string>
-  <string name="ts">"Étiquettes"</string>
-  <string name="tsInfo">"séparez par des espaces"</string>
-  <string name="impSuc">"Importation réussie"</string>
-  <string name="recF">"recettes trouvées"</string>
-  <string name="recI">"recettes importées"</string>
-  <string name="recE">"recettes existent déjà"</string>
-  <string name="recU">"recettes mises à jour"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
-  <string name="stars">"Évaluation étoilée"</string>
-  <string name="untRec">"Recette sans titre"</string>
-  <string name="recRm">"Recette supprimée"</string>
-  <string name="impFail">"L’importation a échoué"</string>
-  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
-  <string name="buEmp">"La sauvegarde est vide"</string>
-  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
-  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
-  <string name="invFile">"Fichier invalide"</string>
-  <string name="donate">"Faire un don"</string>
-  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
-  <string name="help">"Aide"</string>
+  <string name="FRI">"ven"</string>
+  <string name="THU">"jeu"</string>
+  <string name="WED">"mer"</string>
+  <string name="TUE">"mar"</string>
+  <string name="MON">"lun"</string>
+  <string name="SUN">"dim"</string>
+  <string name="December">"décembre"</string>
+  <string name="November">"novembre"</string>
+  <string name="October">"octobre"</string>
+  <string name="September">"septembre"</string>
+  <string name="August">"aout"</string>
+  <string name="July">"juillet"</string>
+  <string name="June">"juin"</string>
+  <string name="May">"mai"</string>
+  <string name="April">"avril"</string>
+  <string name="March">"mars"</string>
+  <string name="February">"février"</string>
+  <string name="January">"janvier"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES ?"</string>
-  <string name="Donate">""</string>
-  <string name="Combination">""</string>
-  <string name="_Invalid_file__Z2bRAst">""</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">""</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">""</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">""</string>
-  <string name="_Import_failed_Z1dbs6t">""</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">""</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">""</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">""</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">""</string>
-  <string name="_Untitled_Recipe_Zv0UxP">""</string>
-  <string name="_Star_rating_Z11p4Kw">""</string>
+  <string name="help">"Aide"</string>
+  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
+  <string name="donate">"Faire un don"</string>
+  <string name="invFile">"Fichier invalide"</string>
+  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
+  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
+  <string name="buEmp">"La sauvegarde est vide"</string>
+  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
+  <string name="impFail">"L’importation a échoué"</string>
+  <string name="recRm">"Recette supprimée"</string>
+  <string name="untRec">"Recette sans titre"</string>
+  <string name="stars">"Évaluation étoilée"</string>
   <string name="Created">"Créé le"</string>
-  <string name="_Filtered_result_1AMEXe">""</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">""</string>
-  <string name="_recipes_already_exists_2jqW2s">""</string>
-  <string name="_recipes_imported_1NGeRw">""</string>
-  <string name="_recipes_found_ZDdUgV">""</string>
-  <string name="_Import_summary_244SkL">""</string>
-  <string name="_separate_with_spaces_ZHKOfw">""</string>
-  <string name="Tags">""</string>
-  <string name="_No_tags_available_Z1C5GqD">""</string>
-  <string name="_All_Tags_28gMyY">""</string>
-  <string name="_All_Categories_Z23JSTS">""</string>
+  <string name="recU">"recettes mises à jour"</string>
+  <string name="recE">"recettes existent déjà"</string>
+  <string name="recI">"recettes importées"</string>
+  <string name="recF">"recettes trouvées"</string>
+  <string name="impSuc">"Importation réussie"</string>
+  <string name="tsInfo">"séparez par des espaces"</string>
+  <string name="ts">"Étiquettes"</string>
+  <string name="noTs">"Aucune étiquette disponible"</string>
+  <string name="allTs">"Toutes les étiquettes"</string>
+  <string name="allCats">"Toutes les catégories"</string>
   <string name="Vietnamese">"vietnamienne"</string>
   <string name="Turkish">"turque"</string>
   <string name="Thai">"thaïlandaise"</string>
@@ -235,17 +77,12 @@
   <string name="British">"britannique"</string>
   <string name="Brazilian">"brésilienne"</string>
   <string name="American">"états-unienne"</string>
-  <string name="_All_Cuisines_2hjCp9">""</string>
-  <string name="Cuisines">""</string>
-  <string name="Cuisine">""</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">""</string>
-  <string name="Units">""</string>
-  <string name="_Remove_unit__2x26yq">""</string>
-  <string name="_Remove_yield_unit__Z1duBWR">""</string>
-  <string name="_Remove_category__2reaxz">""</string>
-  <string name="_Remove_cuisine__22ftcL">""</string>
-  <string name="_New_unit_1CVEEA">""</string>
-  <string name="_New_cuisine_Zrvs3z">""</string>
+  <string name="allCuis">"Toutes les cuisines"</string>
+  <string name="cuis">"Cuisines"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Unit">"Unité"</string>
+  <string name="newUnit">"Nouvelle unité"</string>
+  <string name="newCui">"Nouvelle cuisine"</string>
   <string name="Challenging">"Difficile"</string>
   <string name="Moderate">"Modéré"</string>
   <string name="Easy">"Facile"</string>
@@ -256,139 +93,139 @@
   <string name="Rating">"Évaluation"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
   <string name="_Quickest_first_Z1CpP7N">"La plus rapide d’abord"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">""</string>
-  <string name="_Recipe_not_found_2qGveM">""</string>
-  <string name="_Reset_successful_YxqWK">""</string>
-  <string name="_Reset_units_list_msRS3">""</string>
-  <string name="_Reset_yield_units_list_ZjouMk">""</string>
-  <string name="_Reset_categories_list_Z1JmKra">""</string>
-  <string name="_Reset_cuisines_list_1kWL8I">""</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">""</string>
-  <string name="Reset">""</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">""</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">""</string>
-  <string name="Options">""</string>
-  <string name="_User_guide_2uDJCF">""</string>
-  <string name="_Privacy_policy_Zb4ht5">""</string>
-  <string name="_View_on_GitHub_Z2qOqmx">""</string>
-  <string name="Translator">""</string>
-  <string name="Contributors">""</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">""</string>
-  <string name="_Permission_denied_Z7wlWK">""</string>
-  <string name="_Import_successful_2bLM3e">""</string>
-  <string name="_Verifying____cS102">""</string>
-  <string name="_long_time_ago_1nwlFA">""</string>
-  <string name="_months_ago_Z1TsskA">""</string>
-  <string name="_weeks_ago_Z2sT1GA">""</string>
-  <string name="_days_ago_2iCYkm">""</string>
+  <string name="resNF">"Recette introuvable"</string>
+  <string name="restDone">"Réinitialisation terminée"</string>
+  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
+  <string name="restUL">"Réinitialiser la liste des unités"</string>
+  <string name="restYUL">"Réinitialiser la liste des unités de rendement"</string>
+  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
+  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
+  <string name="rest">"Réinitialiser"</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="opts">"Options"</string>
+  <string name="guide">"Guide d’utilisation"</string>
+  <string name="priv">"Politique de confidentialité"</string>
+  <string name="gh">"Voir sur GitHub"</string>
+  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
+  <string name="vrfy">"Vérification"</string>
+  <string name="ltAgo">"il y a longtemps"</string>
+  <string name="mAgo">"mois de ça"</string>
+  <string name="wAgo">"semaines de ça"</string>
+  <string name="dAgo">"jours de ça"</string>
   <string name="yesterday">"hier"</string>
   <string name="today">"aujourd’hui"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">""</string>
+  <string name="triedInfo">"Vous avez essayé cette recette :"</string>
   <string name="snacks">"en-cas"</string>
   <string name="dinner">"souper"</string>
   <string name="lunch">"diner"</string>
   <string name="breakfast">"Déjeuner"</string>
-  <string name="_Crop_photo_1VL04J">""</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">""</string>
-  <string name="_Recipe_photo_eqm9B">""</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">""</string>
-  <string name="Required">""</string>
-  <string name="_New_category_Weg73">""</string>
-  <string name="_New_yield_unit_1Oevd2">""</string>
-  <string name="_Remove_note__2wyMVE">""</string>
-  <string name="_Remove_combination__1dr2LS">""</string>
-  <string name="_Remove_instruction__vkJfi">""</string>
-  <string name="_Remove_ingredient__2puvMO">""</string>
-  <string name="_KEEP_EDITING_1o9uy3">""</string>
-  <string name="DISCARD">""</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">""</string>
-  <string name="_Unsaved_changes_9fqb4">""</string>
-  <string name="Search">""</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">""</string>
-  <string name="DELETE">""</string>
-  <string name="_Delete_recipe__Z2tMYtE">""</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">""</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">""</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">""</string>
-  <string name="_Added_to_Favourites_2mzllO">""</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">""</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">""</string>
-  <string name="CONTINUE">""</string>
-  <string name="_NOT_NOW_Z1HD7qX">""</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">""</string>
-  <string name="_Grant_permission_Z1UQBuh">""</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">""</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">""</string>
-  <string name="RESTART">""</string>
-  <string name="_Restart_required_Z22YINL">""</string>
+  <string name="cPic">"Recadrer la photo"</string>
+  <string name="repBtn">"REMPLACER LA PHOTO"</string>
+  <string name="recPic">"Photo de recette"</string>
+  <string name="req">"Obligatoire"</string>
+  <string name="nwCat">"Nouvelle catégorie"</string>
+  <string name="nwYiU">"Nouvelle unité de rendement"</string>
+  <string name="rmCmb">"Combinaison retirée"</string>
+  <string name="rmN">"Note retirée"</string>
+  <string name="rmIns">"Instruction retirée"</string>
+  <string name="rmIng">"Ingrédient retiré"</string>
+  <string name="kEdit">"CONTINUER"</string>
+  <string name="disBtn">"IGNORER"</string>
+  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire ?"</string>
+  <string name="unsaved">"Modifications non enregistrées"</string>
+  <string name="ser">"Chercher"</string>
+  <string name="dBtn">"SUPPRIMER"</string>
+  <string name="sltd">"sélectionné"</string>
+  <string name="recs">"recettes"</string>
+  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement :"</string>
+  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette :"</string>
+  <string name="conf">"Confirmer"</string>
+  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
+  <string name="aTry">"Ajouté à Essayer plus tard"</string>
+  <string name="unfavd">"Retiré des Favoris"</string>
+  <string name="favd">"Ajouté aux Favoris"</string>
+  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
+  <string name="dend">"Accès refusé"</string>
+  <string name="conBtn">"CONTINUER"</string>
+  <string name="nNBtn">"PAS MAINTENANT"</string>
+  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
+  <string name="grant">"Accorder l’accès"</string>
+  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
+  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
+  <string name="rst">"REDÉMARRER"</string>
+  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
   <string name="SET">"DÉFINIR"</string>
-  <string name="_ADD_NEW_Zv8FjM">""</string>
-  <string name="Share">""</string>
-  <string name="Overview">""</string>
-  <string name="Recipe">""</string>
-  <string name="Photo">""</string>
+  <string name="aNBtn">"AJOUTER"</string>
+  <string name="ovw">"Aperçu"</string>
+  <string name="fil">"Recette comme fichier"</string>
+  <string name="rec">"Recette comme texte"</string>
+  <string name="pht">"Photo de recette"</string>
+  <string name="shr">"Partager"</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">""</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">""</string>
-  <string name="_Select_a_recipe_2lL8x2">""</string>
-  <string name="ADD">""</string>
-  <string name="REMOVE">""</string>
-  <string name="CANCEL">""</string>
-  <string name="_Sort_by_Zq01TF">""</string>
-  <string name="Step">""</string>
-  <string name="Item">""</string>
-  <string name="_ADD_NOTE_ZyNw1r">""</string>
-  <string name="Notes">""</string>
-  <string name="Note">""</string>
-  <string name="_ADD_COMBINATION_2q9HWq">""</string>
-  <string name="Combinations">""</string>
-  <string name="_ADD_STEP_ZyMPOe">""</string>
-  <string name="Instructions">""</string>
-  <string name="Instruction">""</string>
-  <string name="_ADD_INGREDIENT_29sSLU">""</string>
-  <string name="Ingredients">""</string>
-  <string name="Ingredient">""</string>
-  <string name="_Yield_measured_in_2OoRT">""</string>
-  <string name="_Yield_quantity_ZHx3jw">""</string>
-  <string name="_Cooking_time_2w2fEw">""</string>
-  <string name="_Preparation_time_15BfxT">""</string>
-  <string name="Category">""</string>
-  <string name="Title">""</string>
-  <string name="_Edit_recipe_ZPvwDP">""</string>
-  <string name="_New_recipe_Z1Y2YKJ">""</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">""</string>
-  <string name="Author">""</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">""</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">""</string>
-  <string name="Version">""</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">""</string>
-  <string name="_Import_from_backup_Z28HsC0">""</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">""</string>
-  <string name="_Export_a_full_backup_TJfra">""</string>
-  <string name="Database">""</string>
+  <string name="recTitle">"Ma recette saine"</string>
+  <string name="recListEmp">"Rien ici ! Ajoutez quelques recettes et réessayez"</string>
+  <string name="selRec">"Sélectionner une recette"</string>
+  <string name="aBtn">"AJOUTER"</string>
+  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
+  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité :"</string>
+  <string name="rmYUInfo">"Vous êtes sur le point de retirer l’unité de rendement :"</string>
+  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie :"</string>
+  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine :"</string>
+  <string name="rBtn">"RETIRER"</string>
+  <string name="cBtn">"ANNULER"</string>
+  <string name="srt">"Trier par"</string>
+  <string name="stp">"Étape"</string>
+  <string name="it">"Élément"</string>
+  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
+  <string name="nos">"Notes"</string>
+  <string name="no">"Note"</string>
+  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
+  <string name="cmbs">"Combinaisons"</string>
+  <string name="cmb">"Combinaison"</string>
+  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ins">"Instruction"</string>
+  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
+  <string name="ings">"Ingrédients"</string>
+  <string name="ing">"Ingrédient"</string>
+  <string name="yieldU">"Unité de rendement"</string>
+  <string name="yieldQ">"Quantité de rendement"</string>
+  <string name="cookT">"Temps de cuisson"</string>
+  <string name="prepT">"Temps de préparation"</string>
+  <string name="cat">"Catégorie"</string>
+  <string name="title">"Titre"</string>
+  <string name="editRec">"Modifier la recette"</string>
+  <string name="newRec">"Nouvelle recette"</string>
+  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
+  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
+  <string name="ver">"Version"</string>
+  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
+  <string name="impBu">"Importer les données"</string>
+  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
+  <string name="expBu">"Exporter une sauvegarde complète"</string>
+  <string name="db">"Base de données"</string>
   <string name="Dark">"Sombre"</string>
   <string name="Light">"Clair"</string>
   <string name="Theme">"Thème"</string>
-  <string name="_System_default_Z1jruVS">""</string>
-  <string name="_App_language_DzFsk">""</string>
-  <string name="Interface">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">""</string>
-  <string name="_No_recipes_found_Z125IxD">""</string>
-  <string name="_Category_looks_empty_ZAK5qU">""</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">""</string>
-  <string name="_No_favourites_yet_aPSoG">""</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">""</string>
-  <string name="_All_done__72KYl">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">""</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">""</string>
-  <string name="_Start_adding_your_recipes__rwnVV">""</string>
+  <string name="sysDef">"Selon le système"</string>
+  <string name="lang">"Langue"</string>
+  <string name="intf">"Interface"</string>
+  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
+  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
+  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
+  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
+  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
+  <string name="noFavs">"Pas encore de favoris"</string>
+  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
+  <string name="aD">"Terminé !"</string>
+  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
+  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
+  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
+  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
+  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
+  <string name="strAdd">"Commencez à ajouter vos recettes !"</string>
   <string name="large">"grand"</string>
   <string name="medium">"moyen"</string>
   <string name="small">"petit"</string>
@@ -460,14 +297,21 @@
   <string name="Appetizers">"Hors-d’œuvre"</string>
   <string name="About">"À propos"</string>
   <string name="Settings">"Paramètres"</string>
-  <string name="Categories">""</string>
-  <string name="_Meal_Planner_2aq4oj">""</string>
-  <string name="Favourites">""</string>
-  <string name="_Try_Later_If7PG">""</string>
+  <string name="grocery">"Liste de courses"</string>
+  <string name="planner">"Organisateur de repas"</string>
+  <string name="favourites">"Favoris"</string>
+  <string name="trylater">"Essayer plus tard"</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</string>
-  <string name="undo">"Undo"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 79325b91..6e47b0e2 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,209 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Annuler"</string>
   <string name="trnsl">"Traduire"</string>
-  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement :"</string>
-  <string name="recs">"recettes"</string>
-  <string name="sltd">"sélectionné"</string>
-  <string name="January">"janvier"</string>
-  <string name="February">"février"</string>
-  <string name="March">"mars"</string>
-  <string name="April">"avril"</string>
-  <string name="May">"mai"</string>
-  <string name="June">"juin"</string>
-  <string name="July">"juillet"</string>
-  <string name="August">"août"</string>
-  <string name="September">"septembre"</string>
-  <string name="October">"octobre"</string>
-  <string name="November">"novembre"</string>
-  <string name="December">"décembre"</string>
-  <string name="SUN">"dim"</string>
-  <string name="MON">"lun"</string>
-  <string name="TUE">"mar"</string>
-  <string name="WED">"mer"</string>
-  <string name="THU">"jeu"</string>
-  <string name="FRI">"ven"</string>
   <string name="SAT">"sam"</string>
-  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
-  <string name="fil">"Recette comme fichier"</string>
-  <string name="trylater">"Essayer plus tard"</string>
-  <string name="favourites">"Favoris"</string>
-  <string name="planner">"Organisateur de repas"</string>
-  <string name="grocery">"Liste de courses"</string>
-  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
-  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
-  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
-  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
-  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
-  <string name="noFavs">"Pas encore de favoris"</string>
-  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
-  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
-  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
-  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
-  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
-  <string name="intf">"Interface"</string>
-  <string name="lang">"Langue"</string>
-  <string name="sysDef">"Selon le système"</string>
-  <string name="db">"Base de données"</string>
-  <string name="expBu">"Exporter une sauvegarde complète"</string>
-  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
-  <string name="impBu">"Importer les données"</string>
-  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
-  <string name="ver">"Version"</string>
-  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
-  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
-  <string name="newRec">"Nouvelle recette"</string>
-  <string name="editRec">"Modifier la recette"</string>
-  <string name="title">"Titre"</string>
-  <string name="cat">"Catégorie"</string>
-  <string name="prepT">"Temps de préparation"</string>
-  <string name="cookT">"Temps de cuisson"</string>
-  <string name="yieldQ">"Quantité de rendement"</string>
-  <string name="yieldU">"Unité de rendement"</string>
-  <string name="ing">"Ingrédient"</string>
-  <string name="ings">"Ingrédients"</string>
-  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
-  <string name="cmb">"Combinaison"</string>
-  <string name="cmbs">"Combinaisons"</string>
-  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
-  <string name="no">"Note"</string>
-  <string name="nos">"Notes"</string>
-  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
-  <string name="it">"Élément"</string>
-  <string name="stp">"Étape"</string>
-  <string name="srt">"Trier par"</string>
-  <string name="cBtn">"ANNULER"</string>
-  <string name="rBtn">"RETIRER"</string>
-  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine :"</string>
-  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie :"</string>
-  <string name="rmYUInfo">"Vous êtes sur le point de retirer l’unité de rendement :"</string>
-  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité :"</string>
-  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
-  <string name="aBtn">"AJOUTER"</string>
-  <string name="selRec">"Sélectionner une recette"</string>
-  <string name="recTitle">"Ma recette saine"</string>
-  <string name="pht">"Photo de recette"</string>
-  <string name="rec">"Recette comme texte"</string>
-  <string name="ovw">"Aperçu"</string>
-  <string name="shr">"Partager"</string>
-  <string name="aNBtn">"AJOUTER"</string>
-  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
-  <string name="rst">"REDÉMARRER"</string>
-  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
-  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
-  <string name="grant">"Accorder l’accès"</string>
-  <string name="expReq">"Une autorisation de stockage est requise pour exporter une sauvegarde."</string>
-  <string name="impReq">"Une autorisation de stockage est requise pour importer des données."</string>
-  <string name="phtReq">"Une autorisation de stockage est requise pour définir une photo de recette."</string>
-  <string name="nNBtn">"PAS MAINTENANT"</string>
-  <string name="conBtn">"CONTINUER"</string>
-  <string name="dend">"Accès refusé"</string>
-  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
-  <string name="favd">"Ajouté aux Favoris"</string>
-  <string name="unfavd">"Retiré des Favoris"</string>
-  <string name="aTry">"Ajouté à Essayer plus tard"</string>
-  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
-  <string name="conf">"Confirmer"</string>
-  <string name="delRec">"Confirmation de suppression"</string>
-  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette :"</string>
-  <string name="dBtn">"SUPPRIMER"</string>
-  <string name="ser">"Chercher"</string>
-  <string name="unsaved">"Modifications non enregistrées"</string>
-  <string name="disBtn">"IGNORER"</string>
-  <string name="kEdit">"CONTINUER"</string>
-  <string name="rmIng">"Ingrédient retiré"</string>
-  <string name="rmIns">"Instruction retirée"</string>
-  <string name="rmN">"Note retirée"</string>
-  <string name="rmCmb">"Combinaison retirée"</string>
-  <string name="nwYiU">"Nouvelle unité de rendement"</string>
-  <string name="nwCat">"Nouvelle catégorie"</string>
-  <string name="req">"Obligatoire"</string>
-  <string name="recPic">"Photo de recette"</string>
-  <string name="repBtn">"REMPLACER LA PHOTO"</string>
-  <string name="cPic">"Recadrer la photo"</string>
-  <string name="triedInfo">"Vous avez essayé cette recette :"</string>
-  <string name="dAgo">"jours de ça"</string>
-  <string name="wAgo">"semaines de ça"</string>
-  <string name="mAgo">"mois de ça"</string>
-  <string name="ltAgo">"il y a longtemps"</string>
-  <string name="vrfy">"Vérification"</string>
-  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
-  <string name="gh">"Voir sur GitHub"</string>
-  <string name="priv">"Politique de confidentialité"</string>
-  <string name="guide">"Guide d’utilisation"</string>
-  <string name="opts">"Options"</string>
-  <string name="sVw">"Secouez pour voir une recette au hasard"</string>
-  <string name="sVwInfo">"Vous aide à choisir quoi cuisiner quand vous ne pouvez pas vous décider"</string>
-  <string name="rest">"Réinitialiser"</string>
-  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
-  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
-  <string name="restYUL">"Réinitialiser la liste des unités de rendement"</string>
-  <string name="restUL">"Réinitialiser la liste des unités"</string>
-  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
-  <string name="restDone">"Réinitialisation terminée"</string>
-  <string name="resNF">"Recette introuvable"</string>
-  <string name="newCui">"Nouvelle cuisine"</string>
-  <string name="newUnit">"Nouvelle unité"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="allCuis">"Toutes les cuisines"</string>
-  <string name="allCats">"Toutes les catégories"</string>
-  <string name="allTs">"Toutes les étiquettes"</string>
-  <string name="noTs">"Aucune étiquette disponible"</string>
-  <string name="ts">"Étiquettes"</string>
-  <string name="tsInfo">"séparez par des espaces"</string>
-  <string name="impSuc">"Importation réussie"</string>
-  <string name="recF">"recettes trouvées"</string>
-  <string name="recI">"recettes importées"</string>
-  <string name="recE">"recettes existent déjà"</string>
-  <string name="recU">"recettes mises à jour"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
-  <string name="stars">"Évaluation étoilée"</string>
-  <string name="untRec">"Recette sans titre"</string>
-  <string name="recRm">"Recette supprimée"</string>
-  <string name="impFail">"L’importation a échoué"</string>
-  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
-  <string name="buEmp">"La sauvegarde est vide"</string>
-  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
-  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
-  <string name="invFile">"Fichier invalide"</string>
-  <string name="donate">"Faire un don"</string>
-  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
-  <string name="help">"Aide"</string>
-  <string name="strAdd">"Commencez à ajouter vos recettes!"</string>
-  <string name="aD">"Terminé!"</string>
-  <string name="recListEmp">"Rien ici! Ajoutez quelques recettes et réessayez"</string>
-  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire?"</string>
+  <string name="FRI">"ven"</string>
+  <string name="THU">"jeu"</string>
+  <string name="WED">"mer"</string>
+  <string name="TUE">"mar"</string>
+  <string name="MON">"lun"</string>
+  <string name="SUN">"dim"</string>
+  <string name="December">"décembre"</string>
+  <string name="November">"novembre"</string>
+  <string name="October">"octobre"</string>
+  <string name="September">"septembre"</string>
+  <string name="August">"août"</string>
+  <string name="July">"juillet"</string>
+  <string name="June">"juin"</string>
+  <string name="May">"mai"</string>
+  <string name="April">"avril"</string>
+  <string name="March">"mars"</string>
+  <string name="February">"février"</string>
+  <string name="January">"janvier"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES?"</string>
-  <string name="Combination">"Combinaison"</string>
-  <string name="Donate">"Faire un don"</string>
-  <string name="_Invalid_file__Z2bRAst">"Fichier invalide :"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Fichier de sauvegarde modifié ailleurs."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"La sauvegarde est vide."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Fichier de sauvegarde malformé ou corrompu."</string>
-  <string name="_Import_failed_Z1dbs6t">"L’importation a échoué"</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Retirer la recette des en-cas?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Retirer la recette du souper?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Retirer la recette du dîner?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Retirer la recette du déjeuner?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Recette sans titre"</string>
-  <string name="_Star_rating_Z11p4Kw">"Évaluation étoilée"</string>
+  <string name="help">"Aide"</string>
+  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
+  <string name="donate">"Faire un don"</string>
+  <string name="invFile">"Fichier invalide"</string>
+  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
+  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
+  <string name="buEmp">"La sauvegarde est vide"</string>
+  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
+  <string name="impFail">"L’importation a échoué"</string>
+  <string name="recRm">"Recette supprimée"</string>
+  <string name="untRec">"Recette sans titre"</string>
+  <string name="stars">"Évaluation étoilée"</string>
   <string name="Created">"Créé le"</string>
-  <string name="_Filtered_result_1AMEXe">"Résultat filtré"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"recettes mises à jour"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recettes existent déjà"</string>
-  <string name="_recipes_imported_1NGeRw">"recettes importées"</string>
-  <string name="_recipes_found_ZDdUgV">"recettes trouvées"</string>
-  <string name="_Import_summary_244SkL">"Récapitulatif de l’importation"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"séparer avec des espaces"</string>
-  <string name="Tags">"Étiquettes"</string>
-  <string name="_No_tags_available_Z1C5GqD">"Aucune étiquette disponible"</string>
-  <string name="_All_Tags_28gMyY">"Toutes les étiquettes"</string>
-  <string name="_All_Categories_Z23JSTS">"toutes les catégories"</string>
+  <string name="recU">"recettes mises à jour"</string>
+  <string name="recE">"recettes existent déjà"</string>
+  <string name="recI">"recettes importées"</string>
+  <string name="recF">"recettes trouvées"</string>
+  <string name="impSuc">"Importation réussie"</string>
+  <string name="tsInfo">"séparez par des espaces"</string>
+  <string name="ts">"Étiquettes"</string>
+  <string name="noTs">"Aucune étiquette disponible"</string>
+  <string name="allTs">"Toutes les étiquettes"</string>
+  <string name="allCats">"Toutes les catégories"</string>
   <string name="Vietnamese">"vietnamienne"</string>
   <string name="Turkish">"turque"</string>
   <string name="Thai">"thaïlandaise"</string>
@@ -234,17 +77,12 @@
   <string name="British">"britannique"</string>
   <string name="Brazilian">"brésilienne"</string>
   <string name="American">"états-unienne"</string>
-  <string name="_All_Cuisines_2hjCp9">"Toutes les cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Êtes-vous sûr·e de vouloir désinstaller"</string>
-  <string name="Units">"Unités"</string>
-  <string name="_Remove_unit__2x26yq">"Retirer l’unité?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Retirer l’unité de rendement?"</string>
-  <string name="_Remove_category__2reaxz">"Supprimer la catégorie?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Retirer la cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"Nouvelle unité"</string>
-  <string name="_New_cuisine_Zrvs3z">"Nouvelle cuisine"</string>
+  <string name="allCuis">"Toutes les cuisines"</string>
+  <string name="cuis">"Cuisines"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Unit">"Unité"</string>
+  <string name="newUnit">"Nouvelle unité"</string>
+  <string name="newCui">"Nouvelle cuisine"</string>
   <string name="Challenging">"Difficile"</string>
   <string name="Moderate">"Modéré"</string>
   <string name="Easy">"Facile"</string>
@@ -255,139 +93,139 @@
   <string name="Rating">"Évaluation"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
   <string name="_Quickest_first_Z1CpP7N">"La plus rapide d’abord"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Impossible de trouver de telles recettes."</string>
-  <string name="_Recipe_not_found_2qGveM">"Recette introuvable"</string>
-  <string name="_Reset_successful_YxqWK">"Réinitialisation terminée"</string>
-  <string name="_Reset_units_list_msRS3">"Réinitialiser la liste des unités"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Réinitialiser la liste des unités de rendement"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Réinitialiser la liste des catégories"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Réinitialiser la liste des cuisines"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"La réinitialisation des listes ne restaure que les entrées par défaut supprimées. Les entrées existantes ne sont pas supprimées."</string>
-  <string name="Reset">"Réinitialiser"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Vous aide quand vous ne pouvez pas décider quoi cuisiner"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Secouez pour voir une recette au hasard"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"Guide d’utilisation"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Politique de confidentialité"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Voir sur GitHub"</string>
-  <string name="Translator">"Traduit par"</string>
-  <string name="Contributors">"Contributeur·ice·s"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
-  <string name="_Permission_denied_Z7wlWK">"Autorisation refusée"</string>
-  <string name="_Import_successful_2bLM3e">"Importé"</string>
-  <string name="_Verifying____cS102">"Vérification…"</string>
-  <string name="_long_time_ago_1nwlFA">"il y a longtemps"</string>
-  <string name="_months_ago_Z1TsskA">"mois de ça"</string>
-  <string name="_weeks_ago_Z2sT1GA">"semaines de ça"</string>
-  <string name="_days_ago_2iCYkm">"jours de ça"</string>
+  <string name="resNF">"Recette introuvable"</string>
+  <string name="restDone">"Réinitialisation terminée"</string>
+  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
+  <string name="restUL">"Réinitialiser la liste des unités"</string>
+  <string name="restYUL">"Réinitialiser la liste des unités de rendement"</string>
+  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
+  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
+  <string name="rest">"Réinitialiser"</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="opts">"Options"</string>
+  <string name="guide">"Guide d’utilisation"</string>
+  <string name="priv">"Politique de confidentialité"</string>
+  <string name="gh">"Voir sur GitHub"</string>
+  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
+  <string name="vrfy">"Vérification"</string>
+  <string name="ltAgo">"il y a longtemps"</string>
+  <string name="mAgo">"mois de ça"</string>
+  <string name="wAgo">"semaines de ça"</string>
+  <string name="dAgo">"jours de ça"</string>
   <string name="yesterday">"hier"</string>
   <string name="today">"aujourd’hui"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Vous avez essayé cette recette :"</string>
+  <string name="triedInfo">"Vous avez essayé cette recette :"</string>
   <string name="snacks">"en-cas"</string>
   <string name="dinner">"souper"</string>
   <string name="lunch">"dîner"</string>
   <string name="breakfast">"Déjeuner"</string>
-  <string name="_Crop_photo_1VL04J">"Recadrer la photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REMPLACER LA PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Photo de recette"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"Accordez l’autorisation de stockage pour enregistrer une photo de recette."</string>
-  <string name="Required">"Obligatoire"</string>
-  <string name="_New_category_Weg73">"Nouvelle catégorie"</string>
-  <string name="_New_yield_unit_1Oevd2">"Nouvelle unité de rendement"</string>
-  <string name="_Remove_note__2wyMVE">"Retirer la note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Retirer la combinaison?"</string>
-  <string name="_Remove_instruction__vkJfi">"Retirer l’instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Retirer l’ingrédient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"CONTINUER L’ÉDITION"</string>
-  <string name="DISCARD">"ABANDONNER"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Annuler toutes les modifications non enregistrées de cette recette?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Modifications non enregistrées"</string>
-  <string name="Search">"Chercher"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Supprimer la recette"</string>
-  <string name="DELETE">"SUPPRIMER"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Supprimer la recette?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Retiré d’Essayer plus tard"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Ajouté à Essayer plus tard"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Retiré des favoris"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Ajouté aux favoris"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Ajoutez une recette d’abord pour effectuer une sauvegarde."</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"Accordez l’autorisation de stockage pour sauvegarder les données EnRecipe sur l’appareil."</string>
-  <string name="CONTINUE">"CONTINUER"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"PAS MAINTENANT"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"Accordez l’autorisation de stockage pour importer vos données à partir d’une sauvegarde précédente."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Autoriser"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"Redémarrez EnRecipes pour utiliser la nouvelle langue."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"Redémarrez EnRecipes pour utiliser le nouveau thème."</string>
-  <string name="RESTART">"REDÉMARRER"</string>
-  <string name="_Restart_required_Z22YINL">"Redémarrage de l’appli nécessaire"</string>
+  <string name="cPic">"Recadrer la photo"</string>
+  <string name="repBtn">"REMPLACER LA PHOTO"</string>
+  <string name="recPic">"Photo de recette"</string>
+  <string name="req">"Obligatoire"</string>
+  <string name="nwCat">"Nouvelle catégorie"</string>
+  <string name="nwYiU">"Nouvelle unité de rendement"</string>
+  <string name="rmCmb">"Combinaison retirée"</string>
+  <string name="rmN">"Note retirée"</string>
+  <string name="rmIns">"Instruction retirée"</string>
+  <string name="rmIng">"Ingrédient retiré"</string>
+  <string name="kEdit">"CONTINUER"</string>
+  <string name="disBtn">"IGNORER"</string>
+  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire?"</string>
+  <string name="unsaved">"Modifications non enregistrées"</string>
+  <string name="ser">"Chercher"</string>
+  <string name="dBtn">"SUPPRIMER"</string>
+  <string name="sltd">"sélectionné"</string>
+  <string name="recs">"recettes"</string>
+  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement :"</string>
+  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette :"</string>
+  <string name="conf">"Confirmer"</string>
+  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
+  <string name="aTry">"Ajouté à Essayer plus tard"</string>
+  <string name="unfavd">"Retiré des Favoris"</string>
+  <string name="favd">"Ajouté aux Favoris"</string>
+  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
+  <string name="dend">"Accès refusé"</string>
+  <string name="conBtn">"CONTINUER"</string>
+  <string name="nNBtn">"PAS MAINTENANT"</string>
+  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
+  <string name="grant">"Accorder l’accès"</string>
+  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
+  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
+  <string name="rst">"REDÉMARRER"</string>
+  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
   <string name="SET">"DÉFINIR"</string>
-  <string name="_ADD_NEW_Zv8FjM">"AJOUTER"</string>
-  <string name="Share">"Partager"</string>
-  <string name="Overview">"Aperçu"</string>
-  <string name="Recipe">"Recette"</string>
-  <string name="Photo">"Photo"</string>
+  <string name="aNBtn">"AJOUTER"</string>
+  <string name="ovw">"Aperçu"</string>
+  <string name="fil">"Recette comme fichier"</string>
+  <string name="rec">"Recette comme texte"</string>
+  <string name="pht">"Photo de recette"</string>
+  <string name="shr">"Partager"</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Ma recette saine"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Ajoutez des recettes pour les voir ici."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Sélectionnez une recette"</string>
-  <string name="ADD">"AJOUTER"</string>
-  <string name="REMOVE">"RETIRER"</string>
-  <string name="CANCEL">"ANNULER"</string>
-  <string name="_Sort_by_Zq01TF">"Trier par"</string>
-  <string name="Step">"Étape"</string>
-  <string name="Item">"Élément"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"AJOUTER UNE NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"AJOUTER UNE COMBINAISON"</string>
-  <string name="Combinations">"Combinaisons"</string>
-  <string name="_ADD_STEP_ZyMPOe">"AJOUTER UNE ÉTAPE"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"AJOUTER UN INGRÉDIENT"</string>
-  <string name="Ingredients">"Ingrédients"</string>
-  <string name="Ingredient">"Ingrédient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Rendement mesuré en"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Quantité de rendement"</string>
-  <string name="_Cooking_time_2w2fEw">"Temps de cuisson"</string>
-  <string name="_Preparation_time_15BfxT">"Temps de préparation"</string>
-  <string name="Category">"Catégorie"</string>
-  <string name="Title">"Titre"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Modifier la recette"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Nouvelle recette"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Auteur·e"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"pour signaler des problèmes, faire des suggestions et des remarques"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Rejoignez le groupe Telegram"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Importer depuis la sauvegarde"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Génère un fichier ZIP de toutes vos données que vous pouvez importer ailleurs."</string>
-  <string name="_Export_a_full_backup_TJfra">"Exporter une sauvegarde complète"</string>
-  <string name="Database">"Base de données"</string>
+  <string name="recTitle">"Ma recette saine"</string>
+  <string name="recListEmp">"Rien ici! Ajoutez quelques recettes et réessayez"</string>
+  <string name="selRec">"Sélectionner une recette"</string>
+  <string name="aBtn">"AJOUTER"</string>
+  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
+  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité :"</string>
+  <string name="rmYUInfo">"Vous êtes sur le point de retirer l’unité de rendement :"</string>
+  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie :"</string>
+  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine :"</string>
+  <string name="rBtn">"RETIRER"</string>
+  <string name="cBtn">"ANNULER"</string>
+  <string name="srt">"Trier par"</string>
+  <string name="stp">"Étape"</string>
+  <string name="it">"Élément"</string>
+  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
+  <string name="nos">"Notes"</string>
+  <string name="no">"Note"</string>
+  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
+  <string name="cmbs">"Combinaisons"</string>
+  <string name="cmb">"Combinaison"</string>
+  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ins">"Instruction"</string>
+  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
+  <string name="ings">"Ingrédients"</string>
+  <string name="ing">"Ingrédient"</string>
+  <string name="yieldU">"Unité de rendement"</string>
+  <string name="yieldQ">"Quantité de rendement"</string>
+  <string name="cookT">"Temps de cuisson"</string>
+  <string name="prepT">"Temps de préparation"</string>
+  <string name="cat">"Catégorie"</string>
+  <string name="title">"Titre"</string>
+  <string name="editRec">"Modifier la recette"</string>
+  <string name="newRec">"Nouvelle recette"</string>
+  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
+  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
+  <string name="ver">"Version"</string>
+  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
+  <string name="impBu">"Importer les données"</string>
+  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
+  <string name="expBu">"Exporter une sauvegarde complète"</string>
+  <string name="db">"Base de données"</string>
   <string name="Dark">"Sombre"</string>
   <string name="Light">"Clair"</string>
   <string name="Theme">"Thème"</string>
-  <string name="_System_default_Z1jruVS">"Système"</string>
-  <string name="_App_language_DzFsk">"Langue"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Impossible de trouver de telles recettes à essayer plus tard."</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Impossible de trouver de tels favoris."</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Impossible de trouver de telles recettes dans cette catégorie."</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Impossible de trouver de telles recettes."</string>
-  <string name="_No_recipes_found_Z125IxD">"Aucune recette trouvée"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Ajoutez des catégories pour les voir ici."</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Mettez les recettes en favoris pour les voir ici."</string>
-  <string name="_No_favourites_yet_aPSoG">"Pas encore de favoris"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Les recettes que vous voulez essayer plus tard sont listées ici."</string>
-  <string name="_All_done__72KYl">"C’est fini!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Utilisez le bouton crayon pour ajouter des notes."</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Utilisez le bouton crayon pour ajouter des combinaisons."</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Utilisez le bouton crayon pour ajouter des instructions."</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Utilisez le bouton crayon pour ajouter des ingrédients."</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Utilisez le bouton plus pour en ajouter une."</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Commencez à ajouter vos recettes!"</string>
+  <string name="sysDef">"Selon le système"</string>
+  <string name="lang">"Langue"</string>
+  <string name="intf">"Interface"</string>
+  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
+  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
+  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
+  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
+  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
+  <string name="noFavs">"Pas encore de favoris"</string>
+  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
+  <string name="aD">"Terminé!"</string>
+  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
+  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
+  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
+  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
+  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
+  <string name="strAdd">"Commencez à ajouter vos recettes!"</string>
   <string name="large">"grand"</string>
   <string name="medium">"moyen"</string>
   <string name="small">"petit"</string>
@@ -415,7 +253,6 @@
   <string name="tbsp">"cuillérée"</string>
   <string name="dsp">"c.à.d"</string>
   <string name="tsp">"c.à.t"</string>
-  <string name="Unit">"Unité"</string>
   <string name="unit">"unité"</string>
   <string name="Loaf">"Miche"</string>
   <string name="Patty">"Pâté"</string>
@@ -460,14 +297,21 @@
   <string name="Appetizers">"Hors-d’œuvre"</string>
   <string name="About">"À propos"</string>
   <string name="Settings">"Paramètres"</string>
-  <string name="Categories">"Catégories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Organisateur de repas"</string>
-  <string name="Favourites">"Favoris"</string>
-  <string name="_Try_Later_If7PG">"Essayer plus tard"</string>
+  <string name="grocery">"Liste de courses"</string>
+  <string name="planner">"Organisateur de repas"</string>
+  <string name="favourites">"Favoris"</string>
+  <string name="trylater">"Essayer plus tard"</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</string>
-  <string name="undo">"Undo"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 311c67fd..4e7bd379 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,210 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Annuler"</string>
   <string name="trnsl">"Traduire"</string>
-  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement:"</string>
-  <string name="recs">"recettes"</string>
-  <string name="sltd">"sélectionné"</string>
-  <string name="January">"janvier"</string>
-  <string name="February">"février"</string>
-  <string name="March">"mars"</string>
-  <string name="April">"avril"</string>
-  <string name="May">"mai"</string>
-  <string name="June">"juin"</string>
-  <string name="July">"juillet"</string>
-  <string name="August">"août"</string>
-  <string name="September">"septembre"</string>
-  <string name="October">"octobre"</string>
-  <string name="November">"novembre"</string>
-  <string name="December">"décembre"</string>
-  <string name="SUN">"dim"</string>
-  <string name="MON">"lun"</string>
-  <string name="TUE">"mar"</string>
-  <string name="WED">"mer"</string>
-  <string name="THU">"jeu"</string>
-  <string name="FRI">"ven"</string>
   <string name="SAT">"sam"</string>
-  <string name="fil">"Recette comme fichier"</string>
-  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
-  <string name="trylater">"Essayer plus tard"</string>
-  <string name="favourites">"Favoris"</string>
-  <string name="planner">"Organisateur de repas"</string>
-  <string name="grocery">"Liste de courses"</string>
-  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
-  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
-  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
-  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
-  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
-  <string name="noFavs">"Pas encore de favoris"</string>
-  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
-  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
-  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
-  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
-  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
-  <string name="intf">"Interface"</string>
-  <string name="lang">"Langue"</string>
-  <string name="sysDef">"Selon le système"</string>
-  <string name="db">"Base de données"</string>
-  <string name="expBu">"Exporter une sauvegarde complète"</string>
-  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
-  <string name="impBu">"Importer les données"</string>
-  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
-  <string name="ver">"Version"</string>
-  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
-  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
-  <string name="newRec">"Nouvelle recette"</string>
-  <string name="editRec">"Modifier la recette"</string>
-  <string name="title">"Titre"</string>
-  <string name="cat">"Catégorie"</string>
-  <string name="prepT">"Temps de préparation"</string>
-  <string name="cookT">"Temps de cuisson"</string>
-  <string name="yieldQ">"Quantité de rendement"</string>
-  <string name="yieldU">"Unité de rendement"</string>
-  <string name="ing">"Ingrédient"</string>
-  <string name="ings">"Ingrédients"</string>
-  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
-  <string name="cmb">"Combinaison"</string>
-  <string name="cmbs">"Combinaisons"</string>
-  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
-  <string name="no">"Note"</string>
-  <string name="nos">"Notes"</string>
-  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
-  <string name="it">"Élément"</string>
-  <string name="stp">"Étape"</string>
-  <string name="srt">"Trier par"</string>
-  <string name="cBtn">"ANNULER"</string>
-  <string name="rBtn">"RETIRER"</string>
-  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
-  <string name="aBtn">"AJOUTER"</string>
-  <string name="selRec">"Sélectionner une recette"</string>
-  <string name="recTitle">"Ma recette saine"</string>
-  <string name="pht">"Photo de recette"</string>
-  <string name="rec">"Recette comme texte"</string>
-  <string name="ovw">"Aperçu"</string>
-  <string name="shr">"Partager"</string>
-  <string name="aNBtn">"AJOUTER"</string>
-  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
-  <string name="rst">"REDÉMARRER"</string>
-  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
-  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
-  <string name="grant">"Accorder l’accès"</string>
-  <string name="expReq">"Une autorisation de stockage est requise pour exporter une sauvegarde."</string>
-  <string name="impReq">"Une autorisation de stockage est requise pour importer des données."</string>
-  <string name="phtReq">"Une autorisation de stockage est requise pour définir une photo de recette."</string>
-  <string name="nNBtn">"PAS MAINTENANT"</string>
-  <string name="conBtn">"CONTINUER"</string>
-  <string name="dend">"Accès refusé"</string>
-  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
-  <string name="favd">"Ajouté aux Favoris"</string>
-  <string name="unfavd">"Retiré des Favoris"</string>
-  <string name="aTry">"Ajouté à Essayer plus tard"</string>
-  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
-  <string name="conf">"Confirmer"</string>
-  <string name="delRec">"Confirmation de suppression"</string>
-  <string name="dBtn">"SUPPRIMER"</string>
-  <string name="ser">"Chercher"</string>
-  <string name="unsaved">"Modifications non enregistrées"</string>
-  <string name="disBtn">"IGNORER"</string>
-  <string name="kEdit">"CONTINUER"</string>
-  <string name="rmIng">"Ingrédient retiré"</string>
-  <string name="rmIns">"Instruction retirée"</string>
-  <string name="rmN">"Note retirée"</string>
-  <string name="rmCmb">"Combinaison retirée"</string>
-  <string name="nwYiU">"Nouvelle unité de rendement"</string>
-  <string name="nwCat">"Nouvelle catégorie"</string>
-  <string name="req">"Obligatoire"</string>
-  <string name="recPic">"Photo de recette"</string>
-  <string name="repBtn">"REMPLACER LA PHOTO"</string>
-  <string name="cPic">"Recadrer la photo"</string>
-  <string name="dAgo">"jours de ça"</string>
-  <string name="wAgo">"semaines de ça"</string>
-  <string name="mAgo">"mois de ça"</string>
-  <string name="ltAgo">"il y a longtemps"</string>
-  <string name="vrfy">"Vérification"</string>
-  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
-  <string name="gh">"Voir sur GitHub"</string>
-  <string name="priv">"Politique de confidentialité"</string>
-  <string name="guide">"Guide d’utilisation"</string>
-  <string name="opts">"Options"</string>
-  <string name="sVw">"Secouez pour voir une recette au hasard"</string>
-  <string name="sVwInfo">"Vous aide à choisir quoi cuisiner quand vous ne pouvez pas vous décider"</string>
-  <string name="rest">"Réinitialiser"</string>
-  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
-  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
-  <string name="restYUL">"Réinitialiser la liste des unités de rendement"</string>
-  <string name="restUL">"Réinitialiser la liste des unités"</string>
-  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
-  <string name="restDone">"Réinitialisation terminée"</string>
-  <string name="resNF">"Recette introuvable"</string>
-  <string name="newCui">"Nouvelle cuisine"</string>
-  <string name="newUnit">"Nouvelle unité"</string>
-  <string name="Unit">"Unité"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="allCuis">"Toutes les cuisines"</string>
-  <string name="allCats">"Toutes les catégories"</string>
-  <string name="allTs">"Toutes les étiquettes"</string>
-  <string name="noTs">"Aucune étiquette disponible"</string>
-  <string name="ts">"Étiquettes"</string>
-  <string name="tsInfo">"séparez par des espaces"</string>
-  <string name="impSuc">"Importation réussie"</string>
-  <string name="recF">"recettes trouvées"</string>
-  <string name="recI">"recettes importées"</string>
-  <string name="recE">"recettes existent déjà"</string>
-  <string name="recU">"recettes mises à jour"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
-  <string name="stars">"Évaluation étoilée"</string>
-  <string name="untRec">"Recette sans titre"</string>
-  <string name="recRm">"Recette supprimée"</string>
-  <string name="impFail">"L’importation a échoué"</string>
-  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
-  <string name="buEmp">"La sauvegarde est vide"</string>
-  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
-  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
-  <string name="invFile">"Fichier invalide"</string>
-  <string name="donate">"Faire un don"</string>
-  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
-  <string name="help">"Aide"</string>
-  <string name="strAdd">"Commencez à ajouter vos recettes!"</string>
-  <string name="aD">"Terminé!"</string>
-  <string name="recListEmp">"Rien ici! Ajoutez quelques recettes et réessayez"</string>
-  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire?"</string>
+  <string name="FRI">"ven"</string>
+  <string name="THU">"jeu"</string>
+  <string name="WED">"mer"</string>
+  <string name="TUE">"mar"</string>
+  <string name="MON">"lun"</string>
+  <string name="SUN">"dim"</string>
+  <string name="December">"décembre"</string>
+  <string name="November">"novembre"</string>
+  <string name="October">"octobre"</string>
+  <string name="September">"septembre"</string>
+  <string name="August">"août"</string>
+  <string name="July">"juillet"</string>
+  <string name="June">"juin"</string>
+  <string name="May">"mai"</string>
+  <string name="April">"avril"</string>
+  <string name="March">"mars"</string>
+  <string name="February">"février"</string>
+  <string name="January">"janvier"</string>
   <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES?"</string>
-  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine:"</string>
-  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie:"</string>
-  <string name="rmYUInfo">"Vous êtes sur le point de retirer l’unité de rendement:"</string>
-  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité:"</string>
-  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette:"</string>
-  <string name="triedInfo">"Vous avez essayé cette recette:"</string>
-  <string name="Donate">""</string>
-  <string name="Combination">""</string>
-  <string name="_Invalid_file__Z2bRAst">""</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">""</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">""</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">""</string>
-  <string name="_Import_failed_Z1dbs6t">""</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">""</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">""</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">""</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">""</string>
-  <string name="_Untitled_Recipe_Zv0UxP">""</string>
-  <string name="_Star_rating_Z11p4Kw">""</string>
+  <string name="help">"Aide"</string>
+  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
+  <string name="donate">"Faire un don"</string>
+  <string name="invFile">"Fichier invalide"</string>
+  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
+  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
+  <string name="buEmp">"La sauvegarde est vide"</string>
+  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
+  <string name="impFail">"L’importation a échoué"</string>
+  <string name="recRm">"Recette supprimée"</string>
+  <string name="untRec">"Recette sans titre"</string>
+  <string name="stars">"Évaluation étoilée"</string>
   <string name="Created">"Créé le"</string>
-  <string name="_Filtered_result_1AMEXe">""</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">""</string>
-  <string name="_recipes_already_exists_2jqW2s">""</string>
-  <string name="_recipes_imported_1NGeRw">""</string>
-  <string name="_recipes_found_ZDdUgV">""</string>
-  <string name="_Import_summary_244SkL">""</string>
-  <string name="_separate_with_spaces_ZHKOfw">""</string>
-  <string name="Tags">""</string>
-  <string name="_No_tags_available_Z1C5GqD">""</string>
-  <string name="_All_Tags_28gMyY">""</string>
-  <string name="_All_Categories_Z23JSTS">""</string>
+  <string name="recU">"recettes mises à jour"</string>
+  <string name="recE">"recettes existent déjà"</string>
+  <string name="recI">"recettes importées"</string>
+  <string name="recF">"recettes trouvées"</string>
+  <string name="impSuc">"Importation réussie"</string>
+  <string name="tsInfo">"séparez par des espaces"</string>
+  <string name="ts">"Étiquettes"</string>
+  <string name="noTs">"Aucune étiquette disponible"</string>
+  <string name="allTs">"Toutes les étiquettes"</string>
+  <string name="allCats">"Toutes les catégories"</string>
   <string name="Vietnamese">"vietnamienne"</string>
   <string name="Turkish">"turque"</string>
   <string name="Thai">"thaïlandaise"</string>
@@ -235,17 +77,12 @@
   <string name="British">"britannique"</string>
   <string name="Brazilian">"brésilienne"</string>
   <string name="American">"états-unienne"</string>
-  <string name="_All_Cuisines_2hjCp9">""</string>
-  <string name="Cuisines">""</string>
-  <string name="Cuisine">""</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">""</string>
-  <string name="Units">""</string>
-  <string name="_Remove_unit__2x26yq">""</string>
-  <string name="_Remove_yield_unit__Z1duBWR">""</string>
-  <string name="_Remove_category__2reaxz">""</string>
-  <string name="_Remove_cuisine__22ftcL">""</string>
-  <string name="_New_unit_1CVEEA">""</string>
-  <string name="_New_cuisine_Zrvs3z">""</string>
+  <string name="allCuis">"Toutes les cuisines"</string>
+  <string name="cuis">"Cuisines"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Unit">"Unité"</string>
+  <string name="newUnit">"Nouvelle unité"</string>
+  <string name="newCui">"Nouvelle cuisine"</string>
   <string name="Challenging">"Difficile"</string>
   <string name="Moderate">"Modéré"</string>
   <string name="Easy">"Facile"</string>
@@ -256,139 +93,139 @@
   <string name="Rating">"Évaluation"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
   <string name="_Quickest_first_Z1CpP7N">"La plus rapide d’abord"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">""</string>
-  <string name="_Recipe_not_found_2qGveM">""</string>
-  <string name="_Reset_successful_YxqWK">""</string>
-  <string name="_Reset_units_list_msRS3">""</string>
-  <string name="_Reset_yield_units_list_ZjouMk">""</string>
-  <string name="_Reset_categories_list_Z1JmKra">""</string>
-  <string name="_Reset_cuisines_list_1kWL8I">""</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">""</string>
-  <string name="Reset">""</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">""</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">""</string>
-  <string name="Options">""</string>
-  <string name="_User_guide_2uDJCF">""</string>
-  <string name="_Privacy_policy_Zb4ht5">""</string>
-  <string name="_View_on_GitHub_Z2qOqmx">""</string>
-  <string name="Translator">""</string>
-  <string name="Contributors">""</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">""</string>
-  <string name="_Permission_denied_Z7wlWK">""</string>
-  <string name="_Import_successful_2bLM3e">""</string>
-  <string name="_Verifying____cS102">""</string>
-  <string name="_long_time_ago_1nwlFA">""</string>
-  <string name="_months_ago_Z1TsskA">""</string>
-  <string name="_weeks_ago_Z2sT1GA">""</string>
-  <string name="_days_ago_2iCYkm">""</string>
+  <string name="resNF">"Recette introuvable"</string>
+  <string name="restDone">"Réinitialisation terminée"</string>
+  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
+  <string name="restUL">"Réinitialiser la liste des unités"</string>
+  <string name="restYUL">"Réinitialiser la liste des unités de rendement"</string>
+  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
+  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
+  <string name="rest">"Réinitialiser"</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="opts">"Options"</string>
+  <string name="guide">"Guide d’utilisation"</string>
+  <string name="priv">"Politique de confidentialité"</string>
+  <string name="gh">"Voir sur GitHub"</string>
+  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
+  <string name="vrfy">"Vérification"</string>
+  <string name="ltAgo">"il y a longtemps"</string>
+  <string name="mAgo">"mois de ça"</string>
+  <string name="wAgo">"semaines de ça"</string>
+  <string name="dAgo">"jours de ça"</string>
   <string name="yesterday">"hier"</string>
   <string name="today">"aujourd’hui"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">""</string>
+  <string name="triedInfo">"Vous avez essayé cette recette:"</string>
   <string name="snacks">"en-cas"</string>
   <string name="dinner">"souper"</string>
   <string name="lunch">"dîner"</string>
   <string name="breakfast">"Déjeuner"</string>
-  <string name="_Crop_photo_1VL04J">""</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">""</string>
-  <string name="_Recipe_photo_eqm9B">""</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">""</string>
-  <string name="Required">""</string>
-  <string name="_New_category_Weg73">""</string>
-  <string name="_New_yield_unit_1Oevd2">""</string>
-  <string name="_Remove_note__2wyMVE">""</string>
-  <string name="_Remove_combination__1dr2LS">""</string>
-  <string name="_Remove_instruction__vkJfi">""</string>
-  <string name="_Remove_ingredient__2puvMO">""</string>
-  <string name="_KEEP_EDITING_1o9uy3">""</string>
-  <string name="DISCARD">""</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">""</string>
-  <string name="_Unsaved_changes_9fqb4">""</string>
-  <string name="Search">""</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">""</string>
-  <string name="DELETE">""</string>
-  <string name="_Delete_recipe__Z2tMYtE">""</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">""</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">""</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">""</string>
-  <string name="_Added_to_Favourites_2mzllO">""</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">""</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">""</string>
-  <string name="CONTINUE">""</string>
-  <string name="_NOT_NOW_Z1HD7qX">""</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">""</string>
-  <string name="_Grant_permission_Z1UQBuh">""</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">""</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">""</string>
-  <string name="RESTART">""</string>
-  <string name="_Restart_required_Z22YINL">""</string>
+  <string name="cPic">"Recadrer la photo"</string>
+  <string name="repBtn">"REMPLACER LA PHOTO"</string>
+  <string name="recPic">"Photo de recette"</string>
+  <string name="req">"Obligatoire"</string>
+  <string name="nwCat">"Nouvelle catégorie"</string>
+  <string name="nwYiU">"Nouvelle unité de rendement"</string>
+  <string name="rmCmb">"Combinaison retirée"</string>
+  <string name="rmN">"Note retirée"</string>
+  <string name="rmIns">"Instruction retirée"</string>
+  <string name="rmIng">"Ingrédient retiré"</string>
+  <string name="kEdit">"CONTINUER"</string>
+  <string name="disBtn">"IGNORER"</string>
+  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire?"</string>
+  <string name="unsaved">"Modifications non enregistrées"</string>
+  <string name="ser">"Chercher"</string>
+  <string name="dBtn">"SUPPRIMER"</string>
+  <string name="sltd">"sélectionné"</string>
+  <string name="recs">"recettes"</string>
+  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement:"</string>
+  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette:"</string>
+  <string name="conf">"Confirmer"</string>
+  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
+  <string name="aTry">"Ajouté à Essayer plus tard"</string>
+  <string name="unfavd">"Retiré des Favoris"</string>
+  <string name="favd">"Ajouté aux Favoris"</string>
+  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
+  <string name="dend">"Accès refusé"</string>
+  <string name="conBtn">"CONTINUER"</string>
+  <string name="nNBtn">"PAS MAINTENANT"</string>
+  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
+  <string name="grant">"Accorder l’accès"</string>
+  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
+  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
+  <string name="rst">"REDÉMARRER"</string>
+  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
   <string name="SET">"DÉFINIR"</string>
-  <string name="_ADD_NEW_Zv8FjM">""</string>
-  <string name="Share">""</string>
-  <string name="Overview">""</string>
-  <string name="Recipe">""</string>
-  <string name="Photo">""</string>
+  <string name="aNBtn">"AJOUTER"</string>
+  <string name="ovw">"Aperçu"</string>
+  <string name="fil">"Recette comme fichier"</string>
+  <string name="rec">"Recette comme texte"</string>
+  <string name="pht">"Photo de recette"</string>
+  <string name="shr">"Partager"</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">""</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">""</string>
-  <string name="_Select_a_recipe_2lL8x2">""</string>
-  <string name="ADD">""</string>
-  <string name="REMOVE">""</string>
-  <string name="CANCEL">""</string>
-  <string name="_Sort_by_Zq01TF">""</string>
-  <string name="Step">""</string>
-  <string name="Item">""</string>
-  <string name="_ADD_NOTE_ZyNw1r">""</string>
-  <string name="Notes">""</string>
-  <string name="Note">""</string>
-  <string name="_ADD_COMBINATION_2q9HWq">""</string>
-  <string name="Combinations">""</string>
-  <string name="_ADD_STEP_ZyMPOe">""</string>
-  <string name="Instructions">""</string>
-  <string name="Instruction">""</string>
-  <string name="_ADD_INGREDIENT_29sSLU">""</string>
-  <string name="Ingredients">""</string>
-  <string name="Ingredient">""</string>
-  <string name="_Yield_measured_in_2OoRT">""</string>
-  <string name="_Yield_quantity_ZHx3jw">""</string>
-  <string name="_Cooking_time_2w2fEw">""</string>
-  <string name="_Preparation_time_15BfxT">""</string>
-  <string name="Category">""</string>
-  <string name="Title">""</string>
-  <string name="_Edit_recipe_ZPvwDP">""</string>
-  <string name="_New_recipe_Z1Y2YKJ">""</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">""</string>
-  <string name="Author">""</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">""</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">""</string>
-  <string name="Version">""</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">""</string>
-  <string name="_Import_from_backup_Z28HsC0">""</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">""</string>
-  <string name="_Export_a_full_backup_TJfra">""</string>
-  <string name="Database">""</string>
+  <string name="recTitle">"Ma recette saine"</string>
+  <string name="recListEmp">"Rien ici! Ajoutez quelques recettes et réessayez"</string>
+  <string name="selRec">"Sélectionner une recette"</string>
+  <string name="aBtn">"AJOUTER"</string>
+  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
+  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité:"</string>
+  <string name="rmYUInfo">"Vous êtes sur le point de retirer l’unité de rendement:"</string>
+  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie:"</string>
+  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine:"</string>
+  <string name="rBtn">"RETIRER"</string>
+  <string name="cBtn">"ANNULER"</string>
+  <string name="srt">"Trier par"</string>
+  <string name="stp">"Étape"</string>
+  <string name="it">"Élément"</string>
+  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
+  <string name="nos">"Notes"</string>
+  <string name="no">"Note"</string>
+  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
+  <string name="cmbs">"Combinaisons"</string>
+  <string name="cmb">"Combinaison"</string>
+  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ins">"Instruction"</string>
+  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
+  <string name="ings">"Ingrédients"</string>
+  <string name="ing">"Ingrédient"</string>
+  <string name="yieldU">"Unité de rendement"</string>
+  <string name="yieldQ">"Quantité de rendement"</string>
+  <string name="cookT">"Temps de cuisson"</string>
+  <string name="prepT">"Temps de préparation"</string>
+  <string name="cat">"Catégorie"</string>
+  <string name="title">"Titre"</string>
+  <string name="editRec">"Modifier la recette"</string>
+  <string name="newRec">"Nouvelle recette"</string>
+  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
+  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
+  <string name="ver">"Version"</string>
+  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
+  <string name="impBu">"Importer les données"</string>
+  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
+  <string name="expBu">"Exporter une sauvegarde complète"</string>
+  <string name="db">"Base de données"</string>
   <string name="Dark">"Sombre"</string>
   <string name="Light">"Clair"</string>
   <string name="Theme">"Thème"</string>
-  <string name="_System_default_Z1jruVS">""</string>
-  <string name="_App_language_DzFsk">""</string>
-  <string name="Interface">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">""</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">""</string>
-  <string name="_No_recipes_found_Z125IxD">""</string>
-  <string name="_Category_looks_empty_ZAK5qU">""</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">""</string>
-  <string name="_No_favourites_yet_aPSoG">""</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">""</string>
-  <string name="_All_done__72KYl">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">""</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">""</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">""</string>
-  <string name="_Start_adding_your_recipes__rwnVV">""</string>
+  <string name="sysDef">"Selon le système"</string>
+  <string name="lang">"Langue"</string>
+  <string name="intf">"Interface"</string>
+  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
+  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
+  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
+  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
+  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
+  <string name="noFavs">"Pas encore de favoris"</string>
+  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
+  <string name="aD">"Terminé!"</string>
+  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
+  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
+  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
+  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
+  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
+  <string name="strAdd">"Commencez à ajouter vos recettes!"</string>
   <string name="large">"grand"</string>
   <string name="medium">"moyen"</string>
   <string name="small">"petit"</string>
@@ -460,14 +297,21 @@
   <string name="Appetizers">"Hors-d’œuvre"</string>
   <string name="About">"À propos"</string>
   <string name="Settings">"Paramètres"</string>
-  <string name="Categories">""</string>
-  <string name="_Meal_Planner_2aq4oj">""</string>
-  <string name="Favourites">""</string>
-  <string name="_Try_Later_If7PG">""</string>
+  <string name="grocery">"Liste de courses"</string>
+  <string name="planner">"Organisateur de repas"</string>
+  <string name="favourites">"Favoris"</string>
+  <string name="trylater">"Essayer plus tard"</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</string>
-  <string name="undo">"Undo"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 52e8c379..57ea54b3 100644
--- a/app/resources/Android/src/main/res/values-fr/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr/strings.xml
@@ -1,209 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Annuler"</string>
   <string name="trnsl">"Traduire"</string>
-  <string name="recs">"recettes"</string>
-  <string name="January">"janvier"</string>
-  <string name="February">"février"</string>
-  <string name="March">"mars"</string>
-  <string name="April">"avril"</string>
-  <string name="May">"mai"</string>
-  <string name="June">"juin"</string>
-  <string name="July">"juillet"</string>
-  <string name="August">"août"</string>
-  <string name="September">"septembre"</string>
-  <string name="October">"octobre"</string>
-  <string name="November">"novembre"</string>
-  <string name="December">"décembre"</string>
-  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement :"</string>
-  <string name="sltd">"sélectionné"</string>
-  <string name="SUN">"dim"</string>
-  <string name="MON">"lun"</string>
-  <string name="TUE">"mar"</string>
-  <string name="WED">"mer"</string>
-  <string name="THU">"jeu"</string>
-  <string name="FRI">"ven"</string>
   <string name="SAT">"sam"</string>
-  <string name="fil">"Recette comme fichier"</string>
-  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
-  <string name="trylater">"Essayer plus tard"</string>
-  <string name="favourites">"Favoris"</string>
-  <string name="planner">"Organisateur de repas"</string>
-  <string name="grocery">"Liste de courses"</string>
-  <string name="strAdd">"Commencez à ajouter vos recettes !"</string>
-  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
-  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
-  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
-  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
-  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
-  <string name="aD">"Terminé !"</string>
-  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
-  <string name="noFavs">"Pas encore de favoris"</string>
-  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
-  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
-  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
-  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
-  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
-  <string name="intf">"Interface"</string>
-  <string name="lang">"Langue"</string>
-  <string name="sysDef">"Selon le système"</string>
-  <string name="db">"Base de données"</string>
-  <string name="expBu">"Exporter une sauvegarde complète"</string>
-  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
-  <string name="impBu">"Importer les données"</string>
-  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
-  <string name="ver">"Version"</string>
-  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
-  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
-  <string name="newRec">"Nouvelle recette"</string>
-  <string name="editRec">"Modifier la recette"</string>
-  <string name="title">"Titre"</string>
-  <string name="cat">"Catégorie"</string>
-  <string name="prepT">"Temps de préparation"</string>
-  <string name="cookT">"Temps de cuisson"</string>
-  <string name="yieldQ">"Quantité de portion"</string>
-  <string name="yieldU">"Unité de portion"</string>
-  <string name="ing">"Ingrédient"</string>
-  <string name="ings">"Ingrédients"</string>
-  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
-  <string name="cmb">"Combinaison"</string>
-  <string name="cmbs">"Combinaisons"</string>
-  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
-  <string name="no">"Note"</string>
-  <string name="nos">"Notes"</string>
-  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
-  <string name="it">"Élément"</string>
-  <string name="stp">"Étape"</string>
-  <string name="srt">"Trier par"</string>
-  <string name="cBtn">"ANNULER"</string>
-  <string name="rBtn">"RETIRER"</string>
-  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine :"</string>
-  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie :"</string>
-  <string name="rmYUInfo">"Vous êtes sur le point de supprimer l\'unité de rendement :"</string>
-  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité :"</string>
-  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
-  <string name="aBtn">"AJOUTER"</string>
-  <string name="selRec">"Sélectionner une recette"</string>
-  <string name="recListEmp">"Rien ici ! Ajoutez quelques recettes et réessayez"</string>
-  <string name="recTitle">"Ma recette saine"</string>
-  <string name="pht">"Photo de recette"</string>
-  <string name="rec">"Recette comme texte"</string>
-  <string name="ovw">"Aperçu"</string>
-  <string name="shr">"Partager"</string>
-  <string name="aNBtn">"AJOUTER"</string>
-  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
-  <string name="rst">"REDÉMARRER"</string>
-  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
-  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
-  <string name="grant">"Accorder l’accès"</string>
-  <string name="expReq">"Une autorisation de stockage est requise pour exporter une sauvegarde."</string>
-  <string name="impReq">"Une autorisation de stockage est requise pour importer des données."</string>
-  <string name="phtReq">"Une autorisation de stockage est requise pour définir une photo de recette."</string>
-  <string name="nNBtn">"PAS MAINTENANT"</string>
-  <string name="conBtn">"CONTINUER"</string>
-  <string name="dend">"Accès refusé"</string>
-  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
-  <string name="favd">"Ajouté aux Favoris"</string>
-  <string name="unfavd">"Retiré des Favoris"</string>
-  <string name="aTry">"Ajouté à Essayer plus tard"</string>
-  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
-  <string name="conf">"Confirmer"</string>
-  <string name="delRec">"Confirmation de suppression"</string>
-  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette :"</string>
-  <string name="dBtn">"SUPPRIMER"</string>
-  <string name="ser">"Chercher"</string>
-  <string name="unsaved">"Modifications non enregistrées"</string>
-  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire ?"</string>
-  <string name="disBtn">"IGNORER"</string>
-  <string name="kEdit">"CONTINUER"</string>
-  <string name="rmIng">"Ingrédient retiré"</string>
-  <string name="rmIns">"Instruction retirée"</string>
-  <string name="rmN">"Note retirée"</string>
-  <string name="rmCmb">"Combinaison retirée"</string>
-  <string name="nwYiU">"Nouvelle unité de portion"</string>
-  <string name="nwCat">"Nouvelle catégorie"</string>
-  <string name="req">"Obligatoire"</string>
-  <string name="recPic">"Photo de recette"</string>
-  <string name="repBtn">"REMPLACER LA PHOTO"</string>
-  <string name="cPic">"Recadrer la photo"</string>
-  <string name="triedInfo">"Vous avez essayé cette recette :"</string>
-  <string name="dAgo">"jours de ça"</string>
-  <string name="wAgo">"semaines de ça"</string>
-  <string name="mAgo">"mois de ça"</string>
-  <string name="ltAgo">"il y a longtemps"</string>
-  <string name="vrfy">"Vérification"</string>
-  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
-  <string name="gh">"Voir sur GitHub"</string>
-  <string name="priv">"Politique de confidentialité"</string>
-  <string name="guide">"Guide d’utilisation"</string>
-  <string name="opts">"Options"</string>
-  <string name="sVw">"Secouez pour voir une recette au hasard"</string>
-  <string name="sVwInfo">"Vous aide à choisir quoi cuisiner quand vous ne pouvez pas vous décider"</string>
-  <string name="rest">"Réinitialiser"</string>
-  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
-  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
-  <string name="restYUL">"Réinitialiser la liste des unités de portion"</string>
-  <string name="restUL">"Réinitialiser la liste des unités"</string>
-  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
-  <string name="restDone">"Réinitialisation terminée"</string>
-  <string name="resNF">"Recette introuvable"</string>
-  <string name="newCui">"Nouvelle cuisine"</string>
-  <string name="newUnit">"Nouvelle unité"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="allCuis">"Toutes les cuisines"</string>
-  <string name="allCats">"Toutes les catégories"</string>
-  <string name="allTs">"Toutes les étiquettes"</string>
-  <string name="noTs">"Aucune étiquette disponible"</string>
-  <string name="ts">"Étiquettes"</string>
-  <string name="tsInfo">"séparez par des espaces"</string>
-  <string name="impSuc">"Importation réussie"</string>
-  <string name="recF">"recettes trouvées"</string>
-  <string name="recI">"recettes importées"</string>
+  <string name="FRI">"ven"</string>
+  <string name="THU">"jeu"</string>
+  <string name="WED">"mer"</string>
+  <string name="TUE">"mar"</string>
+  <string name="MON">"lun"</string>
+  <string name="SUN">"dim"</string>
+  <string name="December">"décembre"</string>
+  <string name="November">"novembre"</string>
+  <string name="October">"octobre"</string>
+  <string name="September">"septembre"</string>
+  <string name="August">"août"</string>
+  <string name="July">"juillet"</string>
+  <string name="June">"juin"</string>
+  <string name="May">"mai"</string>
+  <string name="April">"avril"</string>
+  <string name="March">"mars"</string>
+  <string name="February">"février"</string>
+  <string name="January">"janvier"</string>
+  <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES ?"</string>
+  <string name="help">"Aide"</string>
+  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
+  <string name="donate">"Faire un don"</string>
+  <string name="invFile">"Fichier invalide"</string>
+  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
+  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
+  <string name="buEmp">"La sauvegarde est vide"</string>
+  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
+  <string name="impFail">"L’importation a échoué"</string>
+  <string name="recRm">"Recette supprimée"</string>
+  <string name="untRec">"Recette sans titre"</string>
+  <string name="stars">"Évaluation étoilée"</string>
+  <string name="Created">"Créé le"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
+  <string name="OK">"OK"</string>
   <string name="recU">"recettes mises à jour"</string>
   <string name="recE">"recettes existent déjà"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Recettes filtrées"</string>
-  <string name="stars">"Évaluation étoilée"</string>
-  <string name="untRec">"Recette sans titre"</string>
-  <string name="recRm">"Recette supprimée"</string>
-  <string name="impFail">"L’importation a échoué"</string>
-  <string name="buInc">"Fichier de sauvegarde mal formé ou corrompu"</string>
-  <string name="buEmp">"La sauvegarde est vide"</string>
-  <string name="buMod">"Le fichier de sauvegarde a été modifié ailleurs"</string>
-  <string name="buSuc">"Sauvegarde enregistrée avec succès dans le dossier de téléchargement"</string>
-  <string name="invFile">"Fichier invalide"</string>
-  <string name="donate">"Faire un don"</string>
-  <string name="appInfo">"EnRecipes est un livre de cuisine numérique à code source ouvert et respectueux de la vie privée qui vous permet de créer, gérer et partager vos recettes"</string>
-  <string name="help">"Aide"</string>
-  <string name="trySer">"RECHERCHE DANS TOUTES LES RECETTES ?"</string>
-  <string name="Combination">"Combinaison"</string>
-  <string name="Donate">"Faire un don"</string>
-  <string name="_Invalid_file__Z2bRAst">"Fichier invalide :"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Fichier de sauvegarde modifié ailleurs."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"La sauvegarde est vide."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Fichier de sauvegarde malformé ou corrompu."</string>
-  <string name="_Import_failed_Z1dbs6t">"L’importation a échoué"</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Retirer la recette des en-cas ?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Retirer la recette du dîner ?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Retirer la recette du déjeuner ?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Retirer la recette du petit déjeuner ?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Recette sans titre"</string>
-  <string name="_Star_rating_Z11p4Kw">"Évaluation étoilée"</string>
-  <string name="Created">"Créé le"</string>
-  <string name="_Filtered_result_1AMEXe">"Résultat filtré"</string>
-  <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"recettes mises à jour"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recettes existent déjà"</string>
-  <string name="_recipes_imported_1NGeRw">"recettes importées"</string>
-  <string name="_recipes_found_ZDdUgV">"recettes trouvées"</string>
-  <string name="_Import_summary_244SkL">"Récapitulatif de l’importation"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"séparer avec des espaces"</string>
-  <string name="Tags">"Étiquettes"</string>
-  <string name="_No_tags_available_Z1C5GqD">"Aucune étiquette disponible"</string>
-  <string name="_All_Tags_28gMyY">"Toutes les étiquettes"</string>
-  <string name="_All_Categories_Z23JSTS">"toutes les catégories"</string>
+  <string name="recI">"recettes importées"</string>
+  <string name="recF">"recettes trouvées"</string>
+  <string name="impSuc">"Importation réussie"</string>
+  <string name="tsInfo">"séparez par des espaces"</string>
+  <string name="ts">"Étiquettes"</string>
+  <string name="noTs">"Aucune étiquette disponible"</string>
+  <string name="allTs">"Toutes les étiquettes"</string>
+  <string name="allCats">"Toutes les catégories"</string>
   <string name="Vietnamese">"Vietnamienne"</string>
   <string name="Turkish">"Turque"</string>
   <string name="Thai">"Thaïlandaise"</string>
@@ -234,17 +77,12 @@
   <string name="British">"Britannique"</string>
   <string name="Brazilian">"Brésilienne"</string>
   <string name="American">"états-unienne"</string>
-  <string name="_All_Cuisines_2hjCp9">"Toutes les cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Êtes-vous sûr·e de vouloir désinstaller"</string>
-  <string name="Units">"Unités"</string>
-  <string name="_Remove_unit__2x26yq">"Retirer l’unité ?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Retirer l’unité de rendement ?"</string>
-  <string name="_Remove_category__2reaxz">"Supprimer la catégorie ?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Retirer la cuisine ?"</string>
-  <string name="_New_unit_1CVEEA">"Nouvelle unité"</string>
-  <string name="_New_cuisine_Zrvs3z">"Nouvelle cuisine"</string>
+  <string name="allCuis">"Toutes les cuisines"</string>
+  <string name="cuis">"Cuisines"</string>
+  <string name="cui">"Cuisine"</string>
+  <string name="Unit">"Unité"</string>
+  <string name="newUnit">"Nouvelle unité"</string>
+  <string name="newCui">"Nouvelle cuisine"</string>
   <string name="Challenging">"Difficile"</string>
   <string name="Moderate">"Modéré"</string>
   <string name="Easy">"Facile"</string>
@@ -255,139 +93,139 @@
   <string name="Rating">"Évaluation"</string>
   <string name="_Slowest_first_hHjY6">"La plus lente d’abord"</string>
   <string name="_Quickest_first_Z1CpP7N">"La plus rapide d’abord"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Impossible de trouver de telles recettes."</string>
-  <string name="_Recipe_not_found_2qGveM">"Recette introuvable"</string>
-  <string name="_Reset_successful_YxqWK">"Réinitialisation terminée"</string>
-  <string name="_Reset_units_list_msRS3">"Réinitialiser la liste des unités"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Réinitialiser la liste des unités de rendement"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Réinitialiser la liste des catégories"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Réinitialiser la liste des cuisines"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"La réinitialisation des listes ne restaure que les entrées par défaut supprimées. Les entrées existantes ne sont pas supprimées."</string>
-  <string name="Reset">"Réinitialiser"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Vous aide quand vous ne pouvez pas décider quoi cuisiner"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Secouez pour voir une recette au hasard"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"Guide d’utilisation"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Politique de confidentialité"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Voir sur GitHub"</string>
-  <string name="Translator">"Traduit par"</string>
-  <string name="Contributors">"Contributeur·ice·s"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
-  <string name="_Permission_denied_Z7wlWK">"Autorisation refusée"</string>
-  <string name="_Import_successful_2bLM3e">"Importé"</string>
-  <string name="_Verifying____cS102">"Vérification…"</string>
-  <string name="_long_time_ago_1nwlFA">"il y a longtemps"</string>
-  <string name="_months_ago_Z1TsskA">"mois de ça"</string>
-  <string name="_weeks_ago_Z2sT1GA">"semaines de ça"</string>
-  <string name="_days_ago_2iCYkm">"jours de ça"</string>
+  <string name="resNF">"Recette introuvable"</string>
+  <string name="restDone">"Réinitialisation terminée"</string>
+  <string name="restInfo">"La réinitialisation d’une liste supprimera les entrées créées par l’utilisateur et restaurera les entrées par défaut. Les recettes existantes ne seront pas affectées."</string>
+  <string name="restUL">"Réinitialiser la liste des unités"</string>
+  <string name="restYUL">"Réinitialiser la liste des unités de portion"</string>
+  <string name="restCatL">"Réinitialiser la liste des catégories"</string>
+  <string name="restCuiL">"Réinitialiser la liste de cuisine"</string>
+  <string name="rest">"Réinitialiser"</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="opts">"Options"</string>
+  <string name="guide">"Guide d’utilisation"</string>
+  <string name="priv">"Politique de confidentialité"</string>
+  <string name="gh">"Voir sur GitHub"</string>
+  <string name="appCrd">"Partagé via EnRecipes. Téléchargez-le sur F-Droid, IzzyOnDroid ou le Play Store."</string>
+  <string name="vrfy">"Vérification"</string>
+  <string name="ltAgo">"il y a longtemps"</string>
+  <string name="mAgo">"mois de ça"</string>
+  <string name="wAgo">"semaines de ça"</string>
+  <string name="dAgo">"jours de ça"</string>
   <string name="yesterday">"hier"</string>
   <string name="today">"aujourd’hui"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Vous avez essayé cette recette :"</string>
+  <string name="triedInfo">"Vous avez essayé cette recette :"</string>
   <string name="snacks">"en-cas"</string>
   <string name="dinner">"dîner"</string>
   <string name="lunch">"déjeuner"</string>
   <string name="breakfast">"Petit déjeuner"</string>
-  <string name="_Crop_photo_1VL04J">"Recadrer la photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REMPLACER LA PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Photo de recette"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"Accordez l’autorisation de stockage pour enregistrer une photo de recette."</string>
-  <string name="Required">"Obligatoire"</string>
-  <string name="_New_category_Weg73">"Nouvelle catégorie"</string>
-  <string name="_New_yield_unit_1Oevd2">"Nouvelle unité de rendement"</string>
-  <string name="_Remove_note__2wyMVE">"Retirer la note ?"</string>
-  <string name="_Remove_combination__1dr2LS">"Retirer la combinaison ?"</string>
-  <string name="_Remove_instruction__vkJfi">"Retirer l’instruction ?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Retirer l’ingrédient ?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"CONTINUER L’ÉDITION"</string>
-  <string name="DISCARD">"ABANDONNER"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Annuler toutes les modifications non enregistrées de cette recette ?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Modifications non enregistrées"</string>
-  <string name="Search">"Chercher"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Supprimer la recette"</string>
-  <string name="DELETE">"SUPPRIMER"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Supprimer la recette ?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Retiré d’Essayer plus tard"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Ajouté à Essayer plus tard"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Retiré des favoris"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Ajouté aux favoris"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Ajoutez une recette d’abord pour effectuer une sauvegarde."</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"Accordez l’autorisation de stockage pour sauvegarder les données EnRecipe sur l’appareil."</string>
-  <string name="CONTINUE">"CONTINUER"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"PAS MAINTENANT"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"Accordez l’autorisation de stockage pour importer vos données à partir d’une sauvegarde précédente."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Autoriser"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"Redémarrez EnRecipes pour utiliser la nouvelle langue."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"Redémarrez EnRecipes pour utiliser le nouveau thème."</string>
-  <string name="RESTART">"REDÉMARRER"</string>
-  <string name="_Restart_required_Z22YINL">"Redémarrage de l’appli nécessaire"</string>
+  <string name="cPic">"Recadrer la photo"</string>
+  <string name="repBtn">"REMPLACER LA PHOTO"</string>
+  <string name="recPic">"Photo de recette"</string>
+  <string name="req">"Obligatoire"</string>
+  <string name="nwCat">"Nouvelle catégorie"</string>
+  <string name="nwYiU">"Nouvelle unité de portion"</string>
+  <string name="rmCmb">"Combinaison retirée"</string>
+  <string name="rmN">"Note retirée"</string>
+  <string name="rmIns">"Instruction retirée"</string>
+  <string name="rmIng">"Ingrédient retiré"</string>
+  <string name="kEdit">"CONTINUER"</string>
+  <string name="disBtn">"IGNORER"</string>
+  <string name="disc">"Cette recette a des modifications non enregistrées. Que voudriez-vous faire ?"</string>
+  <string name="unsaved">"Modifications non enregistrées"</string>
+  <string name="ser">"Chercher"</string>
+  <string name="dBtn">"SUPPRIMER"</string>
+  <string name="sltd">"sélectionné"</string>
+  <string name="recs">"recettes"</string>
+  <string name="delRecsInfo">"Vous êtes sur le point de supprimer définitivement :"</string>
+  <string name="delRecInfo">"Vous êtes sur le point de supprimer définitivement la recette :"</string>
+  <string name="conf">"Confirmer"</string>
+  <string name="rmTry">"Retiré d’Essayer plus tard"</string>
+  <string name="aTry">"Ajouté à Essayer plus tard"</string>
+  <string name="unfavd">"Retiré des Favoris"</string>
+  <string name="favd">"Ajouté aux Favoris"</string>
+  <string name="aFBu">"Ajouter une recette pour effectuer une sauvegarde"</string>
+  <string name="dend">"Accès refusé"</string>
+  <string name="conBtn">"CONTINUER"</string>
+  <string name="nNBtn">"PAS MAINTENANT"</string>
+  <string name="reqAcc">"EnRecipes nécessite une autorisation de stockage pour définir la photo de recette, exporter et importer des données"</string>
+  <string name="grant">"Accorder l’accès"</string>
+  <string name="nLangInfo">"Redémarrez EnRecipes pour utiliser la nouvelle langue"</string>
+  <string name="nThmInfo">"Redémarrez EnRecipes pour utiliser le nouveau thème"</string>
+  <string name="rst">"REDÉMARRER"</string>
+  <string name="appRst">"Redémarrage de l’appli nécessaire"</string>
   <string name="SET">"DÉFINIR"</string>
-  <string name="_ADD_NEW_Zv8FjM">"AJOUTER"</string>
-  <string name="Share">"Partager"</string>
-  <string name="Overview">"Aperçu"</string>
-  <string name="Recipe">"Recette"</string>
-  <string name="Photo">"Photo"</string>
+  <string name="aNBtn">"AJOUTER"</string>
+  <string name="ovw">"Aperçu"</string>
+  <string name="fil">"Recette comme fichier"</string>
+  <string name="rec">"Recette comme texte"</string>
+  <string name="pht">"Photo de recette"</string>
+  <string name="shr">"Partager"</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Ma recette saine"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Ajoutez des recettes pour les voir ici."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Sélectionnez une recette"</string>
-  <string name="ADD">"AJOUTER"</string>
-  <string name="REMOVE">"RETIRER"</string>
-  <string name="CANCEL">"ANNULER"</string>
-  <string name="_Sort_by_Zq01TF">"Trier par"</string>
-  <string name="Step">"Étape"</string>
-  <string name="Item">"Élément"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"AJOUTER UNE NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"AJOUTER UNE COMBINAISON"</string>
-  <string name="Combinations">"Combinaisons"</string>
-  <string name="_ADD_STEP_ZyMPOe">"AJOUTER UNE ÉTAPE"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"AJOUTER UN INGRÉDIENT"</string>
-  <string name="Ingredients">"Ingrédients"</string>
-  <string name="Ingredient">"Ingrédient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Rendement mesuré en"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Quantité de rendement"</string>
-  <string name="_Cooking_time_2w2fEw">"Temps de cuisson"</string>
-  <string name="_Preparation_time_15BfxT">"Temps de préparation"</string>
-  <string name="Category">"Catégorie"</string>
-  <string name="Title">"Titre"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Modifier la recette"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Nouvelle recette"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Auteur·e"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"pour signaler des problèmes, faire des suggestions et des remarques"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Rejoignez le groupe Telegram"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Importer depuis la sauvegarde"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Génère un fichier ZIP de toutes vos données que vous pouvez importer ailleurs."</string>
-  <string name="_Export_a_full_backup_TJfra">"Exporter une sauvegarde complète"</string>
-  <string name="Database">"Base de données"</string>
+  <string name="recTitle">"Ma recette saine"</string>
+  <string name="recListEmp">"Rien ici ! Ajoutez quelques recettes et réessayez"</string>
+  <string name="selRec">"Sélectionner une recette"</string>
+  <string name="aBtn">"AJOUTER"</string>
+  <string name="rmLIInfo">"Les recettes existantes ne seront pas affectées"</string>
+  <string name="rmUInfo">"Vous êtes sur le point de retirer l’unité :"</string>
+  <string name="rmYUInfo">"Vous êtes sur le point de supprimer l\'unité de rendement :"</string>
+  <string name="rmCatInfo">"Vous êtes sur le point de retirer la catégorie :"</string>
+  <string name="rmCuiInfo">"Vous êtes sur le point de supprimer la cuisine :"</string>
+  <string name="rBtn">"RETIRER"</string>
+  <string name="cBtn">"ANNULER"</string>
+  <string name="srt">"Trier par"</string>
+  <string name="stp">"Étape"</string>
+  <string name="it">"Élément"</string>
+  <string name="aNoBtn">"AJOUTER UNE NOTE"</string>
+  <string name="nos">"Notes"</string>
+  <string name="no">"Note"</string>
+  <string name="addCmbBtn">"AJOUTER UNE COMBINAISON"</string>
+  <string name="cmbs">"Combinaisons"</string>
+  <string name="cmb">"Combinaison"</string>
+  <string name="aStpBtn">"AJOUTER UNE ÉTAPE"</string>
+  <string name="inss">"Instructions"</string>
+  <string name="ins">"Instruction"</string>
+  <string name="aIngBtn">"AJOUTER UN INGRÉDIENT"</string>
+  <string name="ings">"Ingrédients"</string>
+  <string name="ing">"Ingrédient"</string>
+  <string name="yieldU">"Unité de portion"</string>
+  <string name="yieldQ">"Quantité de portion"</string>
+  <string name="cookT">"Temps de cuisson"</string>
+  <string name="prepT">"Temps de préparation"</string>
+  <string name="cat">"Catégorie"</string>
+  <string name="title">"Titre"</string>
+  <string name="editRec">"Modifier la recette"</string>
+  <string name="newRec">"Nouvelle recette"</string>
+  <string name="tgInfo">"Pour signaler des problèmes, faire des suggestions et des remarques"</string>
+  <string name="joinTG">"Rejoignez le groupe Telegram"</string>
+  <string name="ver">"Version"</string>
+  <string name="impInfo">"Prend en charge les sauvegardes complètes exportées par cette application"</string>
+  <string name="impBu">"Importer les données"</string>
+  <string name="buInfo">"Génère un fichier ZIP contenant toutes vos données qui peuvent être réimportées"</string>
+  <string name="expBu">"Exporter une sauvegarde complète"</string>
+  <string name="db">"Base de données"</string>
   <string name="Dark">"Sombre"</string>
   <string name="Light">"Clair"</string>
   <string name="Theme">"Thème"</string>
-  <string name="_System_default_Z1jruVS">"Système"</string>
-  <string name="_App_language_DzFsk">"Langue"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Impossible de trouver de telles recettes à essayer plus tard."</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Impossible de trouver de tels favoris."</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Impossible de trouver de telles recettes dans cette catégorie."</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Impossible de trouver de telles recettes."</string>
-  <string name="_No_recipes_found_Z125IxD">"Aucune recette trouvée"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Ajoutez des catégories pour les voir ici."</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Mettez les recettes en favoris pour les voir ici."</string>
-  <string name="_No_favourites_yet_aPSoG">"Pas encore de favoris"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Les recettes que vous voulez essayer plus tard sont listées ici."</string>
-  <string name="_All_done__72KYl">"C’est fini !"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Utilisez le bouton crayon pour ajouter des notes."</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Utilisez le bouton crayon pour ajouter des combinaisons."</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Utilisez le bouton crayon pour ajouter des instructions."</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Utilisez le bouton crayon pour ajouter des ingrédients."</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Utilisez le bouton plus pour en ajouter une."</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Commencez à ajouter vos recettes !"</string>
+  <string name="sysDef">"Selon le système"</string>
+  <string name="lang">"Langue"</string>
+  <string name="intf">"Interface"</string>
+  <string name="noRecsInFtr">"Aucune recette ne correspond à votre recherche dans les recettes filtrées"</string>
+  <string name="noRecsInFavs">"Aucune recette ne correspond à votre recherche dans la liste des favoris"</string>
+  <string name="noRecsInTL">"Aucune recette ne correspond à votre recherche dans la liste Essayer plus tard"</string>
+  <string name="noRecs">"Aucune recette ne correspond à votre recette"</string>
+  <string name="fsList">"Vos recettes favorites sont listées ici"</string>
+  <string name="noFavs">"Pas encore de favoris"</string>
+  <string name="tLInfo">"Les recettes que vous voulez essayer plus tard sont listées ici"</string>
+  <string name="aD">"Terminé !"</string>
+  <string name="pANo">"Utilisez le bouton crayon pour ajouter des notes"</string>
+  <string name="pACmb">"Utilisez le bouton crayon pour ajouter des combinaisons"</string>
+  <string name="pAIns">"Utilisez le bouton crayon pour ajouter des instructions"</string>
+  <string name="pAIng">"Utilisez le bouton crayon pour ajouter des ingrédients"</string>
+  <string name="plsAdd">"Utilisez le bouton plus pour en ajouter une"</string>
+  <string name="strAdd">"Commencez à ajouter vos recettes !"</string>
   <string name="large">"grand"</string>
   <string name="medium">"moyen"</string>
   <string name="small">"petit"</string>
@@ -415,7 +253,6 @@
   <string name="tbsp">"cuillérée"</string>
   <string name="dsp">"c.à.d"</string>
   <string name="tsp">"c.à.c"</string>
-  <string name="Unit">"Unité"</string>
   <string name="unit">"unité"</string>
   <string name="Loaf">"Miche"</string>
   <string name="Patty">"Pâté"</string>
@@ -460,14 +297,21 @@
   <string name="Appetizers">"Hors-d’œuvre"</string>
   <string name="About">"À propos"</string>
   <string name="Settings">"Paramètres"</string>
-  <string name="Categories">"Catégories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Organisateur de repas"</string>
-  <string name="Favourites">"Favoris"</string>
-  <string name="_Try_Later_If7PG">"Essayer plus tard"</string>
+  <string name="grocery">"Liste de courses"</string>
+  <string name="planner">"Organisateur de repas"</string>
+  <string name="favourites">"Favoris"</string>
+  <string name="trylater">"Essayer plus tard"</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>
-  <string name="undo">"Undo"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 d939bbe1..f4c90d0b 100644
--- a/app/resources/Android/src/main/res/values-hi/strings.xml
+++ b/app/resources/Android/src/main/res/values-hi/strings.xml
@@ -300,174 +300,18 @@
   <string name="planner">""</string>
   <string name="favourites">""</string>
   <string name="trylater">""</string>
-  <string name="EnRecipes">""</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
   <string name="undo">"Undo"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</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 d939bbe1..6d350ea0 100644
--- a/app/resources/Android/src/main/res/values-id/strings.xml
+++ b/app/resources/Android/src/main/res/values-id/strings.xml
@@ -1,473 +1,317 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="trnsl">""</string>
-  <string name="SAT">""</string>
-  <string name="FRI">""</string>
-  <string name="THU">""</string>
-  <string name="WED">""</string>
-  <string name="TUE">""</string>
-  <string name="MON">""</string>
-  <string name="SUN">""</string>
-  <string name="December">""</string>
-  <string name="November">""</string>
-  <string name="October">""</string>
-  <string name="September">""</string>
-  <string name="August">""</string>
-  <string name="July">""</string>
-  <string name="June">""</string>
-  <string name="May">""</string>
-  <string name="April">""</string>
-  <string name="March">""</string>
-  <string name="February">""</string>
-  <string name="January">""</string>
-  <string name="trySer">""</string>
-  <string name="help">""</string>
-  <string name="appInfo">""</string>
-  <string name="donate">""</string>
-  <string name="invFile">""</string>
-  <string name="buSuc">""</string>
-  <string name="buMod">""</string>
-  <string name="buEmp">""</string>
-  <string name="buInc">""</string>
-  <string name="impFail">""</string>
-  <string name="recRm">""</string>
-  <string name="untRec">""</string>
-  <string name="stars">""</string>
-  <string name="Created">""</string>
-  <string name="_Filtered_recipes_Z1alhhu">""</string>
-  <string name="OK">""</string>
-  <string name="recU">""</string>
-  <string name="recE">""</string>
-  <string name="recI">""</string>
-  <string name="recF">""</string>
-  <string name="impSuc">""</string>
-  <string name="tsInfo">""</string>
-  <string name="ts">""</string>
-  <string name="noTs">""</string>
-  <string name="allTs">""</string>
-  <string name="allCats">""</string>
-  <string name="Vietnamese">""</string>
-  <string name="Turkish">""</string>
-  <string name="Thai">""</string>
-  <string name="Swedish">""</string>
-  <string name="_Sri_Lankan_Z7GfBa">""</string>
-  <string name="Spanish">""</string>
-  <string name="Scottish">""</string>
-  <string name="Russian">""</string>
-  <string name="Portuguese">""</string>
-  <string name="Nigerian">""</string>
-  <string name="Mexican">""</string>
-  <string name="Korean">""</string>
-  <string name="Kenyan">""</string>
-  <string name="Jewish">""</string>
-  <string name="Japanese">""</string>
-  <string name="Jamaican">""</string>
-  <string name="Italian">""</string>
-  <string name="Irish">""</string>
-  <string name="Indian">""</string>
-  <string name="Greek">""</string>
-  <string name="German">""</string>
-  <string name="French">""</string>
-  <string name="Filipino">""</string>
-  <string name="English">""</string>
-  <string name="Egyptian">""</string>
-  <string name="Danish">""</string>
-  <string name="Chinese">""</string>
-  <string name="British">""</string>
-  <string name="Brazilian">""</string>
-  <string name="American">""</string>
-  <string name="allCuis">""</string>
-  <string name="cuis">""</string>
-  <string name="cui">""</string>
-  <string name="Unit">""</string>
-  <string name="newUnit">""</string>
-  <string name="newCui">""</string>
-  <string name="Challenging">""</string>
-  <string name="Moderate">""</string>
-  <string name="Easy">""</string>
-  <string name="_Oldest_first_Z6cq4h">""</string>
-  <string name="_Newest_first_2Sb3c">""</string>
-  <string name="_Last_updated_Z2gEbLD">""</string>
-  <string name="_Difficulty_level_cSL5d">""</string>
-  <string name="Rating">""</string>
-  <string name="_Slowest_first_hHjY6">""</string>
-  <string name="_Quickest_first_Z1CpP7N">""</string>
-  <string name="resNF">""</string>
-  <string name="restDone">""</string>
-  <string name="restInfo">""</string>
-  <string name="restUL">""</string>
-  <string name="restYUL">""</string>
-  <string name="restCatL">""</string>
-  <string name="restCuiL">""</string>
-  <string name="rest">""</string>
-  <string name="sVwInfo">""</string>
-  <string name="sVw">""</string>
-  <string name="opts">""</string>
-  <string name="guide">""</string>
-  <string name="priv">""</string>
-  <string name="gh">""</string>
-  <string name="appCrd">""</string>
-  <string name="vrfy">""</string>
-  <string name="ltAgo">""</string>
-  <string name="mAgo">""</string>
-  <string name="wAgo">""</string>
-  <string name="dAgo">""</string>
-  <string name="yesterday">""</string>
-  <string name="today">""</string>
-  <string name="triedInfo">""</string>
-  <string name="snacks">""</string>
-  <string name="dinner">""</string>
-  <string name="lunch">""</string>
-  <string name="breakfast">""</string>
-  <string name="cPic">""</string>
-  <string name="repBtn">""</string>
-  <string name="recPic">""</string>
-  <string name="req">""</string>
-  <string name="nwCat">""</string>
-  <string name="nwYiU">""</string>
-  <string name="rmCmb">""</string>
-  <string name="rmN">""</string>
-  <string name="rmIns">""</string>
-  <string name="rmIng">""</string>
-  <string name="kEdit">""</string>
-  <string name="disBtn">""</string>
-  <string name="disc">""</string>
-  <string name="unsaved">""</string>
-  <string name="ser">""</string>
-  <string name="dBtn">""</string>
-  <string name="sltd">""</string>
-  <string name="recs">""</string>
-  <string name="delRecsInfo">""</string>
-  <string name="delRecInfo">""</string>
-  <string name="conf">""</string>
-  <string name="rmTry">""</string>
-  <string name="aTry">""</string>
-  <string name="unfavd">""</string>
-  <string name="favd">""</string>
-  <string name="aFBu">""</string>
-  <string name="dend">""</string>
-  <string name="conBtn">""</string>
-  <string name="nNBtn">""</string>
-  <string name="reqAcc">""</string>
-  <string name="grant">""</string>
-  <string name="nLangInfo">""</string>
-  <string name="nThmInfo">""</string>
-  <string name="rst">""</string>
-  <string name="appRst">""</string>
-  <string name="SET">""</string>
-  <string name="aNBtn">""</string>
-  <string name="ovw">""</string>
-  <string name="fil">""</string>
-  <string name="rec">""</string>
-  <string name="pht">""</string>
-  <string name="shr">""</string>
-  <string name="min">""</string>
-  <string name="hr">""</string>
-  <string name="recTitle">""</string>
-  <string name="recListEmp">""</string>
-  <string name="selRec">""</string>
-  <string name="aBtn">""</string>
-  <string name="rmLIInfo">""</string>
-  <string name="rmUInfo">""</string>
-  <string name="rmYUInfo">""</string>
-  <string name="rmCatInfo">""</string>
-  <string name="rmCuiInfo">""</string>
-  <string name="rBtn">""</string>
-  <string name="cBtn">""</string>
-  <string name="srt">""</string>
-  <string name="stp">""</string>
-  <string name="it">""</string>
-  <string name="aNoBtn">""</string>
-  <string name="nos">""</string>
-  <string name="no">""</string>
-  <string name="addCmbBtn">""</string>
-  <string name="cmbs">""</string>
-  <string name="cmb">""</string>
-  <string name="aStpBtn">""</string>
-  <string name="inss">""</string>
-  <string name="ins">""</string>
-  <string name="aIngBtn">""</string>
-  <string name="ings">""</string>
-  <string name="ing">""</string>
-  <string name="yieldU">""</string>
-  <string name="yieldQ">""</string>
-  <string name="cookT">""</string>
-  <string name="prepT">""</string>
-  <string name="cat">""</string>
-  <string name="title">""</string>
-  <string name="editRec">""</string>
-  <string name="newRec">""</string>
-  <string name="tgInfo">""</string>
-  <string name="joinTG">""</string>
-  <string name="ver">""</string>
-  <string name="impInfo">""</string>
-  <string name="impBu">""</string>
-  <string name="buInfo">""</string>
-  <string name="expBu">""</string>
-  <string name="db">""</string>
-  <string name="Dark">""</string>
-  <string name="Light">""</string>
-  <string name="Theme">""</string>
-  <string name="sysDef">""</string>
-  <string name="lang">""</string>
-  <string name="intf">""</string>
-  <string name="noRecsInFtr">""</string>
-  <string name="noRecsInFavs">""</string>
-  <string name="noRecsInTL">""</string>
-  <string name="noRecs">""</string>
-  <string name="fsList">""</string>
-  <string name="noFavs">""</string>
-  <string name="tLInfo">""</string>
-  <string name="aD">""</string>
-  <string name="pANo">""</string>
-  <string name="pACmb">""</string>
-  <string name="pAIns">""</string>
-  <string name="pAIng">""</string>
-  <string name="plsAdd">""</string>
-  <string name="strAdd">""</string>
-  <string name="large">""</string>
-  <string name="medium">""</string>
-  <string name="small">""</string>
-  <string name="stick">""</string>
-  <string name="dozen">""</string>
-  <string name="drop">""</string>
-  <string name="pinch">""</string>
-  <string name="piece">""</string>
-  <string name="clove">""</string>
-  <string name="leaf">""</string>
-  <string name="in">""</string>
-  <string name="cm">""</string>
-  <string name="kg">""</string>
-  <string name="g">""</string>
-  <string name="mg">""</string>
-  <string name="lb">""</string>
-  <string name="oz">""</string>
-  <string name="l">""</string>
-  <string name="ml">""</string>
-  <string name="gal">""</string>
-  <string name="qt">""</string>
-  <string name="pt">""</string>
-  <string name="cup">""</string>
-  <string name="_fl_oz_72kqu">""</string>
-  <string name="tbsp">""</string>
-  <string name="dsp">""</string>
-  <string name="tsp">""</string>
-  <string name="unit">""</string>
-  <string name="Loaf">""</string>
-  <string name="Patty">""</string>
-  <string name="Roll">""</string>
-  <string name="Litre">""</string>
-  <string name="Millilitre">""</string>
-  <string name="Gallon">""</string>
-  <string name="Cup">""</string>
-  <string name="Kilogram">""</string>
-  <string name="Gram">""</string>
-  <string name="Pound">""</string>
-  <string name="Ounce">""</string>
-  <string name="_Fluid_Ounce_bd10L">""</string>
-  <string name="Tablespoon">""</string>
-  <string name="Teaspoon">""</string>
-  <string name="Piece">""</string>
-  <string name="Serving">""</string>
-  <string name="Vegetarian">""</string>
-  <string name="Vegan">""</string>
-  <string name="Undefined">""</string>
-  <string name="Soups">""</string>
-  <string name="Snacks">""</string>
-  <string name="_Side_dishes_Z1Et4Vg">""</string>
-  <string name="Seafood">""</string>
-  <string name="Sauces">""</string>
-  <string name="Salads">""</string>
-  <string name="Rice">""</string>
-  <string name="Poultry">""</string>
-  <string name="Pasta">""</string>
-  <string name="Noodles">""</string>
-  <string name="Meat">""</string>
-  <string name="_Main_dishes_u6RGQ">""</string>
-  <string name="Lunch">""</string>
-  <string name="Healthy">""</string>
-  <string name="Drinks">""</string>
-  <string name="Dinner">""</string>
-  <string name="Desserts">""</string>
-  <string name="Breakfast">""</string>
-  <string name="Breads">""</string>
-  <string name="Beverages">""</string>
-  <string name="Barbecue">""</string>
-  <string name="Appetizers">""</string>
-  <string name="About">""</string>
-  <string name="Settings">""</string>
-  <string name="grocery">""</string>
-  <string name="planner">""</string>
-  <string name="favourites">""</string>
-  <string name="trylater">""</string>
-  <string name="EnRecipes">""</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</string>
   <string name="undo">"Undo"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="trnsl">"Terjemah"</string>
+  <string name="SAT">"SAB"</string>
+  <string name="FRI">"JUM"</string>
+  <string name="THU">"KAM"</string>
+  <string name="WED">"RAB"</string>
+  <string name="TUE">"SEL"</string>
+  <string name="MON">"SEN"</string>
+  <string name="SUN">"MIN"</string>
+  <string name="December">"Desember"</string>
+  <string name="November">"November"</string>
+  <string name="October">"Oktober"</string>
+  <string name="September">"September"</string>
+  <string name="August">"Agustus"</string>
+  <string name="July">"Juli"</string>
+  <string name="June">"Juni"</string>
+  <string name="May">"Mei"</string>
+  <string name="April">"April"</string>
+  <string name="March">"Maret"</string>
+  <string name="February">"Februari"</string>
+  <string name="January">"Januari"</string>
+  <string name="trySer">"Cari di semua resep?"</string>
+  <string name="help">"Bantuan"</string>
+  <string name="appInfo">"EnRecipes adalah buku resep digital sumber terbuka, ramah privasi yang memungkinkan anda untuk membuat, mengatur dan berbagi resep"</string>
+  <string name="donate">"Donasi"</string>
+  <string name="invFile">"File tidak valid"</string>
+  <string name="buSuc">"Cadangan berhasil disimpan di folder Download"</string>
+  <string name="buMod">"Berkas cadangan telah dimodifikasi disuatu tempat"</string>
+  <string name="buEmp">"Berkas cadangan kosong"</string>
+  <string name="buInc">"File cadangan rusak atau korup"</string>
+  <string name="impFail">"Impor gagal"</string>
+  <string name="recRm">"Resep dihapus"</string>
+  <string name="untRec">"Resep tanpa judul"</string>
+  <string name="stars">"Peringkat bintang"</string>
+  <string name="Created">"Dibuat"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Resep yang difilter"</string>
+  <string name="OK">"Baik"</string>
+  <string name="recU">"resep diperbarui"</string>
+  <string name="recE">"resep sudah ada"</string>
+  <string name="recI">"resep diimpor"</string>
+  <string name="recF">"Resep ditemukan"</string>
+  <string name="impSuc">"Impor berhasil"</string>
+  <string name="tsInfo">"pisahkan dengan spasi"</string>
+  <string name="ts">"Tag"</string>
+  <string name="noTs">"Tidak ada tag yang tersedia"</string>
+  <string name="allTs">"Semua tag"</string>
+  <string name="allCats">"Semua kategori"</string>
+  <string name="Vietnamese">"Vietnam"</string>
+  <string name="Turkish">"Turki"</string>
+  <string name="Thai">"Thailand"</string>
+  <string name="Swedish">"Swedia"</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri lanka"</string>
+  <string name="Spanish">"Spanyol"</string>
+  <string name="Scottish">"Skotlandia"</string>
+  <string name="Russian">"Russia"</string>
+  <string name="Portuguese">"Portugal"</string>
+  <string name="Nigerian">"Nigeria"</string>
+  <string name="Mexican">"Meksiko"</string>
+  <string name="Korean">"Korea"</string>
+  <string name="Kenyan">"Kenya"</string>
+  <string name="Jewish">"Yahudi"</string>
+  <string name="Japanese">"Jepang"</string>
+  <string name="Jamaican">"Jamaika"</string>
+  <string name="Italian">"Italia"</string>
+  <string name="Irish">"Irlandia"</string>
+  <string name="Indian">"India"</string>
+  <string name="Greek">"Yunani"</string>
+  <string name="German">"Jerman"</string>
+  <string name="French">"Perancis"</string>
+  <string name="Filipino">"Filipina"</string>
+  <string name="English">"Inggris"</string>
+  <string name="Egyptian">"Mesir"</string>
+  <string name="Danish">"Denmark"</string>
+  <string name="Chinese">"Cina"</string>
+  <string name="British">"Inggris raya"</string>
+  <string name="Brazilian">"Brazil"</string>
+  <string name="American">"Amerika"</string>
+  <string name="allCuis">"Semua hidangan"</string>
+  <string name="cuis">"Hidangan-hidangan"</string>
+  <string name="cui">"Hidangan"</string>
+  <string name="Unit">"Satuan"</string>
+  <string name="newUnit">"Satuan baru"</string>
+  <string name="newCui">"Hidangan baru"</string>
+  <string name="Challenging">"Menantang"</string>
+  <string name="Moderate">"Sedang"</string>
+  <string name="Easy">"Mudah"</string>
+  <string name="_Oldest_first_Z6cq4h">"Yang terlama"</string>
+  <string name="_Newest_first_2Sb3c">"Yang terbaru"</string>
+  <string name="_Last_updated_Z2gEbLD">"Terakhir diperbarui"</string>
+  <string name="_Difficulty_level_cSL5d">"Tingkat kesulitan"</string>
+  <string name="Rating">"Penilaian"</string>
+  <string name="_Slowest_first_hHjY6">"Paling lama"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Paling cepat"</string>
+  <string name="resNF">"Resep tidak ditemukan"</string>
+  <string name="restDone">"Setel ulang selesai"</string>
+  <string name="restInfo">"Menyetel ulang daftar dapat menghapus entri yang anda buat dan memulihkan entri default. Resep yang sudah ada tidak akan terpengaruh."</string>
+  <string name="restUL">"Setel ulang daftar satuan"</string>
+  <string name="restYUL">"Setel ulang daftar satuan hasil"</string>
+  <string name="restCatL">"Setel ulang daftar kategori"</string>
+  <string name="restCuiL">"Setel ulang daftar hidangan"</string>
+  <string name="rest">"Setel ulang"</string>
+  <string name="sVwInfo">"Membantu anda untuk memilih apa yang dimasak ketika anda tidak bisa menentukan"</string>
+  <string name="sVw">"Kocok untuk melihat resep acak"</string>
+  <string name="opts">"Pilihan"</string>
+  <string name="guide">"Panduan Pengguna"</string>
+  <string name="priv">"Kebijakan Privasi"</string>
+  <string name="gh">"Lihat di GitHub"</string>
+  <string name="appCrd">"Dibagikan via EnRecipes. Dapatkan di F-Droid, IzzyOnDroid atau Play Store."</string>
+  <string name="vrfy">"Memverifikasi"</string>
+  <string name="ltAgo">"yang dahulu"</string>
+  <string name="mAgo">"Bulan yang lalu"</string>
+  <string name="wAgo">"minggu yang lalu"</string>
+  <string name="dAgo">"beberapa hari lalu"</string>
+  <string name="yesterday">"kemarin"</string>
+  <string name="today">"hari ini"</string>
+  <string name="triedInfo">"Anda telah mencoba resep ini:"</string>
+  <string name="snacks">"camilan"</string>
+  <string name="dinner">"makan malam"</string>
+  <string name="lunch">"makan siang"</string>
+  <string name="breakfast">"Sarapan"</string>
+  <string name="cPic">"Pangkas foto"</string>
+  <string name="repBtn">"GANTI FOTO"</string>
+  <string name="recPic">"Foto resep"</string>
+  <string name="req">"Diperlukan"</string>
+  <string name="nwCat">"Kategori baru"</string>
+  <string name="nwYiU">"Satuan hasil baru"</string>
+  <string name="rmCmb">"Kombinasi dihapus"</string>
+  <string name="rmN">"Catatan dihapus"</string>
+  <string name="rmIns">"Instruksi dihapus"</string>
+  <string name="rmIng">"Bahan baku dihapus"</string>
+  <string name="kEdit">"TETAP MENYUNTING"</string>
+  <string name="disBtn">"BUANG"</string>
+  <string name="disc">"Resep ini memiliki perubahan yang belum disimpan. Apa yang anda ingin lakukan?"</string>
+  <string name="unsaved">"Perubahan yang belum disimpan"</string>
+  <string name="ser">"Cari"</string>
+  <string name="dBtn">"HAPUS"</string>
+  <string name="sltd">"Dipilih"</string>
+  <string name="recs">"resep"</string>
+  <string name="delRecsInfo">"Anda akan mengapus secara permanen:"</string>
+  <string name="delRecInfo">"Anda akan menghapus permanen resep:"</string>
+  <string name="conf">"Konfirmasi"</string>
+  <string name="rmTry">"Dihapus dari Coba lain kali"</string>
+  <string name="aTry">"Ditambahkan ke coba lain kali"</string>
+  <string name="unfavd">"Dihapus dari favorit"</string>
+  <string name="favd">"Ditambahkan ke favorit"</string>
+  <string name="aFBu">"Tambahkan resep untuk melakukan pencadangan"</string>
+  <string name="dend">"Akses ditolak"</string>
+  <string name="conBtn">"Lanjutkan"</string>
+  <string name="nNBtn">"Tidak sekarang"</string>
+  <string name="reqAcc">"EnRecipes membutuhkan izin penyimpanan untuk menyimpan foto resep, ekspor dan impor data"</string>
+  <string name="grant">"Izinkan akses"</string>
+  <string name="nLangInfo">"Mulai ulang EnRecipes untuk menggunakan bahasa baru"</string>
+  <string name="nThmInfo">"Mulai ulang EnRecipes untuk menggunakan tema baru"</string>
+  <string name="rst">"Mulai ulang"</string>
+  <string name="appRst">"Aplikasi perlu dimulai ulang"</string>
+  <string name="SET">"ATUR"</string>
+  <string name="aNBtn">"Tambah baru"</string>
+  <string name="ovw">"Gambaran"</string>
+  <string name="fil">"Resep berupa file"</string>
+  <string name="rec">"Resep berupa teks"</string>
+  <string name="pht">"Foto resep"</string>
+  <string name="shr">"Bagikan"</string>
+  <string name="min">"min"</string>
+  <string name="hr">"jam"</string>
+  <string name="recTitle">"Resep sehatku"</string>
+  <string name="recListEmp">"Di sini kosong! Silakan tambah beberapa resep dan coba lagi"</string>
+  <string name="selRec">"Pilih resep"</string>
+  <string name="aBtn">"Tambah"</string>
+  <string name="rmLIInfo">"Resep yang sudah ada tidak akan terpengaruh"</string>
+  <string name="rmUInfo">"Anda akan menghapus satuan:"</string>
+  <string name="rmYUInfo">"Anda akan menghapus satuan hasil:"</string>
+  <string name="rmCatInfo">"Anda akan menghapus kategori:"</string>
+  <string name="rmCuiInfo">"Anda akan menghapus hidangan:"</string>
+  <string name="rBtn">"HAPUS"</string>
+  <string name="cBtn">"BATALKAN"</string>
+  <string name="srt">"Urutkan dengan"</string>
+  <string name="stp">"Langkah"</string>
+  <string name="it">"Item"</string>
+  <string name="aNoBtn">"TAMBAH CATATAN"</string>
+  <string name="nos">"Catatan-catatan"</string>
+  <string name="no">"Catatan"</string>
+  <string name="addCmbBtn">"TAMBAH KOMBINASI"</string>
+  <string name="cmbs">"Kombinasi-kombinasi"</string>
+  <string name="cmb">"Kombinasi"</string>
+  <string name="aStpBtn">"TAMBAH LANGKAH"</string>
+  <string name="inss">"Instruksi-instruksi"</string>
+  <string name="ins">"Instruksi"</string>
+  <string name="aIngBtn">"TAMBAH BAHAN"</string>
+  <string name="ings">"Bahan-bahan"</string>
+  <string name="ing">"Bahan"</string>
+  <string name="yieldU">"Satuan hasil"</string>
+  <string name="yieldQ">"Kuantitas hasil"</string>
+  <string name="cookT">"Waktu memasak"</string>
+  <string name="prepT">"Waktu persiapan"</string>
+  <string name="cat">"Kategori"</string>
+  <string name="title">"Judul"</string>
+  <string name="editRec">"Sunting resep"</string>
+  <string name="newRec">"Resep baru"</string>
+  <string name="tgInfo">"Untuk melaporkan masalah, saran dan umpan balik"</string>
+  <string name="joinTG">"Gabung grup Telegram"</string>
+  <string name="ver">"Versi"</string>
+  <string name="impInfo">"Mendukung cadangan penuh yang diekspor oleh aplikasi ini"</string>
+  <string name="impBu">"Impor data"</string>
+  <string name="buInfo">"Membuat file ZIP yang berisi semua data Anda yang dapat diimpor kembali"</string>
+  <string name="expBu">"Ekspor cadangan penuh"</string>
+  <string name="db">"Basisdata"</string>
+  <string name="Dark">"Gelap"</string>
+  <string name="Light">"Cerah"</string>
+  <string name="Theme">"Tema"</string>
+  <string name="sysDef">"Default sistem"</string>
+  <string name="lang">"Bahasa"</string>
+  <string name="intf">"Tampilan"</string>
+  <string name="noRecsInFtr">"Tidak ada resep yang cocok dengan pencarian Anda di resep yang Difilter"</string>
+  <string name="noRecsInFavs">"Tidak ada resep yang cocok dengan pencarian Anda di daftar Favorit"</string>
+  <string name="noRecsInTL">"Tidak ada resep yang cocok dengan pencarian Anda dalam daftar Coba Lain kali"</string>
+  <string name="noRecs">"Tidak ada resep yang cocok dengan pencarian anda"</string>
+  <string name="fsList">"Resep favorit Anda tercantum di sini"</string>
+  <string name="noFavs">"Belum ada favorit"</string>
+  <string name="tLInfo">"Resep yang ingin Anda coba nanti tercantum di sini"</string>
+  <string name="aD">"Semua beres!"</string>
+  <string name="pANo">"Gunakan tombol pensil untuk menambahkan catatan"</string>
+  <string name="pACmb">"Gunakan tombol pensil untuk menambahkan kombinasi"</string>
+  <string name="pAIns">"Gunakan tombol pensil untuk menambahkan instruksi"</string>
+  <string name="pAIng">"Gunakan tombol pensil untuk menambahkan bahan baku"</string>
+  <string name="plsAdd">"Gunakan tombol + untuk menambahkan"</string>
+  <string name="strAdd">"Mulai tambahkan resep Anda!"</string>
+  <string name="large">"besar"</string>
+  <string name="medium">"sedang"</string>
+  <string name="small">"kecil"</string>
+  <string name="stick">"batang"</string>
+  <string name="dozen">"lusin"</string>
+  <string name="drop">"tetes"</string>
+  <string name="pinch">"jumput"</string>
+  <string name="piece">"buah"</string>
+  <string name="clove">"butir"</string>
+  <string name="leaf">"lembar"</string>
+  <string name="in">"in"</string>
+  <string name="cm">"cm"</string>
+  <string name="kg">"kg"</string>
+  <string name="g">"g"</string>
+  <string name="mg">"mg"</string>
+  <string name="lb">"lb"</string>
+  <string name="oz">"ons"</string>
+  <string name="l">"ltr"</string>
+  <string name="ml">"ml"</string>
+  <string name="gal">"gal"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="cup">"cup"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="tbsp">"sdm"</string>
+  <string name="dsp">"dstspn"</string>
+  <string name="tsp">"sdt"</string>
+  <string name="unit">"Satuan"</string>
+  <string name="Loaf">"Papan roti"</string>
+  <string name="Patty">"Patty"</string>
+  <string name="Roll">"Gulung"</string>
+  <string name="Litre">"Liter"</string>
+  <string name="Millilitre">"Mililiter"</string>
+  <string name="Gallon">"Galon"</string>
+  <string name="Cup">"Cangkir"</string>
+  <string name="Kilogram">"Kilogram"</string>
+  <string name="Gram">"Gram"</string>
+  <string name="Pound">"Pon"</string>
+  <string name="Ounce">"Ons"</string>
+  <string name="_Fluid_Ounce_bd10L">"Ons Cairan"</string>
+  <string name="Tablespoon">"Sendok makan"</string>
+  <string name="Teaspoon">"Sendok teh"</string>
+  <string name="Piece">"Bagian"</string>
+  <string name="Serving">"Penyajian"</string>
+  <string name="Vegetarian">"Vegetarian"</string>
+  <string name="Vegan">"Vegan"</string>
+  <string name="Undefined">"Belum terdefinisi"</string>
+  <string name="Soups">"Sup"</string>
+  <string name="Snacks">"Camilan"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"Lauk pauk"</string>
+  <string name="Seafood">"Hidangan laut"</string>
+  <string name="Sauces">"Saus"</string>
+  <string name="Salads">"Salad"</string>
+  <string name="Rice">"Nasi"</string>
+  <string name="Poultry">"Unggas"</string>
+  <string name="Pasta">"Pasta"</string>
+  <string name="Noodles">"Mie"</string>
+  <string name="Meat">"Daging"</string>
+  <string name="_Main_dishes_u6RGQ">"Hidangan utama"</string>
+  <string name="Lunch">"Makan siang"</string>
+  <string name="Healthy">"Makanan sehat"</string>
+  <string name="Drinks">"Minuman"</string>
+  <string name="Dinner">"Makan malam"</string>
+  <string name="Desserts">"Makanan pencuci mulut"</string>
+  <string name="Breakfast">"Sarapan"</string>
+  <string name="Breads">"Roti"</string>
+  <string name="Beverages">"Minuman"</string>
+  <string name="Barbecue">"barbekyu"</string>
+  <string name="Appetizers">"Hidangan pembuka"</string>
+  <string name="About">"Tentang"</string>
+  <string name="Settings">"Pengaturan"</string>
+  <string name="grocery">"Daftar belanjaan"</string>
+  <string name="planner">"Perencana diet"</string>
+  <string name="favourites">"Favorit"</string>
+  <string name="trylater">"Coba lagi"</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 0322a09e..61513344 100644
--- a/app/resources/Android/src/main/res/values-it/strings.xml
+++ b/app/resources/Android/src/main/res/values-it/strings.xml
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Annulla"</string>
   <string name="trnsl">"Traduci"</string>
-  <string name="reqAcc">"EnRecipes richiede l\'autorizzazione all\'archiviazione per impostare la foto della ricetta, esportare e importare i dati"</string>
-  <string name="trySer">"CERCARE IN TUTTE LE RICETTE?"</string>
-  <string name="January">"gennaio"</string>
-  <string name="February">"febbraio"</string>
-  <string name="March">"marzo"</string>
-  <string name="April">"aprile"</string>
-  <string name="May">"maggio"</string>
-  <string name="June">"giugno"</string>
-  <string name="July">"luglio"</string>
-  <string name="August">"agosto"</string>
-  <string name="September">"settembre"</string>
-  <string name="October">"ottobre"</string>
-  <string name="November">"novembre"</string>
-  <string name="December">"dicembre"</string>
-  <string name="SUN">"dom"</string>
-  <string name="MON">"lun"</string>
-  <string name="TUE">"mar"</string>
-  <string name="WED">"mer"</string>
-  <string name="THU">"gio"</string>
-  <string name="FRI">"ven"</string>
   <string name="SAT">"sab"</string>
-  <string name="sltd">"selezionato"</string>
-  <string name="delRecsInfo">"Stai per eliminare definitivamente:"</string>
-  <string name="recs">"ricette"</string>
-  <string name="fil">"Ricetta come file"</string>
+  <string name="FRI">"ven"</string>
+  <string name="THU">"gio"</string>
+  <string name="WED">"mer"</string>
+  <string name="TUE">"mar"</string>
+  <string name="MON">"lun"</string>
+  <string name="SUN">"dom"</string>
+  <string name="December">"dicembre"</string>
+  <string name="November">"novembre"</string>
+  <string name="October">"ottobre"</string>
+  <string name="September">"settembre"</string>
+  <string name="August">"agosto"</string>
+  <string name="July">"luglio"</string>
+  <string name="June">"giugno"</string>
+  <string name="May">"maggio"</string>
+  <string name="April">"aprile"</string>
+  <string name="March">"marzo"</string>
+  <string name="February">"febbraio"</string>
+  <string name="January">"gennaio"</string>
+  <string name="trySer">"CERCARE IN TUTTE LE RICETTE?"</string>
   <string name="help">"Aiuto"</string>
   <string name="appInfo">"EnRecipes è un ricettario digitale a codice aperto e rispettoso della riservatezza che ti consente di creare, gestire e condividere le tue ricette"</string>
   <string name="donate">"Dona"</string>
@@ -140,8 +136,10 @@
   <string name="unsaved">"Modifiche non salvate"</string>
   <string name="ser">"Cerca"</string>
   <string name="dBtn">"ELIMINA"</string>
+  <string name="sltd">"selezionato"</string>
+  <string name="recs">"ricette"</string>
+  <string name="delRecsInfo">"Stai per eliminare definitivamente:"</string>
   <string name="delRecInfo">"Stai per eliminare definitivamente la ricetta:"</string>
-  <string name="delRec">""</string>
   <string name="conf">"Conferma"</string>
   <string name="rmTry">"Rimosso da Prova più tardi"</string>
   <string name="aTry">"Aggiunta a Prova più tardi"</string>
@@ -151,9 +149,7 @@
   <string name="dend">"Accesso negato"</string>
   <string name="conBtn">"CONTINUA"</string>
   <string name="nNBtn">"NON ADESSO"</string>
-  <string name="phtReq">""</string>
-  <string name="impReq">""</string>
-  <string name="expReq">""</string>
+  <string name="reqAcc">"EnRecipes richiede l\'autorizzazione all\'archiviazione per impostare la foto della ricetta, esportare e importare i dati"</string>
   <string name="grant">"Concedi l\'accesso"</string>
   <string name="nLangInfo">"Riavvia EnRecipes per utilizzare la nuova lingua"</string>
   <string name="nThmInfo">"Riavvia EnRecipes per utilizzare il nuovo tema"</string>
@@ -161,10 +157,11 @@
   <string name="appRst">"Riavvio dell\'app necessario"</string>
   <string name="SET">"IMPOSTA"</string>
   <string name="aNBtn">"AGGIUNGI NUOVO"</string>
-  <string name="shr">"Condividi"</string>
   <string name="ovw">"Panoramica"</string>
+  <string name="fil">"Ricetta come file"</string>
   <string name="rec">"Ricetta come testo"</string>
   <string name="pht">"Foto ricetta"</string>
+  <string name="shr">"Condividi"</string>
   <string name="min">"min"</string>
   <string name="hr">"h"</string>
   <string name="recTitle">"La mia ricetta sana"</string>
@@ -215,10 +212,9 @@
   <string name="sysDef">"Predefinito del sistema"</string>
   <string name="lang">"Lingua"</string>
   <string name="intf">"Interfaccia"</string>
-  <string name="noRecsHint">""</string>
   <string name="noRecsInFtr">"Nessuna ricetta corrisponde alla tua ricerca nelle ricette filtrate"</string>
-  <string name="noRecsInTL">"Nessuna ricetta corrisponde alla tua ricerca nell’elenco Prova più tardi"</string>
   <string name="noRecsInFavs">"Nessuna ricetta corrisponde alla tua ricerca nell’elenco dei preferiti"</string>
+  <string name="noRecsInTL">"Nessuna ricetta corrisponde alla tua ricerca nell’elenco Prova più tardi"</string>
   <string name="noRecs">"Nessuna ricetta corrisponde alla tua ricerca"</string>
   <string name="fsList">"Le tue ricette preferite sono elencate qui"</string>
   <string name="noFavs">"Ancora nessun preferito"</string>
@@ -306,168 +302,16 @@
   <string name="favourites">"Preferiti"</string>
   <string name="trylater">"Prova più tardi"</string>
   <string name="EnRecipes">"EnRecipes"</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</string>
-  <string name="undo">"Undo"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
+  <string name="_app_name_1k3Sbz">"EnRecipes"</string>
+  <string name="app_name">"EnRecipes"</string>
+  <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 d939bbe1..f4c90d0b 100644
--- a/app/resources/Android/src/main/res/values-kn/strings.xml
+++ b/app/resources/Android/src/main/res/values-kn/strings.xml
@@ -300,174 +300,18 @@
   <string name="planner">""</string>
   <string name="favourites">""</string>
   <string name="trylater">""</string>
-  <string name="EnRecipes">""</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
   <string name="undo">"Undo"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</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 d939bbe1..f4c90d0b 100644
--- a/app/resources/Android/src/main/res/values-ml/strings.xml
+++ b/app/resources/Android/src/main/res/values-ml/strings.xml
@@ -300,174 +300,18 @@
   <string name="planner">""</string>
   <string name="favourites">""</string>
   <string name="trylater">""</string>
-  <string name="EnRecipes">""</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
   <string name="undo">"Undo"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</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 5400307b..53b8c61a 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,205 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Angre"</string>
   <string name="trnsl">"Oversett"</string>
-  <string name="trylater">"Prøv igjen senere"</string>
-  <string name="favourites">"Favoritter"</string>
-  <string name="planner">"Måltidsplanlegger"</string>
-  <string name="grocery">"Handleliste"</string>
-  <string name="plsAdd">"Bruk \"+\"-knappen for å legge til en"</string>
-  <string name="strAdd">"Begynn å legge til oppskriftene dine."</string>
-  <string name="pAIng">"Bruk blyantknappen for å legge til ingredienser"</string>
-  <string name="pAIns">"Bruk blyantknappen for å legge til instrukser"</string>
-  <string name="pACmb">"Bruk blyantknappen for å legge til kombinasjoner"</string>
-  <string name="pANo">"Bruk blyantknappen for å legge til notiser"</string>
-  <string name="aD">"Ferdig."</string>
-  <string name="tLInfo">"Oppskrifter du ønsker å prøve senere listes opp her"</string>
-  <string name="noFavs">"Ingen favoritter enda"</string>
-  <string name="fsList">"Dine favorittoppskrifter listes opp her"</string>
-  <string name="noRecs">"Ingen oppskrifter samsvarte med søket ditt"</string>
-  <string name="noRecsInTL">"Ingen oppskrifter samsvarte med søke ditt i «Prøves senere»-listen"</string>
-  <string name="noRecsInFavs">"Ingen oppskrifter samsvarer med ditt søk i favorittlisten"</string>
-  <string name="noRecsInFtr">"Ingen oppskrifter samsvarer med ditt søk i filtrerte oppskrifter"</string>
-  <string name="intf">"Grensesnitt"</string>
-  <string name="lang">"Språk"</string>
-  <string name="sysDef">"Systemforvalg"</string>
-  <string name="db">"Database"</string>
-  <string name="expBu">"Eksporter full sikkerhetskopi"</string>
-  <string name="buInfo">"Genererer en ZIP-fil inneholdende all din data som kan importeres tilbake"</string>
-  <string name="impBu">"Importer data"</string>
-  <string name="impInfo">"Støtter fulle sikkerhetskopier eksportert av dette programmet"</string>
-  <string name="ver">"Versjon"</string>
-  <string name="joinTG">"Ta del i Telegram-gruppen"</string>
-  <string name="tgInfo">"For innrapportering av problemer, forslag og tilbakemeldinger"</string>
-  <string name="newRec">"Ny oppskrift"</string>
-  <string name="editRec">"Rediger oppskrift"</string>
-  <string name="title">"Tittel"</string>
-  <string name="cat">"Kategori"</string>
-  <string name="prepT">"Tilberedelsestid"</string>
-  <string name="cookT">"Koketid"</string>
-  <string name="ing">"Ingrediens"</string>
-  <string name="ings">"Ingredienser"</string>
-  <string name="aIngBtn">"Legg til ingrediens"</string>
-  <string name="ins">"Instruks"</string>
-  <string name="inss">"Instrukser"</string>
-  <string name="aStpBtn">"Legg til steg"</string>
-  <string name="cmb">"Kombinasjon"</string>
-  <string name="cmbs">"Kombinasjoner"</string>
-  <string name="addCmbBtn">"Legg til kombinasjon"</string>
-  <string name="no">"Notis"</string>
-  <string name="nos">"Notiser"</string>
-  <string name="aNoBtn">"Legg til notis"</string>
-  <string name="it">"Element"</string>
-  <string name="stp">"Steg"</string>
-  <string name="srt">"Sorter etter"</string>
-  <string name="cBtn">"Avbryt"</string>
-  <string name="rBtn">"Fjern"</string>
-  <string name="rmCuiInfo">"Du er i ferd med å fjerne dette kjøkkenet:"</string>
-  <string name="rmCatInfo">"Du er i ferd med å fjerne kategorien:"</string>
-  <string name="rmUInfo">"Du er i ferd med å fjerne enheten:"</string>
-  <string name="rmLIInfo">"Eksisterende oppskrifter vil ikke endres"</string>
-  <string name="aBtn">"Legg til"</string>
-  <string name="selRec">"Velg oppskrift"</string>
-  <string name="recListEmp">"Legg til oppskrifter for å se dem her"</string>
-  <string name="recTitle">"Min sunne oppskrift"</string>
-  <string name="shr">"Del"</string>
-  <string name="pht">"Oppskriftsbilde"</string>
-  <string name="rec">"Oppskrift som tekst"</string>
-  <string name="fil">"Oppskrift som fil"</string>
-  <string name="ovw">"Oversikt"</string>
-  <string name="aNBtn">"Legg til ny"</string>
-  <string name="appRst">"Programomstart kreves"</string>
-  <string name="rst">"Omstart"</string>
-  <string name="nThmInfo">"Ny drakt vil ikles når programmet startes på ny"</string>
-  <string name="nLangInfo">"Nytt språk tas i bruk når programmet startes på ny"</string>
-  <string name="grant">"Innvilg tilgang"</string>
-  <string name="reqAcc">"Programmet krever lagringstilgang for å sette oppskriftsbilde, eksportere og importere data"</string>
-  <string name="nNBtn">"Ikke nå"</string>
-  <string name="conBtn">"Fortsett"</string>
-  <string name="dend">"Tilgang nektet"</string>
-  <string name="aFBu">"Legg til en oppskrift for å utføre sikkerhetskopi"</string>
-  <string name="favd">"Lagt til i favoritter"</string>
-  <string name="unfavd">"Fjernet fra favoritter"</string>
-  <string name="aTry">"Lagt til i «Prøves senere»"</string>
-  <string name="conf">"Bekreft"</string>
-  <string name="rmTry">"Fjernet fra «Prøves senere»"</string>
-  <string name="delRecInfo">"Du er i ferd med å slette denne oppskriften for godt:"</string>
-  <string name="delRecsInfo">"Du er i ferd med å slette dette for godt:"</string>
-  <string name="recs">"oppskrifter"</string>
-  <string name="sltd">"valgt"</string>
-  <string name="dBtn">"Slett"</string>
-  <string name="ser">"Søk"</string>
-  <string name="unsaved">"Ulagrede endringer"</string>
-  <string name="disc">"Denne oppskriften har ulagrede endringer. Hva ønsker du å gjøre?"</string>
-  <string name="disBtn">"Forkast"</string>
-  <string name="kEdit">"Fortsett å redigere"</string>
-  <string name="rmIng">"Ingrediens fjernet"</string>
-  <string name="rmIns">"Instruks fjernet"</string>
-  <string name="rmN">"Notis fjernet"</string>
-  <string name="rmCmb">"Kombinasjon fjernet"</string>
-  <string name="nwCat">"Ny kategori"</string>
-  <string name="req">"Påkreft"</string>
-  <string name="recPic">"Oppskriftsbilde"</string>
-  <string name="repBtn">"Erstatt bilde"</string>
-  <string name="cPic">"Beskjær bilde"</string>
-  <string name="triedInfo">"Du prøvde denne oppskriften:"</string>
-  <string name="dAgo">"dager siden"</string>
-  <string name="wAgo">"uker siden"</string>
-  <string name="mAgo">"måneder siden"</string>
-  <string name="ltAgo">"for lenge siden"</string>
-  <string name="vrfy">"Bekrefter"</string>
-  <string name="appCrd">"Delt via EnRecipes. Hent det på F-Droid, IzzyOnDroid eller Play-butikken."</string>
-  <string name="gh">"Vis på GitHib"</string>
-  <string name="priv">"Personvernspraksis"</string>
-  <string name="guide">"Brukerveilending"</string>
-  <string name="opts">"Innstillinger"</string>
-  <string name="rest">"Tilbakestill"</string>
-  <string name="restDone">"Tilbakestilt"</string>
-  <string name="resNF">"Fant ikke oppskrift"</string>
-  <string name="newCui">"Nytt kjøkken"</string>
-  <string name="newUnit">"Ny enhet"</string>
-  <string name="cui">"Kjøkken"</string>
-  <string name="cuis">"Kjøkken"</string>
-  <string name="allCuis">"Alle kjøkken"</string>
-  <string name="allCats">"Alle kategorier"</string>
-  <string name="allTs">"Alle etiketter"</string>
-  <string name="noTs">"Ingen tilgjengelige etiketter"</string>
-  <string name="ts">"Etiketter"</string>
-  <string name="tsInfo">"inndel med mellomrom"</string>
-  <string name="impSuc">"Importert"</string>
-  <string name="recF">"oppskrifter funnet"</string>
-  <string name="recI">"oppskrifter importert"</string>
-  <string name="recE">"oppskrifter finnes allerede"</string>
-  <string name="recU">"oppskrifter oppdatert"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Filtrerte oppskrifter"</string>
-  <string name="stars">"Stjernevurdering"</string>
-  <string name="untRec">"Oppskrift uten tittel"</string>
-  <string name="recRm">"Oppskrift fjernet"</string>
-  <string name="impFail">"Import mislyktes"</string>
-  <string name="buInc">"Feilformatert eller skadet sikkerhetskopifil"</string>
-  <string name="buEmp">"Sikkerhetskopifilen er tom"</string>
-  <string name="buMod">"Sikkerhetskopifilen ble endret annetsteds hen"</string>
-  <string name="buSuc">"Sikkerhetskopi lagret i nedlastingsmappe"</string>
-  <string name="invFile">"Ugyldig fil"</string>
-  <string name="donate">"Doner"</string>
-  <string name="help">"Hjelp"</string>
-  <string name="trySer">"Søk i alle oppskriftene?"</string>
-  <string name="January">"Januar"</string>
-  <string name="February">"Februar"</string>
-  <string name="March">"March"</string>
-  <string name="April">"April"</string>
-  <string name="May">"May"</string>
-  <string name="June">"June"</string>
-  <string name="July">"July"</string>
-  <string name="August">"August"</string>
-  <string name="September">"September"</string>
-  <string name="October">"Oktober"</string>
-  <string name="November">"November"</string>
-  <string name="December">"Desember"</string>
-  <string name="SUN">"Søn"</string>
-  <string name="MON">"Man"</string>
-  <string name="TUE">"Tir"</string>
-  <string name="WED">"Ons"</string>
-  <string name="THU">"Tor"</string>
-  <string name="FRI">"Fre"</string>
   <string name="SAT">"Sat"</string>
-  <string name="yieldQ">"Avkastningsmengde"</string>
-  <string name="yieldU">"Avkastningsenhet"</string>
-  <string name="rmYUInfo">"Du er i ferd med å fjerne avkastningsenheten:"</string>
-  <string name="nwYiU">"Ny avkastningsenhet"</string>
-  <string name="sVw">"Rist for å vise tilfeldig oppskrift"</string>
-  <string name="sVwInfo">"Hjelper deg å velge hva du skal lage når du ikke kan bestemme deg"</string>
-  <string name="restCuiL">"Tilbakestill kjøkkenliste"</string>
-  <string name="restCatL">"Tilbakestill kategoriliste"</string>
-  <string name="restYUL">"Tilbakestill avkastningsenhetsliste"</string>
-  <string name="restUL">"Tilbakestill enhetsliste"</string>
-  <string name="restInfo">"Tilbakestilling av en liste vil slette brukeropprettede oppføringer og gjenopprette forvalgte oppføringer. Eksisterende oppføringer vil ikke påvirkes."</string>
+  <string name="FRI">"Fre"</string>
+  <string name="THU">"Tor"</string>
+  <string name="WED">"Ons"</string>
+  <string name="TUE">"Tir"</string>
+  <string name="MON">"Man"</string>
+  <string name="SUN">"Søn"</string>
+  <string name="December">"Desember"</string>
+  <string name="November">"November"</string>
+  <string name="October">"Oktober"</string>
+  <string name="September">"September"</string>
+  <string name="August">"August"</string>
+  <string name="July">"July"</string>
+  <string name="June">"June"</string>
+  <string name="May">"May"</string>
+  <string name="April">"April"</string>
+  <string name="March">"March"</string>
+  <string name="February">"Februar"</string>
+  <string name="January">"Januar"</string>
+  <string name="trySer">"Søk i alle oppskriftene?"</string>
+  <string name="help">"Hjelp"</string>
   <string name="appInfo">"EnRecipes er et fritt kokeboksprogram som respekterer ditt personvern. Du kan opprette lage og dele dine oppskrifter."</string>
-  <string name="Combination">"Kombinasjon"</string>
-  <string name="Donate">"Doner"</string>
-  <string name="_Invalid_file__Z2bRAst">"Ugyldig fil:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Sikkerhetskopifilen har blitt endret eksternt."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Sikkerhetskopifilen ser ut til å være tom."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Sikkerhetskopifilen er feilformatert eller skadet."</string>
-  <string name="_Import_failed_Z1dbs6t">"Kunne ikke importere"</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Fjern oppskrift fra snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Fjern oppskrift fra middag?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Fjern oppskrift fra lunsj?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Fjern oppskrift fra frokost?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Oppskrift uten tittel"</string>
-  <string name="_Star_rating_Z11p4Kw">"Stjernevurdering"</string>
+  <string name="donate">"Doner"</string>
+  <string name="invFile">"Ugyldig fil"</string>
+  <string name="buSuc">"Sikkerhetskopi lagret i nedlastingsmappe"</string>
+  <string name="buMod">"Sikkerhetskopifilen ble endret annetsteds hen"</string>
+  <string name="buEmp">"Sikkerhetskopifilen er tom"</string>
+  <string name="buInc">"Feilformatert eller skadet sikkerhetskopifil"</string>
+  <string name="impFail">"Import mislyktes"</string>
+  <string name="recRm">"Oppskrift fjernet"</string>
+  <string name="untRec">"Oppskrift uten tittel"</string>
+  <string name="stars">"Stjernevurdering"</string>
   <string name="Created">"Opprettet"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtrert resultat"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Filtrerte oppskrifter"</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"oppskrifter oppdatert"</string>
-  <string name="_recipes_already_exists_2jqW2s">"oppskrifter finnes allerede"</string>
-  <string name="_recipes_imported_1NGeRw">"oppskrifter importert"</string>
-  <string name="_recipes_found_ZDdUgV">"oppskrifter funnet"</string>
-  <string name="_Import_summary_244SkL">"Importsammendrag"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"inndel med mellomrom"</string>
-  <string name="Tags">"Etiketter"</string>
-  <string name="_No_tags_available_Z1C5GqD">"Ingen tilgjengelige etiketter"</string>
-  <string name="_All_Tags_28gMyY">"Alle etiketter"</string>
-  <string name="_All_Categories_Z23JSTS">"Alle kategorier"</string>
+  <string name="recU">"oppskrifter oppdatert"</string>
+  <string name="recE">"oppskrifter finnes allerede"</string>
+  <string name="recI">"oppskrifter importert"</string>
+  <string name="recF">"oppskrifter funnet"</string>
+  <string name="impSuc">"Importert"</string>
+  <string name="tsInfo">"inndel med mellomrom"</string>
+  <string name="ts">"Etiketter"</string>
+  <string name="noTs">"Ingen tilgjengelige etiketter"</string>
+  <string name="allTs">"Alle etiketter"</string>
+  <string name="allCats">"Alle kategorier"</string>
   <string name="Vietnamese">"Vietnamesisk"</string>
   <string name="Turkish">"Tyrkisk"</string>
   <string name="Thai">"Thailandsk"</string>
@@ -230,17 +77,12 @@
   <string name="British">"Britisk"</string>
   <string name="Brazilian">"Brasiliansk"</string>
   <string name="American">"Amerikansk"</string>
-  <string name="_All_Cuisines_2hjCp9">"Alle kjøkken"</string>
-  <string name="Cuisines">"Kjøkken"</string>
-  <string name="Cuisine">"Kjøkken"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Er du sikker på at du vil fjerne"</string>
-  <string name="Units">"Enheter"</string>
-  <string name="_Remove_unit__2x26yq">"Fjern enhet?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Fjern utbytteenhet?"</string>
-  <string name="_Remove_category__2reaxz">"Fjern kategori?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Fjern kjøkken?"</string>
-  <string name="_New_unit_1CVEEA">"Ny enhet"</string>
-  <string name="_New_cuisine_Zrvs3z">"Nytt kjøkken"</string>
+  <string name="allCuis">"Alle kjøkken"</string>
+  <string name="cuis">"Kjøkken"</string>
+  <string name="cui">"Kjøkken"</string>
+  <string name="Unit">"Enhet"</string>
+  <string name="newUnit">"Ny enhet"</string>
+  <string name="newCui">"Nytt kjøkken"</string>
   <string name="Challenging">"Utfordrende"</string>
   <string name="Moderate">"Moderat"</string>
   <string name="Easy">"Enkelt"</string>
@@ -251,139 +93,139 @@
   <string name="Rating">"Vudering"</string>
   <string name="_Slowest_first_hHjY6">"Tregeste først"</string>
   <string name="_Quickest_first_Z1CpP7N">"Raskeste først"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Fant ingen slike oppskrifter"</string>
-  <string name="_Recipe_not_found_2qGveM">"Fant ikke oppskrift"</string>
-  <string name="_Reset_successful_YxqWK">"Tilbakestilt"</string>
-  <string name="_Reset_units_list_msRS3">"TIlbakestill enhetslister"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Tilbakestill utbytteenhetsliste"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Tilbakestill kategoriliste"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Tilbakestill kjøkkenliste"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"TIlbakestilling av lister gjenoppretter kun forvalgte oppføringer. Eksisterende oppføringer slettes ikke."</string>
-  <string name="Reset">"Tilbakestill"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Hjelper deg å velge hva du skal lage når du ikke kan bestemme deg"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Rist for å vise tilfeldig oppskrift"</string>
-  <string name="Options">"Innstillinger"</string>
-  <string name="_User_guide_2uDJCF">"Brukerguide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Personvernspraksis"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Vis på GitHub"</string>
-  <string name="Translator">"Oversatt av"</string>
-  <string name="Contributors">"Bidragsytere"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Delt via EnRecipes. Skaff de på F-Droid eller IzzyOnDroid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Tilgang nektet"</string>
-  <string name="_Import_successful_2bLM3e">"Importert"</string>
-  <string name="_Verifying____cS102">"Bekrefter …"</string>
-  <string name="_long_time_ago_1nwlFA">"for lenge siden"</string>
-  <string name="_months_ago_Z1TsskA">"måneder siden"</string>
-  <string name="_weeks_ago_Z2sT1GA">"uker siden"</string>
-  <string name="_days_ago_2iCYkm">"dager siden"</string>
+  <string name="resNF">"Fant ikke oppskrift"</string>
+  <string name="restDone">"Tilbakestilt"</string>
+  <string name="restInfo">"Tilbakestilling av en liste vil slette brukeropprettede oppføringer og gjenopprette forvalgte oppføringer. Eksisterende oppføringer vil ikke påvirkes."</string>
+  <string name="restUL">"Tilbakestill enhetsliste"</string>
+  <string name="restYUL">"Tilbakestill avkastningsenhetsliste"</string>
+  <string name="restCatL">"Tilbakestill kategoriliste"</string>
+  <string name="restCuiL">"Tilbakestill kjøkkenliste"</string>
+  <string name="rest">"Tilbakestill"</string>
+  <string name="sVwInfo">"Hjelper deg å velge hva du skal lage når du ikke kan bestemme deg"</string>
+  <string name="sVw">"Rist for å vise tilfeldig oppskrift"</string>
+  <string name="opts">"Innstillinger"</string>
+  <string name="guide">"Brukerveilending"</string>
+  <string name="priv">"Personvernspraksis"</string>
+  <string name="gh">"Vis på GitHib"</string>
+  <string name="appCrd">"Delt via EnRecipes. Hent det på F-Droid, IzzyOnDroid eller Play-butikken."</string>
+  <string name="vrfy">"Bekrefter"</string>
+  <string name="ltAgo">"for lenge siden"</string>
+  <string name="mAgo">"måneder siden"</string>
+  <string name="wAgo">"uker siden"</string>
+  <string name="dAgo">"dager siden"</string>
   <string name="yesterday">"i går"</string>
   <string name="today">"i dag"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Du har prøvd denne oppskriften:"</string>
+  <string name="triedInfo">"Du prøvde denne oppskriften:"</string>
   <string name="snacks">"snacks"</string>
   <string name="dinner">"middag"</string>
   <string name="lunch">"lunsj"</string>
   <string name="breakfast">"frokost"</string>
-  <string name="_Crop_photo_1VL04J">"Beskjær bilde"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"Erstatt bilde"</string>
-  <string name="_Recipe_photo_eqm9B">"Oppskriftsbilde"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"Innvilg lagringstilgang for å sette oppskriftsbilde."</string>
-  <string name="Required">"Påkrevd"</string>
-  <string name="_New_category_Weg73">"Ny kategori"</string>
-  <string name="_New_yield_unit_1Oevd2">"Ny utbytteenhet"</string>
-  <string name="_Remove_note__2wyMVE">"Fjern anmerkning?"</string>
-  <string name="_Remove_combination__1dr2LS">"Fjern kombinasjon?"</string>
-  <string name="_Remove_instruction__vkJfi">"Fjern instruksjon?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Fjern indigrediens?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"Rediger videre"</string>
-  <string name="DISCARD">"Forkast"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Er du sikker på at du vil forkaste alle ulagrede endringer i denne oppskriften?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Ulagrede endringer"</string>
-  <string name="Search">"Søk"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Er du sikker på at du vil slette oppskrift"</string>
-  <string name="DELETE">"Slett"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Slett oppskrift?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Fjernet fra prøv senere"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Lagt til for senere bruk"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Fjernet fra favoritter"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Lagt til i favoritter"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Legg til minst én oppskrift for å utføre en sikkerhetskopi"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"Innvilg lagringstilgang for å sikkerhetskopiere dataen din til enheten."</string>
-  <string name="CONTINUE">"Fortsett"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"Ikke nå"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"Innvilg lagringstilgang for å importere dataen din fra en tidligere sikkerhetskopi."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Innvilg tilgang"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"Start programmet på ny for å bruke nytt språk."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"Start programmet ny for å ikle ny drakt."</string>
-  <string name="RESTART">"Omstart"</string>
-  <string name="_Restart_required_Z22YINL">"Omstart kreves"</string>
+  <string name="cPic">"Beskjær bilde"</string>
+  <string name="repBtn">"Erstatt bilde"</string>
+  <string name="recPic">"Oppskriftsbilde"</string>
+  <string name="req">"Påkreft"</string>
+  <string name="nwCat">"Ny kategori"</string>
+  <string name="nwYiU">"Ny avkastningsenhet"</string>
+  <string name="rmCmb">"Kombinasjon fjernet"</string>
+  <string name="rmN">"Notis fjernet"</string>
+  <string name="rmIns">"Instruks fjernet"</string>
+  <string name="rmIng">"Ingrediens fjernet"</string>
+  <string name="kEdit">"Fortsett å redigere"</string>
+  <string name="disBtn">"Forkast"</string>
+  <string name="disc">"Denne oppskriften har ulagrede endringer. Hva ønsker du å gjøre?"</string>
+  <string name="unsaved">"Ulagrede endringer"</string>
+  <string name="ser">"Søk"</string>
+  <string name="dBtn">"Slett"</string>
+  <string name="sltd">"valgt"</string>
+  <string name="recs">"oppskrifter"</string>
+  <string name="delRecsInfo">"Du er i ferd med å slette dette for godt:"</string>
+  <string name="delRecInfo">"Du er i ferd med å slette denne oppskriften for godt:"</string>
+  <string name="conf">"Bekreft"</string>
+  <string name="rmTry">"Fjernet fra «Prøves senere»"</string>
+  <string name="aTry">"Lagt til i «Prøves senere»"</string>
+  <string name="unfavd">"Fjernet fra favoritter"</string>
+  <string name="favd">"Lagt til i favoritter"</string>
+  <string name="aFBu">"Legg til en oppskrift for å utføre sikkerhetskopi"</string>
+  <string name="dend">"Tilgang nektet"</string>
+  <string name="conBtn">"Fortsett"</string>
+  <string name="nNBtn">"Ikke nå"</string>
+  <string name="reqAcc">"Programmet krever lagringstilgang for å sette oppskriftsbilde, eksportere og importere data"</string>
+  <string name="grant">"Innvilg tilgang"</string>
+  <string name="nLangInfo">"Nytt språk tas i bruk når programmet startes på ny"</string>
+  <string name="nThmInfo">"Ny drakt vil ikles når programmet startes på ny"</string>
+  <string name="rst">"Omstart"</string>
+  <string name="appRst">"Programomstart kreves"</string>
   <string name="SET">"Sett"</string>
-  <string name="_ADD_NEW_Zv8FjM">"Legg til ny"</string>
-  <string name="Share">"Del"</string>
-  <string name="Overview">"Oversikt"</string>
-  <string name="Recipe">"Oppskrift"</string>
-  <string name="Photo">"Bilde"</string>
+  <string name="aNBtn">"Legg til ny"</string>
+  <string name="ovw">"Oversikt"</string>
+  <string name="fil">"Oppskrift som fil"</string>
+  <string name="rec">"Oppskrift som tekst"</string>
+  <string name="pht">"Oppskriftsbilde"</string>
+  <string name="shr">"Del"</string>
   <string name="min">"min"</string>
   <string name="hr">"t"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Min sunne oppskrift"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Legg til oppskrifter for å se dem her."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Velg en oppskrift"</string>
-  <string name="ADD">"Legg til"</string>
-  <string name="REMOVE">"Fjern"</string>
-  <string name="CANCEL">"Avbryt"</string>
-  <string name="_Sort_by_Zq01TF">"Sorter etter"</string>
-  <string name="Step">"Trinn"</string>
-  <string name="Item">"Element"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"Legg til anmerkning"</string>
-  <string name="Notes">"Anmerkninger"</string>
-  <string name="Note">"Anmerkning"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"Legg til kombinasjon"</string>
-  <string name="Combinations">"Kombinasjoner"</string>
-  <string name="_ADD_STEP_ZyMPOe">"Legg til trinn"</string>
-  <string name="Instructions">"Instruksjoner"</string>
-  <string name="Instruction">"Instruksjon"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"Legg til indigrediens"</string>
-  <string name="Ingredients">"Indigredienser"</string>
-  <string name="Ingredient">"Indigrediens"</string>
-  <string name="_Yield_measured_in_2OoRT">"Avkastning målt i"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Kapasitet antall"</string>
-  <string name="_Cooking_time_2w2fEw">"Tilberedningstid"</string>
-  <string name="_Preparation_time_15BfxT">"Forberedelsestid"</string>
-  <string name="Category">"Kategori"</string>
-  <string name="Title">"Tittel"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Rediger oppskrift"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Ny oppskrift"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B."</string>
-  <string name="Author">"Utvikler"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for innrapportering av feil, forslag og tilbakemeldinger"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Ta del i Telegram-gruppen"</string>
-  <string name="Version">"Versjon"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Støtter fulle sikkerhetskopier eksporter av programmet"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Importer fra sikkerhetskopi"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Lager en ZIP-fil som har all din data. Den kan du importere andre steder."</string>
-  <string name="_Export_a_full_backup_TJfra">"Eksporter en full sikkerhetskopi"</string>
-  <string name="Database">"Database"</string>
+  <string name="recTitle">"Min sunne oppskrift"</string>
+  <string name="recListEmp">"Legg til oppskrifter for å se dem her"</string>
+  <string name="selRec">"Velg oppskrift"</string>
+  <string name="aBtn">"Legg til"</string>
+  <string name="rmLIInfo">"Eksisterende oppskrifter vil ikke endres"</string>
+  <string name="rmUInfo">"Du er i ferd med å fjerne enheten:"</string>
+  <string name="rmYUInfo">"Du er i ferd med å fjerne avkastningsenheten:"</string>
+  <string name="rmCatInfo">"Du er i ferd med å fjerne kategorien:"</string>
+  <string name="rmCuiInfo">"Du er i ferd med å fjerne dette kjøkkenet:"</string>
+  <string name="rBtn">"Fjern"</string>
+  <string name="cBtn">"Avbryt"</string>
+  <string name="srt">"Sorter etter"</string>
+  <string name="stp">"Steg"</string>
+  <string name="it">"Element"</string>
+  <string name="aNoBtn">"Legg til notis"</string>
+  <string name="nos">"Notiser"</string>
+  <string name="no">"Notis"</string>
+  <string name="addCmbBtn">"Legg til kombinasjon"</string>
+  <string name="cmbs">"Kombinasjoner"</string>
+  <string name="cmb">"Kombinasjon"</string>
+  <string name="aStpBtn">"Legg til steg"</string>
+  <string name="inss">"Instrukser"</string>
+  <string name="ins">"Instruks"</string>
+  <string name="aIngBtn">"Legg til ingrediens"</string>
+  <string name="ings">"Ingredienser"</string>
+  <string name="ing">"Ingrediens"</string>
+  <string name="yieldU">"Avkastningsenhet"</string>
+  <string name="yieldQ">"Avkastningsmengde"</string>
+  <string name="cookT">"Koketid"</string>
+  <string name="prepT">"Tilberedelsestid"</string>
+  <string name="cat">"Kategori"</string>
+  <string name="title">"Tittel"</string>
+  <string name="editRec">"Rediger oppskrift"</string>
+  <string name="newRec">"Ny oppskrift"</string>
+  <string name="tgInfo">"For innrapportering av problemer, forslag og tilbakemeldinger"</string>
+  <string name="joinTG">"Ta del i Telegram-gruppen"</string>
+  <string name="ver">"Versjon"</string>
+  <string name="impInfo">"Støtter fulle sikkerhetskopier eksportert av dette programmet"</string>
+  <string name="impBu">"Importer data"</string>
+  <string name="buInfo">"Genererer en ZIP-fil inneholdende all din data som kan importeres tilbake"</string>
+  <string name="expBu">"Eksporter full sikkerhetskopi"</string>
+  <string name="db">"Database"</string>
   <string name="Dark">"Mørk"</string>
   <string name="Light">"Lys"</string>
   <string name="Theme">"Drakt"</string>
-  <string name="_System_default_Z1jruVS">"Systemforvalg"</string>
-  <string name="_App_language_DzFsk">"Programspråk"</string>
-  <string name="Interface">"Grensesnitt"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Fant ingen slike oppskrifter for senere bruk"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Fant ingen slike oppskrifter i dine favoritter"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Fant ingen slike oppskrifter i denne kategorien"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Fant ingen slike oppskrifter"</string>
-  <string name="_No_recipes_found_Z125IxD">"Fant ingen oppskrifter"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Tom kategori"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Oppskrifter du merker som favoritter vil vises her"</string>
-  <string name="_No_favourites_yet_aPSoG">"Ingen favoritter enda"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Oppskrifter du vil prøve senere vil vises her"</string>
-  <string name="_All_done__72KYl">"Ferdig."</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Bruk blyant-knappen for å legge til nonen anmerkninger"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Bruk blyant-knappen for å legge til noen kombinasjoner"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Bruk blyant-knappen for å legge instruksjoner"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Bruk blyant-knappen for å legge til indigredienser"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Bruk +knappen for å legge til en"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Legg til dine oppskrifter."</string>
+  <string name="sysDef">"Systemforvalg"</string>
+  <string name="lang">"Språk"</string>
+  <string name="intf">"Grensesnitt"</string>
+  <string name="noRecsInFtr">"Ingen oppskrifter samsvarer med ditt søk i filtrerte oppskrifter"</string>
+  <string name="noRecsInFavs">"Ingen oppskrifter samsvarer med ditt søk i favorittlisten"</string>
+  <string name="noRecsInTL">"Ingen oppskrifter samsvarte med søke ditt i «Prøves senere»-listen"</string>
+  <string name="noRecs">"Ingen oppskrifter samsvarte med søket ditt"</string>
+  <string name="fsList">"Dine favorittoppskrifter listes opp her"</string>
+  <string name="noFavs">"Ingen favoritter enda"</string>
+  <string name="tLInfo">"Oppskrifter du ønsker å prøve senere listes opp her"</string>
+  <string name="aD">"Ferdig."</string>
+  <string name="pANo">"Bruk blyantknappen for å legge til notiser"</string>
+  <string name="pACmb">"Bruk blyantknappen for å legge til kombinasjoner"</string>
+  <string name="pAIns">"Bruk blyantknappen for å legge til instrukser"</string>
+  <string name="pAIng">"Bruk blyantknappen for å legge til ingredienser"</string>
+  <string name="plsAdd">"Bruk \"+\"-knappen for å legge til en"</string>
+  <string name="strAdd">"Begynn å legge til oppskriftene dine."</string>
   <string name="large">"stor"</string>
   <string name="medium">"middels"</string>
   <string name="small">"liten"</string>
@@ -411,7 +253,6 @@
   <string name="tbsp">"ss"</string>
   <string name="dsp">"bs"</string>
   <string name="tsp">"ts"</string>
-  <string name="Unit">"Enhet"</string>
   <string name="unit">"enhet"</string>
   <string name="Loaf">"Leiv"</string>
   <string name="Patty">"Burger"</string>
@@ -456,18 +297,21 @@
   <string name="Appetizers">"Forretter"</string>
   <string name="About">"Om"</string>
   <string name="Settings">"Innstillinger"</string>
-  <string name="Categories">"Kategorier"</string>
-  <string name="_Meal_Planner_2aq4oj">"Måltidsplanlegger"</string>
-  <string name="Favourites">"Favoritter"</string>
-  <string name="_Try_Later_If7PG">"Prøv igjen senere"</string>
+  <string name="grocery">"Handleliste"</string>
+  <string name="planner">"Måltidsplanlegger"</string>
+  <string name="favourites">"Favoritter"</string>
+  <string name="trylater">"Prøv igjen senere"</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>
-  <string name="undo">"Undo"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 98b02a32..4f8f3662 100644
--- a/app/resources/Android/src/main/res/values-nl/strings.xml
+++ b/app/resources/Android/src/main/res/values-nl/strings.xml
@@ -1,256 +1,273 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="_Import_failed_Z1dbs6t">"Importeren mislukt"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="Created">"Created"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="Vietnamese">"Vietnamese"</string>
-  <string name="Turkish">"Turkish"</string>
-  <string name="Thai">"Thai"</string>
-  <string name="Swedish">"Swedish"</string>
-  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankan"</string>
-  <string name="Spanish">"Spanish"</string>
-  <string name="Scottish">"Scottish"</string>
-  <string name="Russian">"Russian"</string>
-  <string name="Portuguese">"Portuguese"</string>
-  <string name="Nigerian">"Nigerian"</string>
-  <string name="Mexican">"Mexican"</string>
-  <string name="Korean">"Korean"</string>
-  <string name="Kenyan">"Kenyan"</string>
-  <string name="Jewish">"Jewish"</string>
-  <string name="Japanese">"Japanese"</string>
-  <string name="Jamaican">"Jamaican"</string>
-  <string name="Italian">"Italian"</string>
-  <string name="Irish">"Irish"</string>
-  <string name="Indian">"Indian"</string>
-  <string name="Greek">"Greek"</string>
-  <string name="German">"German"</string>
-  <string name="French">"French"</string>
-  <string name="Filipino">"Filipino"</string>
-  <string name="English">"English"</string>
-  <string name="Egyptian">"Egyptian"</string>
-  <string name="Danish">"Danish"</string>
-  <string name="Chinese">"Chinese"</string>
-  <string name="British">"British"</string>
-  <string name="Brazilian">"Brazilian"</string>
-  <string name="American">"American"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="Challenging">"Challenging"</string>
-  <string name="Moderate">"Moderate"</string>
-  <string name="Easy">"Easy"</string>
-  <string name="_Oldest_first_Z6cq4h">"Oldest first"</string>
-  <string name="_Newest_first_2Sb3c">"Newest first"</string>
-  <string name="_Last_updated_Z2gEbLD">"Last updated"</string>
-  <string name="_Difficulty_level_cSL5d">"Difficulty level"</string>
-  <string name="Rating">"Rating"</string>
-  <string name="_Slowest_first_hHjY6">"Slowest first"</string>
-  <string name="_Quickest_first_Z1CpP7N">"Quickest first"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Medewerkers"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Gedeeld via EnRecipes. Haal het in de Play Store of bij F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"toestemming geweigerd"</string>
-  <string name="_Import_successful_2bLM3e">"Succesvol importeren"</string>
-  <string name="_Verifying____cS102">"Het controleren…"</string>
-  <string name="_long_time_ago_1nwlFA">"lang geleden"</string>
-  <string name="_months_ago_Z1TsskA">"voorgaande maanden"</string>
-  <string name="_weeks_ago_Z2sT1GA">"voorgaande weken"</string>
-  <string name="_days_ago_2iCYkm">"voorgaande dagen"</string>
-  <string name="yesterday">"Gisteren"</string>
+  <string name="undo">"Ongedaan maken"</string>
+  <string name="trnsl">"Vertalen"</string>
+  <string name="SAT">"ZA"</string>
+  <string name="FRI">"VRIJ"</string>
+  <string name="THU">"DO"</string>
+  <string name="WED">"WOE"</string>
+  <string name="TUE">"DI"</string>
+  <string name="MON">"MA"</string>
+  <string name="SUN">"ZO"</string>
+  <string name="December">"december"</string>
+  <string name="November">"november"</string>
+  <string name="October">"oktober"</string>
+  <string name="September">"september"</string>
+  <string name="August">"augustus"</string>
+  <string name="July">"juli"</string>
+  <string name="June">"juni"</string>
+  <string name="May">"mei"</string>
+  <string name="April">"april"</string>
+  <string name="March">"maart"</string>
+  <string name="February">"februari"</string>
+  <string name="January">"januari"</string>
+  <string name="trySer">"ALLE RECEPTEN DOORZOEKEN?"</string>
+  <string name="help">"Hulp"</string>
+  <string name="appInfo">"EnRecipes in een open source, privacybewust digitaal kookboek waarmee je recepten kunt aanmaken, beheren en delen"</string>
+  <string name="donate">"Doneren"</string>
+  <string name="invFile">"Ongeldig bestand"</string>
+  <string name="buSuc">"Het back-upbestand is opgeslagen in de map \'Downloads\'"</string>
+  <string name="buMod">"Het back-upbestand is elders aangepast"</string>
+  <string name="buEmp">"Het back-upbestand is leeg"</string>
+  <string name="buInc">"Onjuist of beschadigd back-upbestand"</string>
+  <string name="impFail">"Importeren mislukt"</string>
+  <string name="recRm">"Recept verwijderd"</string>
+  <string name="untRec">"Naamloos recept"</string>
+  <string name="stars">"Waardering"</string>
+  <string name="Created">"Aangemaakt"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Gefilterde recepten"</string>
+  <string name="OK">"Oké"</string>
+  <string name="recU">"recepten bijgewerkt"</string>
+  <string name="recE">"recepten bestaan al"</string>
+  <string name="recI">"recepten geïmporteerd"</string>
+  <string name="recF">"recepten gevonden"</string>
+  <string name="impSuc">"Importeren voltooid"</string>
+  <string name="tsInfo">"kommagescheiden"</string>
+  <string name="ts">"Labels"</string>
+  <string name="noTs">"Geen labels beschikbaar"</string>
+  <string name="allTs">"Alle labels"</string>
+  <string name="allCats">"Alle categorieën"</string>
+  <string name="Vietnamese">"Vietnamees"</string>
+  <string name="Turkish">"Turks"</string>
+  <string name="Thai">"Thais"</string>
+  <string name="Swedish">"Zweeds"</string>
+  <string name="_Sri_Lankan_Z7GfBa">"Sri Lankaans"</string>
+  <string name="Spanish">"Spaans"</string>
+  <string name="Scottish">"Schots"</string>
+  <string name="Russian">"Russisch"</string>
+  <string name="Portuguese">"Portugees"</string>
+  <string name="Nigerian">"Nigeriaans"</string>
+  <string name="Mexican">"Mexicaans"</string>
+  <string name="Korean">"Koreaans"</string>
+  <string name="Kenyan">"Keniaans"</string>
+  <string name="Jewish">"Joods"</string>
+  <string name="Japanese">"Japans"</string>
+  <string name="Jamaican">"Jamaicaans"</string>
+  <string name="Italian">"Italiaans"</string>
+  <string name="Irish">"Iers"</string>
+  <string name="Indian">"Indiaas"</string>
+  <string name="Greek">"Grieks"</string>
+  <string name="German">"Duits"</string>
+  <string name="French">"Frans"</string>
+  <string name="Filipino">"Filipijns"</string>
+  <string name="English">"Engels"</string>
+  <string name="Egyptian">"Egyptisch"</string>
+  <string name="Danish">"Deens"</string>
+  <string name="Chinese">"Chinees"</string>
+  <string name="British">"Brits"</string>
+  <string name="Brazilian">"Braziliaans"</string>
+  <string name="American">"Amerikaans"</string>
+  <string name="allCuis">"Alle keukens"</string>
+  <string name="cuis">"Keukens"</string>
+  <string name="cui">"Keuken"</string>
+  <string name="Unit">"Eenheid"</string>
+  <string name="newUnit">"Nieuwe eenheid"</string>
+  <string name="newCui">"Nieuwe keuken"</string>
+  <string name="Challenging">"Uitdagend"</string>
+  <string name="Moderate">"Gemiddeld"</string>
+  <string name="Easy">"Makkelijk"</string>
+  <string name="_Oldest_first_Z6cq4h">"Oudste bovenaan"</string>
+  <string name="_Newest_first_2Sb3c">"Nieuwste bovenaan"</string>
+  <string name="_Last_updated_Z2gEbLD">"Laatst bijgewerkt"</string>
+  <string name="_Difficulty_level_cSL5d">"Moeilijkheidsgraad"</string>
+  <string name="Rating">"Waardering"</string>
+  <string name="_Slowest_first_hHjY6">"Langzaamste bovenaan"</string>
+  <string name="_Quickest_first_Z1CpP7N">"Snelste bovenaan"</string>
+  <string name="resNF">"Recept niet gevonden"</string>
+  <string name="restDone">"Standaardwaarden hersteld"</string>
+  <string name="restInfo">"Hiermee verwijder je je eigen items en herstel je de standaarditems. Niet van toepassing op bestaande recepten."</string>
+  <string name="restUL">"Eenhedenlijst herstellen"</string>
+  <string name="restYUL">"Eenhedenlijst herstellen"</string>
+  <string name="restCatL">"Categorieënlijst herstellen"</string>
+  <string name="restCuiL">"Keukenlijst herstellen"</string>
+  <string name="rest">"Standaardwaarden"</string>
+  <string name="sVwInfo">"Handig voor als je even niet weet wat je wilt maken"</string>
+  <string name="sVw">"Schudden om willekeurig recept te tonen"</string>
+  <string name="opts">"Opties"</string>
+  <string name="guide">"Handleiding"</string>
+  <string name="priv">"Privacybeleid"</string>
+  <string name="gh">"Bekijken op GitHub"</string>
+  <string name="appCrd">"Gedeeld via EnRecipes. Installeer de app via F-Droid, de Play Store of IzzyOnDroid."</string>
+  <string name="vrfy">"Bezig met verifiëren"</string>
+  <string name="ltAgo">"lang geleden"</string>
+  <string name="mAgo">"maanden geleden"</string>
+  <string name="wAgo">"weken geleden"</string>
+  <string name="dAgo">"dagen geleden"</string>
+  <string name="yesterday">"gisteren"</string>
   <string name="today">"vandaag"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Je probeerde dit recept:"</string>
-  <string name="snacks">"Hapje"</string>
-  <string name="dinner">"Diner"</string>
-  <string name="lunch">"Middag"</string>
+  <string name="triedInfo">"Je hebt het volgende recept uitgeprobeerd:"</string>
+  <string name="snacks">"hapjes"</string>
+  <string name="dinner">"diner"</string>
+  <string name="lunch">"lunch"</string>
   <string name="breakfast">"Ontbijt"</string>
-  <string name="_Crop_photo_1VL04J">"Een foto afknippen"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"FOTO REPLAATSEN"</string>
-  <string name="_Recipe_photo_eqm9B">"Receptfoto"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes heeft toestemming nodig om receptfoto\'s in te stellen."</string>
-  <string name="Required">"Benodigd"</string>
-  <string name="_New_category_Weg73">"Nieuwe categorie"</string>
-  <string name="_New_yield_unit_1Oevd2">"Nieuwe opbrengsteenheid"</string>
-  <string name="_Remove_note__2wyMVE">"Noot verwijderen?"</string>
-  <string name="_Remove_combination__1dr2LS">"Combinatie verwijderen?"</string>
-  <string name="_Remove_instruction__vkJfi">"Voorbereiding verwijderen?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Ingrediënten verwijderen?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"VERDERE VERWERKING"</string>
-  <string name="DISCARD">"AFBREKENING"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Wilt u niet opgeslagen wijzigingen in dit recept weggooien?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Onopgeslagen veranderingen"</string>
-  <string name="Search">"Zoeken"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Wil je echt het recept verwijderen"</string>
-  <string name="DELETE">"VERWIJDEREN"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Recept verwijderen?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Verwijderd uit Probeer Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Toegevoegd in Later proberen"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Uit favorieten verwijderd"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Toegevoegd aan favorieten"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Voeg ten minste één recept toe om een back-up te maken"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes heeft toestemming nodig om uw gegevens op dit apparaat op te slaan."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NIET NU"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes heeft toestemming nodig om uw gegevens uit een eerdere back-up te importeren."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Toestemming"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes moeten opnieuw worden opgestart om de nieuw ingestelde taal te wijzigen"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes moeten opnieuw worden opgestart om de wijziging van het onderwerp in werking te laten treden."</string>
-  <string name="RESTART">"HERSTART"</string>
-  <string name="_Restart_required_Z22YINL">"Herstart nodig"</string>
-  <string name="SET">"SETUP"</string>
-  <string name="_ADD_NEW_Zv8FjM">"NIEUW BIJLAGE"</string>
-  <string name="Share">"Deel"</string>
-  <string name="Overview">"Overzicht"</string>
-  <string name="Recipe">"Recept"</string>
-  <string name="Photo">"FOTO"</string>
-  <string name="min">"min"</string>
-  <string name="hr">"h"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Mijn Gezond Recept"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Niets hier! Voeg wat recepten toe en probeer het opnieuw."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Recept selecteren"</string>
-  <string name="ADD">"TOEVOEGEN"</string>
-  <string name="REMOVE">"VERWIJDEREN"</string>
-  <string name="CANCEL">"ANNULEREN"</string>
-  <string name="_Sort_by_Zq01TF">"Sorteren op"</string>
-  <string name="Step">"Stap"</string>
-  <string name="Item">"Artikel"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"OPMERKINGEN TOEVOEGEN"</string>
-  <string name="Notes">"Opmerkingen"</string>
-  <string name="Note">"Opmerking"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"COMBINATIE TOEVOEGEN"</string>
-  <string name="Combinations">"Combinaties"</string>
-  <string name="_ADD_STEP_ZyMPOe">"STAPPEN TOEVOEGEN"</string>
-  <string name="Instructions">"Voorbereidingen"</string>
-  <string name="Instruction">"Voorbereiding"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"INGREDIENTE TOEVOEGEN"</string>
-  <string name="Ingredients">"Ingrediënten"</string>
-  <string name="Ingredient">"Ingrediënt"</string>
-  <string name="_Yield_measured_in_2OoRT">"Opbrengst gemeten in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Opbrengstbedrag"</string>
-  <string name="_Cooking_time_2w2fEw">"Kooktijd"</string>
-  <string name="_Preparation_time_15BfxT">"Voorbereidingstijd"</string>
-  <string name="Category">"Categorie"</string>
-  <string name="Title">"Titel"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Recept aanpassen"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Nieuw recept"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Auteur"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"voor het melden van problemen, suggesties en feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Sluit zich aan bij de telegrammengroep"</string>
-  <string name="Version">"Versie"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Ondersteunt volledige back-ups die vanuit deze app worden geëxporteerd"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Importieren vom Backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Maakt een zip-bestand aan met alle gegevens. Dit bestand kan opnieuw worden geïmporteerd."</string>
-  <string name="_Export_a_full_backup_TJfra">"Exporteren naar backup"</string>
-  <string name="Database">"Databank"</string>
+  <string name="cPic">"Foto bijsnijden"</string>
+  <string name="repBtn">"FOTO VERVANGEN"</string>
+  <string name="recPic">"Receptfoto"</string>
+  <string name="req">"Vereist"</string>
+  <string name="nwCat">"Nieuwe categorie"</string>
+  <string name="nwYiU">"Nieuwe eenheid"</string>
+  <string name="rmCmb">"Combinatie verwijderd"</string>
+  <string name="rmN">"Aantekening verwijderd"</string>
+  <string name="rmIns">"Stap verwijderd"</string>
+  <string name="rmIng">"Ingrediënt verwijderd"</string>
+  <string name="kEdit">"DOORGAAN MET BEWERKEN"</string>
+  <string name="disBtn">"VERWERPEN"</string>
+  <string name="disc">"Dit recept bevat niet-opgeslagen wijzigingen. Wat wil je doen?"</string>
+  <string name="unsaved">"Niet-opgeslagen wijzigingen"</string>
+  <string name="ser">"Zoeken"</string>
+  <string name="dBtn">"VERWIJDEREN"</string>
+  <string name="sltd">"geselecteerd"</string>
+  <string name="recs">"recepten"</string>
+  <string name="delRecsInfo">"Je staat op het punt om het volgende te verwijderen:"</string>
+  <string name="delRecInfo">"Je staat op het punt om het volgende recept te verwijderen:"</string>
+  <string name="conf">"Bevestigen"</string>
+  <string name="rmTry">"Verwijderd van \'Later uitproberen\'"</string>
+  <string name="aTry">"Toegevoegd aan \'Later uitproberen\'"</string>
+  <string name="unfavd">"Verwijderd uit favorieten"</string>
+  <string name="favd">"Toegevoegd aan favorieten"</string>
+  <string name="aFBu">"Voeg een recept toe om een back-up te kunnen maken"</string>
+  <string name="dend">"Toegang geweigerd"</string>
+  <string name="conBtn">"DOORGAAN"</string>
+  <string name="nNBtn">"NIET NU"</string>
+  <string name="reqAcc">"EnRecipes vereist toegang tot je interne opslag om een receptfoto toe te kunnen voegen en gegevens te im- en exporteren"</string>
+  <string name="grant">"Toegang verlenen"</string>
+  <string name="nLangInfo">"Herstart EnRecipes om de nieuwe taal in te stellen"</string>
+  <string name="nThmInfo">"Herstart EnRecipes om het nieuwe thema toe te passen"</string>
+  <string name="rst">"HERSTARTEN"</string>
+  <string name="appRst">"Herstart vereist"</string>
+  <string name="SET">"INSTELLEN"</string>
+  <string name="aNBtn">"NIEUW"</string>
+  <string name="ovw">"Overzicht"</string>
+  <string name="fil">"Receptbestand"</string>
+  <string name="rec">"Recepttekst"</string>
+  <string name="pht">"Receptfoto"</string>
+  <string name="shr">"Delen"</string>
+  <string name="min">"min."</string>
+  <string name="hr">"uur"</string>
+  <string name="recTitle">"Mijn gezonde recept"</string>
+  <string name="recListEmp">"Voeg recepten toe en probeer het opnieuw."</string>
+  <string name="selRec">"Recept kiezen"</string>
+  <string name="aBtn">"TOEVOEGEN"</string>
+  <string name="rmLIInfo">"Niet van toepassing op bestaande recepten"</string>
+  <string name="rmUInfo">"Je staat op het punt om de volgende eenheid te verwijderen:"</string>
+  <string name="rmYUInfo">"Je staat op het punt om de volgende eenheid te verwijderen:"</string>
+  <string name="rmCatInfo">"Je staat op het punt om de volgende categorie te verwijderen:"</string>
+  <string name="rmCuiInfo">"Je staat op het punt om de volgende keuken te verwijderen:"</string>
+  <string name="rBtn">"VERWIJDEREN"</string>
+  <string name="cBtn">"ANNULEREN"</string>
+  <string name="srt">"Sorteren op"</string>
+  <string name="stp">"Stap"</string>
+  <string name="it">"Item"</string>
+  <string name="aNoBtn">"AANTEKENING TOEVOEGEN"</string>
+  <string name="nos">"Aantekeningen"</string>
+  <string name="no">"Aantekening"</string>
+  <string name="addCmbBtn">"COMBINATIE TOEVOEGEN"</string>
+  <string name="cmbs">"Combinaties"</string>
+  <string name="cmb">"Combinatie"</string>
+  <string name="aStpBtn">"STAP TOEVOEGEN"</string>
+  <string name="inss">"Stappen"</string>
+  <string name="ins">"Stap"</string>
+  <string name="aIngBtn">"INGREDIËNT TOEVOEGEN"</string>
+  <string name="ings">"Ingrediënten"</string>
+  <string name="ing">"Ingrediënt"</string>
+  <string name="yieldU">"Eenheid"</string>
+  <string name="yieldQ">"Hoeveelheid"</string>
+  <string name="cookT">"Bereidingsduur"</string>
+  <string name="prepT">"Voorbereidingsduur"</string>
+  <string name="cat">"Categorie"</string>
+  <string name="title">"Naam"</string>
+  <string name="editRec">"Recept bewerken"</string>
+  <string name="newRec">"Nieuw recept"</string>
+  <string name="tgInfo">"Hier kun je problemen melden, ideeën delen en feedback geven"</string>
+  <string name="joinTG">"Word lid van de Telegram-groep"</string>
+  <string name="ver">"Versie"</string>
+  <string name="impInfo">"Ondersteunt volledige, door deze app gemaakte back-ups"</string>
+  <string name="impBu">"Gegevens importeren"</string>
+  <string name="buInfo">"Hiermee exporteer je een zip-bestand met al je gegevens dat je later weer kunt importeren"</string>
+  <string name="expBu">"Volledige back-up maken"</string>
+  <string name="db">"Databank"</string>
   <string name="Dark">"Donker"</string>
-  <string name="Light">"Helder"</string>
+  <string name="Light">"Licht"</string>
   <string name="Theme">"Thema"</string>
-  <string name="_System_default_Z1jruVS">"Systeem Standaard"</string>
-  <string name="_App_language_DzFsk">"App taal"</string>
-  <string name="Interface">"Gebruikersinterface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Uw zoekopdracht kwam niet overeen met de recepten in uw Try Later-lijst"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Uw zoekopdracht kwam niet overeen met de recepten in uw favorieten"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Uw zoekopdracht kwam niet overeen met recepten in deze categorie"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Uw zoekopdracht kwam niet overeen met recepten"</string>
-  <string name="_No_recipes_found_Z125IxD">"Geen recepten gevonden"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Categorie is leeg"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recepten die u als favoriet markeert staan hier vermeld"</string>
-  <string name="_No_favourites_yet_aPSoG">"Nog geen favorieten"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recepten die u markeert als proberen later zal hier worden vermeld"</string>
-  <string name="_All_done__72KYl">"Alles klaar!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Gebruik het potloodicoon om wat aantekeningen toe te voegen"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Gebruik het potloodicoon om enkele combinaties toe te voegen"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Gebruik het potloodicoon om wat voorbereidingen toe te voegen"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Gebruik het potloodicoon om wat ingrediënten toe te voegen"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Gebruik het plusteken om er een toe te voegen"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Begin met het toevoegen van uw recepten!"</string>
+  <string name="sysDef">"Systeemtaal"</string>
+  <string name="lang">"Taal"</string>
+  <string name="intf">"Uiterlijk"</string>
+  <string name="noRecsInFtr">"Er zijn geen resultaten die overeenkomen met je filters"</string>
+  <string name="noRecsInFavs">"Er zijn geen overeenkomende zoekresultaten op je favorietenlijst"</string>
+  <string name="noRecsInTL">"Er zijn geen overeenkomende zoekresultaten op je \'Later uitproberen\'-lijst"</string>
+  <string name="noRecs">"Er zijn geen overeenkomende zoekresultaten"</string>
+  <string name="fsList">"Hier vind je je favoriete recepten terug"</string>
+  <string name="noFavs">"Je hebt nog geen favorieten"</string>
+  <string name="tLInfo">"Hier vind je de recepten terug die je later wilt uitproberen"</string>
+  <string name="aD">"Klaar!"</string>
+  <string name="pANo">"Druk op de potloodknop om aantekeningen toe te voegen"</string>
+  <string name="pACmb">"Druk op de potloodknop om combinaties toe te voegen"</string>
+  <string name="pAIns">"Druk op de potloodknop om de bereidingswijze toe te voegen"</string>
+  <string name="pAIng">"Druk op de potloodknop om ingrediënten toe te voegen"</string>
+  <string name="plsAdd">"Druk op de plusknop om er een toe te voegen"</string>
+  <string name="strAdd">"Voeg je recepten toe!"</string>
   <string name="large">"groot"</string>
   <string name="medium">"middelgroot"</string>
-  <string name="small">"kleine"</string>
-  <string name="stick">"stiksel"</string>
-  <string name="dozen">"tientallen"</string>
+  <string name="small">"klein"</string>
+  <string name="stick">"stokje"</string>
+  <string name="dozen">"dozijn"</string>
   <string name="drop">"druppel"</string>
-  <string name="pinch">"knijpen"</string>
-  <string name="piece">"deel"</string>
-  <string name="clove">"kruidnagel"</string>
+  <string name="pinch">"snufje"</string>
+  <string name="piece">"stuk"</string>
+  <string name="clove">"clove"</string>
   <string name="leaf">"blad"</string>
   <string name="in">"in"</string>
   <string name="cm">"cm"</string>
   <string name="kg">"kg"</string>
   <string name="g">"g"</string>
   <string name="mg">"mg"</string>
-  <string name="lb">"Pf"</string>
+  <string name="lb">"lb"</string>
   <string name="oz">"oz"</string>
   <string name="l">"l"</string>
   <string name="ml">"ml"</string>
   <string name="gal">"gal"</string>
   <string name="qt">"qt"</string>
   <string name="pt">"pt"</string>
-  <string name="cup">"Beker"</string>
-  <string name="_fl_oz_72kqu">"fl"</string>
-  <string name="tbsp">"EL"</string>
-  <string name="dsp">"SL"</string>
-  <string name="tsp">"TL"</string>
-  <string name="Unit">"Eenheid"</string>
+  <string name="cup">"beker"</string>
+  <string name="_fl_oz_72kqu">"fl oz"</string>
+  <string name="tbsp">"el"</string>
+  <string name="dsp">"dsl"</string>
+  <string name="tsp">"tl"</string>
   <string name="unit">"eenheid"</string>
   <string name="Loaf">"Brood"</string>
   <string name="Patty">"Pasteitje"</string>
   <string name="Roll">"Rol"</string>
   <string name="Litre">"Liter"</string>
   <string name="Millilitre">"Milliliter"</string>
-  <string name="Gallon">"Galon"</string>
+  <string name="Gallon">"Gallon"</string>
   <string name="Cup">"Beker"</string>
   <string name="Kilogram">"Kilogram"</string>
-  <string name="Gram">"Oproep"</string>
+  <string name="Gram">"Gram"</string>
   <string name="Pound">"Pond"</string>
-  <string name="Ounce">"Ounce"</string>
-  <string name="_Fluid_Ounce_bd10L">"Vloeibare Ounce"</string>
-  <string name="Tablespoon">"EL"</string>
-  <string name="Teaspoon">"TL"</string>
+  <string name="Ounce">"Ons"</string>
+  <string name="_Fluid_Ounce_bd10L">"Vloeibaar ons"</string>
+  <string name="Tablespoon">"Eetlepel"</string>
+  <string name="Teaspoon">"Theelepel"</string>
   <string name="Piece">"Stukje"</string>
   <string name="Serving">"Portie"</string>
   <string name="Vegetarian">"Vegetarisch"</string>
@@ -268,11 +285,11 @@
   <string name="Noodles">"Noedels"</string>
   <string name="Meat">"Vlees"</string>
   <string name="_Main_dishes_u6RGQ">"Hoofdgerechten"</string>
-  <string name="Lunch">"Lunchen"</string>
+  <string name="Lunch">"Lunch"</string>
   <string name="Healthy">"Gezond"</string>
   <string name="Drinks">"Drankjes"</string>
   <string name="Dinner">"Diner"</string>
-  <string name="Desserts">"Toetsen"</string>
+  <string name="Desserts">"Nagerechten"</string>
   <string name="Breakfast">"Ontbijt"</string>
   <string name="Breads">"Broodjes"</string>
   <string name="Beverages">"Drankjes"</string>
@@ -280,194 +297,21 @@
   <string name="Appetizers">"Voorgerechten"</string>
   <string name="About">"Over"</string>
   <string name="Settings">"Instellingen"</string>
-  <string name="Categories">"Categorieën"</string>
-  <string name="_Meal_Planner_2aq4oj">"Maaltijdenplanner"</string>
-  <string name="Favourites">"Favoriten"</string>
-  <string name="_Try_Later_If7PG">"Later proberen"</string>
+  <string name="grocery">"Boodschappenlijst"</string>
+  <string name="planner">"Maaltijdplanner"</string>
+  <string name="favourites">"Favorieten"</string>
+  <string name="trylater">"Later uitproberen"</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>
-  <string name="undo">"Undo"</string>
-  <string name="trnsl">"Translate"</string>
-  <string name="SAT">"SAT"</string>
-  <string name="FRI">"FRI"</string>
-  <string name="THU">"THU"</string>
-  <string name="WED">"WED"</string>
-  <string name="TUE">"TUE"</string>
-  <string name="MON">"MON"</string>
-  <string name="SUN">"SUN"</string>
-  <string name="December">"December"</string>
-  <string name="November">"November"</string>
-  <string name="October">"October"</string>
-  <string name="September">"September"</string>
-  <string name="August">"August"</string>
-  <string name="July">"July"</string>
-  <string name="June">"June"</string>
-  <string name="May">"May"</string>
-  <string name="April">"April"</string>
-  <string name="March">"March"</string>
-  <string name="February">"February"</string>
-  <string name="January">"January"</string>
-  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
-  <string name="help">"Help"</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="donate">"Donate"</string>
-  <string name="invFile">"Invalid file"</string>
-  <string name="buSuc">"Backup saved successfully to the Download folder"</string>
-  <string name="buMod">"The backup file was modified elsewhere"</string>
-  <string name="buEmp">"The backup file is empty"</string>
-  <string name="buInc">"Malformed or corrupt backup file"</string>
-  <string name="impFail">"Import failed"</string>
-  <string name="recRm">"Recipe removed"</string>
-  <string name="untRec">"Untitled Recipe"</string>
-  <string name="stars">"Star rating"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
-  <string name="recU">"recipes updated"</string>
-  <string name="recE">"recipes already exists"</string>
-  <string name="recI">"recipes imported"</string>
-  <string name="recF">"recipes found"</string>
-  <string name="impSuc">"Import success"</string>
-  <string name="tsInfo">"separate with spaces"</string>
-  <string name="ts">"Tags"</string>
-  <string name="noTs">"No tags available"</string>
-  <string name="allTs">"All Tags"</string>
-  <string name="allCats">"All Categories"</string>
-  <string name="allCuis">"All Cuisines"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="newUnit">"New unit"</string>
-  <string name="newCui">"New cuisine"</string>
-  <string name="resNF">"Recipe not found"</string>
-  <string name="restDone">"Reset done"</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="restUL">"Reset unit list"</string>
-  <string name="restYUL">"Reset yield unit list"</string>
-  <string name="restCatL">"Reset category list"</string>
-  <string name="restCuiL">"Reset cuisine list"</string>
-  <string name="rest">"Reset"</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="opts">"Options"</string>
-  <string name="guide">"User guide"</string>
-  <string name="priv">"Privacy policy"</string>
-  <string name="gh">"View on GitHub"</string>
-  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
-  <string name="vrfy">"Verifying"</string>
-  <string name="ltAgo">"a long time ago"</string>
-  <string name="mAgo">"months ago"</string>
-  <string name="wAgo">"weeks ago"</string>
-  <string name="dAgo">"days ago"</string>
-  <string name="triedInfo">"You tried this recipe:"</string>
-  <string name="cPic">"Crop photo"</string>
-  <string name="repBtn">"REPLACE PHOTO"</string>
-  <string name="recPic">"Recipe photo"</string>
-  <string name="req">"Required"</string>
-  <string name="nwCat">"New category"</string>
-  <string name="nwYiU">"New yield unit"</string>
-  <string name="rmCmb">"Combination removed"</string>
-  <string name="rmN">"Note removed"</string>
-  <string name="rmIns">"Instruction removed"</string>
-  <string name="rmIng">"Ingredient removed"</string>
-  <string name="kEdit">"KEEP EDITING"</string>
-  <string name="disBtn">"DISCARD"</string>
-  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
-  <string name="unsaved">"Unsaved changes"</string>
-  <string name="ser">"Search"</string>
-  <string name="dBtn">"DELETE"</string>
-  <string name="sltd">"selected"</string>
-  <string name="recs">"recipes"</string>
-  <string name="delRecsInfo">"You are about to permanently delete:"</string>
-  <string name="delRecInfo">"You are about to permanently delete the recipe:"</string>
-  <string name="conf">"Confirm"</string>
-  <string name="rmTry">"Removed from Try Later"</string>
-  <string name="aTry">"Added to Try Later"</string>
-  <string name="unfavd">"Removed from Favourites"</string>
-  <string name="favd">"Added to Favourites"</string>
-  <string name="aFBu">"Add a recipe to perform a backup"</string>
-  <string name="dend">"Access denied"</string>
-  <string name="conBtn">"CONTINUE"</string>
-  <string name="nNBtn">"NOT NOW"</string>
-  <string name="reqAcc">"EnRecipes requires storage permission in order to set recipe photo, export and import data"</string>
-  <string name="grant">"Grant access"</string>
-  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
-  <string name="nThmInfo">"Restart EnRecipes to use the new theme"</string>
-  <string name="rst">"RESTART"</string>
-  <string name="appRst">"App restart required"</string>
-  <string name="aNBtn">"ADD NEW"</string>
-  <string name="ovw">"Overview"</string>
-  <string name="fil">"Recipe as file"</string>
-  <string name="rec">"Recipe as text"</string>
-  <string name="pht">"Recipe photo"</string>
-  <string name="shr">"Share"</string>
-  <string name="recTitle">"My Healthy Recipe"</string>
-  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
-  <string name="selRec">"Select recipe"</string>
-  <string name="aBtn">"ADD"</string>
-  <string name="rmLIInfo">"Existing recipes will not be affected"</string>
-  <string name="rmUInfo">"You are about to remove the unit:"</string>
-  <string name="rmYUInfo">"You are about to remove the yield unit:"</string>
-  <string name="rmCatInfo">"You are about to remove the category:"</string>
-  <string name="rmCuiInfo">"You are about to remove the cuisine:"</string>
-  <string name="rBtn">"REMOVE"</string>
-  <string name="cBtn">"CANCEL"</string>
-  <string name="srt">"Sort by"</string>
-  <string name="stp">"Step"</string>
-  <string name="it">"Item"</string>
-  <string name="aNoBtn">"ADD NOTE"</string>
-  <string name="nos">"Notes"</string>
-  <string name="no">"Note"</string>
-  <string name="addCmbBtn">"ADD COMBINATION"</string>
-  <string name="cmbs">"Combinations"</string>
-  <string name="cmb">"Combination"</string>
-  <string name="aStpBtn">"ADD STEP"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="aIngBtn">"ADD INGREDIENT"</string>
-  <string name="ings">"Ingredients"</string>
-  <string name="ing">"Ingredient"</string>
-  <string name="yieldU">"Yield unit"</string>
-  <string name="yieldQ">"Yield quantity"</string>
-  <string name="cookT">"Cooking time"</string>
-  <string name="prepT">"Preparation time"</string>
-  <string name="cat">"Category"</string>
-  <string name="title">"Title"</string>
-  <string name="editRec">"Edit recipe"</string>
-  <string name="newRec">"New recipe"</string>
-  <string name="tgInfo">"For reporting issues, suggestions and feedback"</string>
-  <string name="joinTG">"Join the Telegram group"</string>
-  <string name="ver">"Version"</string>
-  <string name="impInfo">"Supports full backups exported by this app"</string>
-  <string name="impBu">"Import data"</string>
-  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
-  <string name="expBu">"Export full backup"</string>
-  <string name="db">"Database"</string>
-  <string name="sysDef">"System default"</string>
-  <string name="lang">"Language"</string>
-  <string name="intf">"Interface"</string>
-  <string name="noRecsInFtr">"No recipes match your search in the Filtered recipes"</string>
-  <string name="noRecsInFavs">"No recipes match your search in the Favourites list"</string>
-  <string name="noRecsInTL">"No recipes match your search in the Try Later list"</string>
-  <string name="noRecs">"No recipes match your search"</string>
-  <string name="fsList">"Your favourite recipes are listed here"</string>
-  <string name="noFavs">"No favourites yet"</string>
-  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
-  <string name="aD">"All done!"</string>
-  <string name="pANo">"Use the pencil button to add notes"</string>
-  <string name="pACmb">"Use the pencil button to add combinations"</string>
-  <string name="pAIns">"Use the pencil button to add instructions"</string>
-  <string name="pAIng">"Use the pencil button to add ingredients"</string>
-  <string name="plsAdd">"Use the plus button to add one"</string>
-  <string name="strAdd">"Start adding your recipes!"</string>
-  <string name="grocery">"Grocery List"</string>
-  <string name="planner">"Meal Planner"</string>
-  <string name="favourites">"Favourites"</string>
-  <string name="trylater">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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
new file mode 100644
index 00000000..10c7b610
--- /dev/null
+++ b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="undo">""</string>
+  <string name="trnsl">""</string>
+  <string name="SAT">""</string>
+  <string name="FRI">""</string>
+  <string name="THU">""</string>
+  <string name="WED">""</string>
+  <string name="TUE">""</string>
+  <string name="MON">""</string>
+  <string name="SUN">""</string>
+  <string name="December">""</string>
+  <string name="November">"Novembro"</string>
+  <string name="October">""</string>
+  <string name="September">""</string>
+  <string name="August">""</string>
+  <string name="July">""</string>
+  <string name="June">""</string>
+  <string name="May">""</string>
+  <string name="April">""</string>
+  <string name="March">""</string>
+  <string name="February">""</string>
+  <string name="January">""</string>
+  <string name="trySer">""</string>
+  <string name="help">""</string>
+  <string name="appInfo">""</string>
+  <string name="donate">""</string>
+  <string name="invFile">""</string>
+  <string name="buSuc">""</string>
+  <string name="buMod">""</string>
+  <string name="buEmp">""</string>
+  <string name="buInc">""</string>
+  <string name="impFail">""</string>
+  <string name="recRm">""</string>
+  <string name="untRec">""</string>
+  <string name="stars">""</string>
+  <string name="Created">"Criar"</string>
+  <string name="_Filtered_recipes_Z1alhhu">""</string>
+  <string name="OK">""</string>
+  <string name="recU">""</string>
+  <string name="recE">""</string>
+  <string name="recI">""</string>
+  <string name="recF">""</string>
+  <string name="impSuc">""</string>
+  <string name="tsInfo">""</string>
+  <string name="ts">""</string>
+  <string name="noTs">""</string>
+  <string name="allTs">""</string>
+  <string name="allCats">""</string>
+  <string name="Vietnamese">""</string>
+  <string name="Turkish">""</string>
+  <string name="Thai">""</string>
+  <string name="Swedish">""</string>
+  <string name="_Sri_Lankan_Z7GfBa">""</string>
+  <string name="Spanish">""</string>
+  <string name="Scottish">""</string>
+  <string name="Russian">""</string>
+  <string name="Portuguese">""</string>
+  <string name="Nigerian">""</string>
+  <string name="Mexican">""</string>
+  <string name="Korean">""</string>
+  <string name="Kenyan">""</string>
+  <string name="Jewish">""</string>
+  <string name="Japanese">""</string>
+  <string name="Jamaican">""</string>
+  <string name="Italian">""</string>
+  <string name="Irish">""</string>
+  <string name="Indian">""</string>
+  <string name="Greek">""</string>
+  <string name="German">""</string>
+  <string name="French">""</string>
+  <string name="Filipino">""</string>
+  <string name="English">""</string>
+  <string name="Egyptian">""</string>
+  <string name="Danish">""</string>
+  <string name="Chinese">""</string>
+  <string name="British">""</string>
+  <string name="Brazilian">""</string>
+  <string name="American">""</string>
+  <string name="allCuis">""</string>
+  <string name="cuis">""</string>
+  <string name="cui">""</string>
+  <string name="Unit">""</string>
+  <string name="newUnit">""</string>
+  <string name="newCui">""</string>
+  <string name="Challenging">""</string>
+  <string name="Moderate">""</string>
+  <string name="Easy">""</string>
+  <string name="_Oldest_first_Z6cq4h">""</string>
+  <string name="_Newest_first_2Sb3c">""</string>
+  <string name="_Last_updated_Z2gEbLD">""</string>
+  <string name="_Difficulty_level_cSL5d">""</string>
+  <string name="Rating">""</string>
+  <string name="_Slowest_first_hHjY6">""</string>
+  <string name="_Quickest_first_Z1CpP7N">""</string>
+  <string name="resNF">""</string>
+  <string name="restDone">""</string>
+  <string name="restInfo">""</string>
+  <string name="restUL">""</string>
+  <string name="restYUL">""</string>
+  <string name="restCatL">""</string>
+  <string name="restCuiL">""</string>
+  <string name="rest">""</string>
+  <string name="sVwInfo">""</string>
+  <string name="sVw">""</string>
+  <string name="opts">""</string>
+  <string name="guide">""</string>
+  <string name="priv">""</string>
+  <string name="gh">""</string>
+  <string name="appCrd">""</string>
+  <string name="vrfy">""</string>
+  <string name="ltAgo">""</string>
+  <string name="mAgo">""</string>
+  <string name="wAgo">""</string>
+  <string name="dAgo">""</string>
+  <string name="yesterday">""</string>
+  <string name="today">""</string>
+  <string name="triedInfo">""</string>
+  <string name="snacks">""</string>
+  <string name="dinner">""</string>
+  <string name="lunch">""</string>
+  <string name="breakfast">""</string>
+  <string name="cPic">""</string>
+  <string name="repBtn">""</string>
+  <string name="recPic">""</string>
+  <string name="req">""</string>
+  <string name="nwCat">""</string>
+  <string name="nwYiU">""</string>
+  <string name="rmCmb">""</string>
+  <string name="rmN">""</string>
+  <string name="rmIns">""</string>
+  <string name="rmIng">""</string>
+  <string name="kEdit">""</string>
+  <string name="disBtn">""</string>
+  <string name="disc">""</string>
+  <string name="unsaved">""</string>
+  <string name="ser">"Procurar"</string>
+  <string name="dBtn">"Deletar"</string>
+  <string name="sltd">"Selecionar"</string>
+  <string name="recs">""</string>
+  <string name="delRecsInfo">""</string>
+  <string name="delRecInfo">""</string>
+  <string name="conf">"Confirmar"</string>
+  <string name="rmTry">""</string>
+  <string name="aTry">""</string>
+  <string name="unfavd">""</string>
+  <string name="favd">""</string>
+  <string name="aFBu">"Adicione um receita para realizar um backup"</string>
+  <string name="dend">"Acesso negado"</string>
+  <string name="conBtn">"continuar"</string>
+  <string name="nNBtn">"AGORA NÃO"</string>
+  <string name="reqAcc">"O EnRecipes requer permissão de armazenamento para definir a foto da receita, exportar e importar dados"</string>
+  <string name="grant">"Garantir acesso"</string>
+  <string name="nLangInfo">"Reinicie o EnRecipes para usar o novo idioma"</string>
+  <string name="nThmInfo">"Reinicie o EnRecipes para usar o novo tema"</string>
+  <string name="rst">"REINICIAR"</string>
+  <string name="appRst">"É necessário reiniciar o aplicativo"</string>
+  <string name="SET">"definir"</string>
+  <string name="aNBtn">"adicionar novo"</string>
+  <string name="ovw">"Resumo"</string>
+  <string name="fil">"Arquivo de receita"</string>
+  <string name="rec">"Texto da receita"</string>
+  <string name="pht">"Foto da receita"</string>
+  <string name="shr">"compartilhar"</string>
+  <string name="min">"min"</string>
+  <string name="hr">"h"</string>
+  <string name="recTitle">"Minha Receita Saudável"</string>
+  <string name="recListEmp">"Nada aqui! Adicione algumas receitas e tente novamente"</string>
+  <string name="selRec">"Selecione a receita"</string>
+  <string name="aBtn">"ADICIONAR"</string>
+  <string name="rmLIInfo">"As receitas existentes não serão afetadas"</string>
+  <string name="rmUInfo">"Você está prestes a remover a unidade:"</string>
+  <string name="rmYUInfo">"Você está prestes a remover a unidade de rendimento:"</string>
+  <string name="rmCatInfo">"Você está prestes a remover a categoria:"</string>
+  <string name="rmCuiInfo">"Você está prestes a remover a cozinha:"</string>
+  <string name="rBtn">"REMOVER"</string>
+  <string name="cBtn">"CANCELAR"</string>
+  <string name="srt">"Ordenar por"</string>
+  <string name="stp">"Etapa"</string>
+  <string name="it">"Item"</string>
+  <string name="aNoBtn">"ADICIONAR NOTA"</string>
+  <string name="nos">"Notas"</string>
+  <string name="no">"Nota"</string>
+  <string name="addCmbBtn">"ADICIONE COMBINAÇÃO"</string>
+  <string name="cmbs">"Combinação"</string>
+  <string name="cmb">"Combinação"</string>
+  <string name="aStpBtn">"ADICIONE ETAPA"</string>
+  <string name="inss">"Instruções"</string>
+  <string name="ins">"Instrução"</string>
+  <string name="aIngBtn">"ADICIONE INGREDIENTE"</string>
+  <string name="ings">"Ingredientes"</string>
+  <string name="ing">"Ingrediente"</string>
+  <string name="yieldU">"Unidade de rendimento"</string>
+  <string name="yieldQ">"Quantidade de rendimento"</string>
+  <string name="cookT">"Tempo de cozimento"</string>
+  <string name="prepT">"Tempo de preparação"</string>
+  <string name="cat">"Categoria"</string>
+  <string name="title">"Título"</string>
+  <string name="editRec">"Editar receita"</string>
+  <string name="newRec">"Nova receita"</string>
+  <string name="tgInfo">"Para relatar problemas, sugestões e feedback"</string>
+  <string name="joinTG">"Junte-se ao grupo Telegram"</string>
+  <string name="ver">"Versão"</string>
+  <string name="impInfo">"Suporta backups completos exportados por este aplicativo"</string>
+  <string name="impBu">"Importar dados"</string>
+  <string name="buInfo">"Gera um arquivo ZIP contendo todos os seus dados que podem ser importados de volta"</string>
+  <string name="expBu">"Exportar backup completo"</string>
+  <string name="db">"Base de dados"</string>
+  <string name="Dark">"Escuro"</string>
+  <string name="Light">"Claro"</string>
+  <string name="Theme">"Tema"</string>
+  <string name="sysDef">"Padrão do sistema"</string>
+  <string name="lang">"Idioma"</string>
+  <string name="intf">"Interface"</string>
+  <string name="noRecsInFtr">"Nenhuma receita corresponde à sua pesquisa nas Receitas Filtradas"</string>
+  <string name="noRecsInFavs">"Nenhuma receita corresponde à sua pesquisa na lista de favoritos"</string>
+  <string name="noRecsInTL">"Nenhuma receita corresponde à sua pesquisa na lista. Tente mais tarde"</string>
+  <string name="noRecs">"Nenhuma receita corresponde à sua pesquisa"</string>
+  <string name="fsList">"Suas receitas favoritas estão listadas aqui"</string>
+  <string name="noFavs">"Ainda não há favoritos"</string>
+  <string name="tLInfo">"As receitas que você deseja experimentar mais tarde estão listadas aqui"</string>
+  <string name="aD">"Tudo feito!"</string>
+  <string name="pANo">"Use o botão de lápis para adicionar notas"</string>
+  <string name="pACmb">"Use o botão de lápis para adicionar combinações"</string>
+  <string name="pAIns">"Use o botão de lápis para adicionar instruções"</string>
+  <string name="pAIng">"Use o botão de lápis para adicionar ingredientes"</string>
+  <string name="plsAdd">"Use o botão de adição para adicionar um"</string>
+  <string name="strAdd">"Comece a adicionar suas receitas!"</string>
+  <string name="large">"grande"</string>
+  <string name="medium">"médio"</string>
+  <string name="small">"pequeno"</string>
+  <string name="stick">"bastão"</string>
+  <string name="dozen">"dúzia"</string>
+  <string name="drop">"solta"</string>
+  <string name="pinch">"pitada"</string>
+  <string name="piece">"peça"</string>
+  <string name="clove">"dente de alho"</string>
+  <string name="leaf">"folha"</string>
+  <string name="in">"Entrar"</string>
+  <string name="cm">"Centimetro"</string>
+  <string name="kg">"Kilo"</string>
+  <string name="g">"grama"</string>
+  <string name="mg">"Miligrama"</string>
+  <string name="lb">"libra"</string>
+  <string name="oz">"onça"</string>
+  <string name="l">"litro"</string>
+  <string name="ml">"ml"</string>
+  <string name="gal">"gal"</string>
+  <string name="qt">"qt"</string>
+  <string name="pt">"pt"</string>
+  <string name="cup">"copo"</string>
+  <string name="_fl_oz_72kqu">"onça fluída"</string>
+  <string name="tbsp">"cds"</string>
+  <string name="dsp">"cds"</string>
+  <string name="tsp">"cc"</string>
+  <string name="unit">"Unidade"</string>
+  <string name="Loaf">"Pão"</string>
+  <string name="Patty">"Empada"</string>
+  <string name="Roll">"Lista"</string>
+  <string name="Litre">"Litro"</string>
+  <string name="Millilitre">"Mililitro"</string>
+  <string name="Gallon">"Galão"</string>
+  <string name="Cup">"Copo"</string>
+  <string name="Kilogram">"Quilograma"</string>
+  <string name="Gram">"Grama"</string>
+  <string name="Pound">"Libra"</string>
+  <string name="Ounce">"Onça"</string>
+  <string name="_Fluid_Ounce_bd10L">"Onça Fluída (Oz.)"</string>
+  <string name="Tablespoon">"Colher de sopa"</string>
+  <string name="Teaspoon">"Colher de chá"</string>
+  <string name="Piece">"Pedaço"</string>
+  <string name="Serving">"Porção"</string>
+  <string name="Vegetarian">"Vegetariano"</string>
+  <string name="Vegan">"Vegano"</string>
+  <string name="Undefined">"Indefinido"</string>
+  <string name="Soups">"Sopas"</string>
+  <string name="Snacks">"Lanches"</string>
+  <string name="_Side_dishes_Z1Et4Vg">"Acompanhamentos"</string>
+  <string name="Seafood">"Frutos do mar"</string>
+  <string name="Sauces">"Molhos"</string>
+  <string name="Salads">"Saladas"</string>
+  <string name="Rice">"Arroz"</string>
+  <string name="Poultry">"Carne de aves"</string>
+  <string name="Pasta">"Macarrão"</string>
+  <string name="Noodles">"Macarrão fita"</string>
+  <string name="Meat">"Carnes"</string>
+  <string name="_Main_dishes_u6RGQ">"Pratos principais"</string>
+  <string name="Lunch">"Almoço"</string>
+  <string name="Healthy">"Saudável"</string>
+  <string name="Drinks">"Bebidas alcoólicas"</string>
+  <string name="Dinner">"Jantar"</string>
+  <string name="Desserts">"Sobremesas"</string>
+  <string name="Breakfast">"Café da manhã"</string>
+  <string name="Breads">"Pães"</string>
+  <string name="Beverages">"Bebidas"</string>
+  <string name="Barbecue">"Churrasco"</string>
+  <string name="Appetizers">"Aperitivos"</string>
+  <string name="About">"Sobre"</string>
+  <string name="Settings">"Ajustes"</string>
+  <string name="grocery">"Lista de compra"</string>
+  <string name="planner">"Planejador de refeições"</string>
+  <string name="favourites">"Favoritos"</string>
+  <string name="trylater">"Experimentar depois"</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 69d0d7ef..017054bd 100644
--- a/app/resources/Android/src/main/res/values-pt/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt/strings.xml
@@ -1,29 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="_Import_failed_Z1dbs6t">"Importeren mislukt"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Receita Sem Título"</string>
-  <string name="_Star_rating_Z11p4Kw">"Classificação por estrelas"</string>
+  <string name="undo">""</string>
+  <string name="trnsl">""</string>
+  <string name="SAT">""</string>
+  <string name="FRI">""</string>
+  <string name="THU">""</string>
+  <string name="WED">""</string>
+  <string name="TUE">""</string>
+  <string name="MON">""</string>
+  <string name="SUN">""</string>
+  <string name="December">""</string>
+  <string name="November">""</string>
+  <string name="October">""</string>
+  <string name="September">""</string>
+  <string name="August">""</string>
+  <string name="July">""</string>
+  <string name="June">""</string>
+  <string name="May">""</string>
+  <string name="April">""</string>
+  <string name="March">""</string>
+  <string name="February">""</string>
+  <string name="January">""</string>
+  <string name="trySer">""</string>
+  <string name="help">""</string>
+  <string name="appInfo">""</string>
+  <string name="donate">""</string>
+  <string name="invFile">""</string>
+  <string name="buSuc">""</string>
+  <string name="buMod">""</string>
+  <string name="buEmp">""</string>
+  <string name="buInc">""</string>
+  <string name="impFail">""</string>
+  <string name="recRm">""</string>
+  <string name="untRec">""</string>
+  <string name="stars">""</string>
   <string name="Created">"Criado"</string>
-  <string name="_Filtered_result_1AMEXe">"Resultados filtrados"</string>
+  <string name="_Filtered_recipes_Z1alhhu">""</string>
   <string name="OK">"OK"</string>
-  <string name="_recipes_updated_Z2arFrR">"receitas atualizadas"</string>
-  <string name="_recipes_already_exists_2jqW2s">"receita já existe"</string>
-  <string name="_recipes_imported_1NGeRw">"receitas importadas"</string>
-  <string name="_recipes_found_ZDdUgV">"receitas encontradas"</string>
-  <string name="_Import_summary_244SkL">"Importar sumário"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separa com espaços"</string>
-  <string name="Tags">"Etiquetas"</string>
-  <string name="_No_tags_available_Z1C5GqD">"Sem etiquetas disponíveis"</string>
-  <string name="_All_Tags_28gMyY">"Todas as Etiquetas"</string>
-  <string name="_All_Categories_Z23JSTS">"Todas as Categorias"</string>
+  <string name="recU">""</string>
+  <string name="recE">""</string>
+  <string name="recI">""</string>
+  <string name="recF">""</string>
+  <string name="impSuc">""</string>
+  <string name="tsInfo">""</string>
+  <string name="ts">""</string>
+  <string name="noTs">""</string>
+  <string name="allTs">""</string>
+  <string name="allCats">""</string>
   <string name="Vietnamese">"Vietnamita"</string>
   <string name="Turkish">"Turca"</string>
   <string name="Thai">"Tailandesa"</string>
@@ -54,17 +77,12 @@
   <string name="British">"Britânica"</string>
   <string name="Brazilian">"Brasileira"</string>
   <string name="American">"Americana"</string>
-  <string name="_All_Cuisines_2hjCp9">"Todas as Cozinhas"</string>
-  <string name="Cuisines">"Cozinhas"</string>
-  <string name="Cuisine">"Cozinha"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Tem certeza que pretende remover"</string>
-  <string name="Units">"Unidades"</string>
-  <string name="_Remove_unit__2x26yq">"Remover unidade?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remover unidade de porção?"</string>
-  <string name="_Remove_category__2reaxz">"Remover categoria?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remover cozinha?"</string>
-  <string name="_New_unit_1CVEEA">"Nova unidade"</string>
-  <string name="_New_cuisine_Zrvs3z">"Nova cozinha"</string>
+  <string name="allCuis">""</string>
+  <string name="cuis">""</string>
+  <string name="cui">""</string>
+  <string name="Unit">"Unidade"</string>
+  <string name="newUnit">""</string>
+  <string name="newCui">""</string>
   <string name="Challenging">"Desafiadora"</string>
   <string name="Moderate">"Moderada"</string>
   <string name="Easy">"Fácil"</string>
@@ -75,139 +93,139 @@
   <string name="Rating">"Avaliação"</string>
   <string name="_Slowest_first_hHjY6">"Mais lentas primeiro"</string>
   <string name="_Quickest_first_Z1CpP7N">"Mais rápidas primeiro"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"A sua pesquisa não encontrou nenhuma receita no resultado filtrado"</string>
-  <string name="_Recipe_not_found_2qGveM">"Receita não encontrada"</string>
-  <string name="_Reset_successful_YxqWK">"Redefinição com sucesso"</string>
-  <string name="_Reset_units_list_msRS3">"Redefinir lista de unidades"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Redefinir lista de porções"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Redefinir lista de categorias"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Redefinir lista de cozinhas"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"A redefinição de uma lista NÃO excluirá as entradas existentes, mas apenas restaurará as entradas padrão excluídas."</string>
-  <string name="Reset">"Redefinir"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Ajuda a escolher o que cozinhar quando não consegue decidir"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Agite para ver receita aleatória"</string>
-  <string name="Options">"Opções"</string>
-  <string name="_User_guide_2uDJCF">"Guia de Utilização"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Política de Privacidade"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Ver no GitHub"</string>
-  <string name="Translator">"Tradutor"</string>
-  <string name="Contributors">"Contribuidores"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Partilhado via EnRecipes. Download na Play Store ou F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permissão recusada"</string>
-  <string name="_Import_successful_2bLM3e">"Importado com sucesso"</string>
-  <string name="_Verifying____cS102">"A Verificar…"</string>
-  <string name="_long_time_ago_1nwlFA">"há muito tempo"</string>
-  <string name="_months_ago_Z1TsskA">"meses atrás"</string>
-  <string name="_weeks_ago_Z2sT1GA">"semanas atrás"</string>
-  <string name="_days_ago_2iCYkm">"dias atrás"</string>
+  <string name="resNF">""</string>
+  <string name="restDone">""</string>
+  <string name="restInfo">""</string>
+  <string name="restUL">""</string>
+  <string name="restYUL">""</string>
+  <string name="restCatL">""</string>
+  <string name="restCuiL">""</string>
+  <string name="rest">""</string>
+  <string name="sVwInfo">""</string>
+  <string name="sVw">""</string>
+  <string name="opts">""</string>
+  <string name="guide">""</string>
+  <string name="priv">""</string>
+  <string name="gh">""</string>
+  <string name="appCrd">""</string>
+  <string name="vrfy">""</string>
+  <string name="ltAgo">""</string>
+  <string name="mAgo">""</string>
+  <string name="wAgo">""</string>
+  <string name="dAgo">""</string>
   <string name="yesterday">"ontem"</string>
   <string name="today">"hoje"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Tentou esta receita:"</string>
+  <string name="triedInfo">""</string>
   <string name="snacks">"lanches"</string>
   <string name="dinner">"jantar"</string>
   <string name="lunch">"almoço"</string>
   <string name="breakfast">"café da manhã"</string>
-  <string name="_Crop_photo_1VL04J">"Cortar foto"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"SUBSTITUIR FOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Foto da receita"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requer permissão de armazenamento para definir a foto da receita."</string>
-  <string name="Required">"Requerido"</string>
-  <string name="_New_category_Weg73">"Nova categoria"</string>
-  <string name="_New_yield_unit_1Oevd2">"Nova unidade de porção"</string>
-  <string name="_Remove_note__2wyMVE">"Remover nota?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remover combinação?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remover instrução?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remover ingrediente?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"CONTINUAR EDIÇÃO"</string>
-  <string name="DISCARD">"DESCARTAR"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Tem certeza que deseja descartar as alterações não salvas nesta receita?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Alterações não salvas"</string>
-  <string name="Search">"Procurar"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Tem certeza que deseja eliminar a receita"</string>
-  <string name="DELETE">"APAGAR"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Eliminar Receita?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removida de Tentar Mais Tarde"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Adicionada a Tentar Mais Tarde"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removido dos Favoritos"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Adicionado aos Favoritos"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Adicione pelo menos uma receita para fazer um backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requer permissão de armazenamento para fazer backup de seus dados neste dispositivo."</string>
-  <string name="CONTINUE">"CONTINUAR"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"AGORA NÃO"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requer permissão de armazenamento para importar seus dados de um backup anterior."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Garantir permissão"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes precisa ser reiniciada para que a alteração da lingua tenha efeito."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes precisa ser reiniciada para que a alteração do tema tenha efeito."</string>
-  <string name="RESTART">"REINICIAR"</string>
-  <string name="_Restart_required_Z22YINL">"É necessário reiniciar"</string>
+  <string name="cPic">""</string>
+  <string name="repBtn">""</string>
+  <string name="recPic">""</string>
+  <string name="req">""</string>
+  <string name="nwCat">""</string>
+  <string name="nwYiU">""</string>
+  <string name="rmCmb">""</string>
+  <string name="rmN">""</string>
+  <string name="rmIns">""</string>
+  <string name="rmIng">""</string>
+  <string name="kEdit">""</string>
+  <string name="disBtn">""</string>
+  <string name="disc">""</string>
+  <string name="unsaved">""</string>
+  <string name="ser">""</string>
+  <string name="dBtn">""</string>
+  <string name="sltd">""</string>
+  <string name="recs">""</string>
+  <string name="delRecsInfo">""</string>
+  <string name="delRecInfo">""</string>
+  <string name="conf">""</string>
+  <string name="rmTry">""</string>
+  <string name="aTry">""</string>
+  <string name="unfavd">""</string>
+  <string name="favd">""</string>
+  <string name="aFBu">""</string>
+  <string name="dend">""</string>
+  <string name="conBtn">""</string>
+  <string name="nNBtn">""</string>
+  <string name="reqAcc">""</string>
+  <string name="grant">""</string>
+  <string name="nLangInfo">""</string>
+  <string name="nThmInfo">""</string>
+  <string name="rst">""</string>
+  <string name="appRst">""</string>
   <string name="SET">"SET"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADICIONAR NOVA"</string>
-  <string name="Share">"Partilhar"</string>
-  <string name="Overview">"Visão Global"</string>
-  <string name="Recipe">"Receita"</string>
-  <string name="Photo">"Foto"</string>
+  <string name="aNBtn">""</string>
+  <string name="ovw">""</string>
+  <string name="fil">""</string>
+  <string name="rec">""</string>
+  <string name="pht">""</string>
+  <string name="shr">""</string>
   <string name="min">"min"</string>
   <string name="hr">"hr"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"A Minha Receita Saudável"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nada aqui! Adicione algumas receitas e tente novamente."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Selecionar a receita"</string>
-  <string name="ADD">"ADICIONAR"</string>
-  <string name="REMOVE">"REMOVER"</string>
-  <string name="CANCEL">"CANCELAR"</string>
-  <string name="_Sort_by_Zq01TF">"Ordenar por"</string>
-  <string name="Step">"Passo"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADICIONAR NOTA"</string>
-  <string name="Notes">"Notas"</string>
-  <string name="Note">"Nota"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADICIONAR COMBINAÇÕES"</string>
-  <string name="Combinations">"Combinações"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADICIONAR PASSO"</string>
-  <string name="Instructions">"Instruções"</string>
-  <string name="Instruction">"Instrução"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADICIONAR INGREDIENTE"</string>
-  <string name="Ingredients">"Ingredientes"</string>
-  <string name="Ingredient">"Ingredientes"</string>
-  <string name="_Yield_measured_in_2OoRT">"Porções medidas em"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Quantidade de porções"</string>
-  <string name="_Cooking_time_2w2fEw">"Tempo de cozimento"</string>
-  <string name="_Preparation_time_15BfxT">"Tempo de preparação"</string>
-  <string name="Category">"Categoria"</string>
-  <string name="Title">"Título"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Editar receita"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Nova receita"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Autor"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"para reportar problemas, sugestões e feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Entrar no grupo do Telegram"</string>
-  <string name="Version">"Versão"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Suporta backups completos exportados por este aplicativo"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Importar do backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Gera um arquivo zip que contém todos os seus dados. Este arquivo pode ser importado de volta."</string>
-  <string name="_Export_a_full_backup_TJfra">"Exportar um backup completo"</string>
-  <string name="Database">"Base de Dados"</string>
+  <string name="recTitle">""</string>
+  <string name="recListEmp">""</string>
+  <string name="selRec">""</string>
+  <string name="aBtn">""</string>
+  <string name="rmLIInfo">""</string>
+  <string name="rmUInfo">""</string>
+  <string name="rmYUInfo">""</string>
+  <string name="rmCatInfo">""</string>
+  <string name="rmCuiInfo">""</string>
+  <string name="rBtn">""</string>
+  <string name="cBtn">""</string>
+  <string name="srt">""</string>
+  <string name="stp">""</string>
+  <string name="it">""</string>
+  <string name="aNoBtn">""</string>
+  <string name="nos">""</string>
+  <string name="no">""</string>
+  <string name="addCmbBtn">""</string>
+  <string name="cmbs">""</string>
+  <string name="cmb">""</string>
+  <string name="aStpBtn">""</string>
+  <string name="inss">""</string>
+  <string name="ins">""</string>
+  <string name="aIngBtn">""</string>
+  <string name="ings">""</string>
+  <string name="ing">""</string>
+  <string name="yieldU">""</string>
+  <string name="yieldQ">""</string>
+  <string name="cookT">""</string>
+  <string name="prepT">""</string>
+  <string name="cat">""</string>
+  <string name="title">""</string>
+  <string name="editRec">""</string>
+  <string name="newRec">""</string>
+  <string name="tgInfo">""</string>
+  <string name="joinTG">""</string>
+  <string name="ver">""</string>
+  <string name="impInfo">""</string>
+  <string name="impBu">""</string>
+  <string name="buInfo">""</string>
+  <string name="expBu">""</string>
+  <string name="db">""</string>
   <string name="Dark">"Escuro"</string>
   <string name="Light">"Claro"</string>
   <string name="Theme">"Tema"</string>
-  <string name="_System_default_Z1jruVS">"Padrão do sistema"</string>
-  <string name="_App_language_DzFsk">"Linguagem da App"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"A sua pesquisa não encontrou nenhuma receita na sua lista tentar mais tarde"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"A sua pesquisa não encontrou nenhuma receita em seus favoritos"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"A sua pesquisa não encontrou nenhuma receita nesta categoria"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"A sua pesquisa não encontrou nenhuma receita"</string>
-  <string name="_No_recipes_found_Z125IxD">"Nenhuma receita encontrada"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Categoria parece vazia"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"As receitas que marcar como favoritas serão listadas aqui"</string>
-  <string name="_No_favourites_yet_aPSoG">"Ainda não há favoritos"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"As receitas que você marcar como tentativa mais tarde serão listadas aqui"</string>
-  <string name="_All_done__72KYl">"Tudo feito!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use o botão lápis para adicionar algumas notas"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use o botão lápis para adicionar algumas combinações"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use o botão lápis para adicionar algumas instruções"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use o botão lápis para adicionar alguns ingredientes"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use o botão de adição para adicionar uma"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Comece a adicionar suas receitas!"</string>
+  <string name="sysDef">""</string>
+  <string name="lang">""</string>
+  <string name="intf">""</string>
+  <string name="noRecsInFtr">""</string>
+  <string name="noRecsInFavs">""</string>
+  <string name="noRecsInTL">""</string>
+  <string name="noRecs">""</string>
+  <string name="fsList">""</string>
+  <string name="noFavs">""</string>
+  <string name="tLInfo">""</string>
+  <string name="aD">""</string>
+  <string name="pANo">""</string>
+  <string name="pACmb">""</string>
+  <string name="pAIns">""</string>
+  <string name="pAIng">""</string>
+  <string name="plsAdd">""</string>
+  <string name="strAdd">"Comece a adicionar as suas receitas"</string>
   <string name="large">"grande"</string>
   <string name="medium">"médio"</string>
   <string name="small">"pequeno"</string>
@@ -235,7 +253,6 @@
   <string name="tbsp">"colher de sopa"</string>
   <string name="dsp">"colher de sobremesa"</string>
   <string name="tsp">"colher de chá"</string>
-  <string name="Unit">"Unidade"</string>
   <string name="unit">"unidade"</string>
   <string name="Loaf">"Loaf"</string>
   <string name="Patty">"Empada"</string>
@@ -280,194 +297,21 @@
   <string name="Appetizers">"Aperitivos"</string>
   <string name="About">"Sobre"</string>
   <string name="Settings">"Definições"</string>
-  <string name="Categories">"Categorias"</string>
-  <string name="_Meal_Planner_2aq4oj">"Planeador de Refeições"</string>
-  <string name="Favourites">"Favoritos"</string>
-  <string name="_Try_Later_If7PG">"Tente Depois"</string>
+  <string name="grocery">"Lista Supermercado"</string>
+  <string name="planner">"Plano Refeições"</string>
+  <string name="favourites">"Favoritos"</string>
+  <string name="trylater">"Tente Mais Tarde"</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>
-  <string name="undo">"Undo"</string>
-  <string name="trnsl">"Translate"</string>
-  <string name="SAT">"SAT"</string>
-  <string name="FRI">"FRI"</string>
-  <string name="THU">"THU"</string>
-  <string name="WED">"WED"</string>
-  <string name="TUE">"TUE"</string>
-  <string name="MON">"MON"</string>
-  <string name="SUN">"SUN"</string>
-  <string name="December">"December"</string>
-  <string name="November">"November"</string>
-  <string name="October">"October"</string>
-  <string name="September">"September"</string>
-  <string name="August">"August"</string>
-  <string name="July">"July"</string>
-  <string name="June">"June"</string>
-  <string name="May">"May"</string>
-  <string name="April">"April"</string>
-  <string name="March">"March"</string>
-  <string name="February">"February"</string>
-  <string name="January">"January"</string>
-  <string name="trySer">"SEARCH IN ALL THE RECIPES?"</string>
-  <string name="help">"Help"</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="donate">"Donate"</string>
-  <string name="invFile">"Invalid file"</string>
-  <string name="buSuc">"Backup saved successfully to the Download folder"</string>
-  <string name="buMod">"The backup file was modified elsewhere"</string>
-  <string name="buEmp">"The backup file is empty"</string>
-  <string name="buInc">"Malformed or corrupt backup file"</string>
-  <string name="impFail">"Import failed"</string>
-  <string name="recRm">"Recipe removed"</string>
-  <string name="untRec">"Untitled Recipe"</string>
-  <string name="stars">"Star rating"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Filtered recipes"</string>
-  <string name="recU">"recipes updated"</string>
-  <string name="recE">"recipes already exists"</string>
-  <string name="recI">"recipes imported"</string>
-  <string name="recF">"recipes found"</string>
-  <string name="impSuc">"Import success"</string>
-  <string name="tsInfo">"separate with spaces"</string>
-  <string name="ts">"Tags"</string>
-  <string name="noTs">"No tags available"</string>
-  <string name="allTs">"All Tags"</string>
-  <string name="allCats">"All Categories"</string>
-  <string name="allCuis">"All Cuisines"</string>
-  <string name="cuis">"Cuisines"</string>
-  <string name="cui">"Cuisine"</string>
-  <string name="newUnit">"New unit"</string>
-  <string name="newCui">"New cuisine"</string>
-  <string name="resNF">"Recipe not found"</string>
-  <string name="restDone">"Reset done"</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="restUL">"Reset unit list"</string>
-  <string name="restYUL">"Reset yield unit list"</string>
-  <string name="restCatL">"Reset category list"</string>
-  <string name="restCuiL">"Reset cuisine list"</string>
-  <string name="rest">"Reset"</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="opts">"Options"</string>
-  <string name="guide">"User guide"</string>
-  <string name="priv">"Privacy policy"</string>
-  <string name="gh">"View on GitHub"</string>
-  <string name="appCrd">"Shared via EnRecipes. Get it on F-Droid, IzzyOnDroid or the Play Store."</string>
-  <string name="vrfy">"Verifying"</string>
-  <string name="ltAgo">"a long time ago"</string>
-  <string name="mAgo">"months ago"</string>
-  <string name="wAgo">"weeks ago"</string>
-  <string name="dAgo">"days ago"</string>
-  <string name="triedInfo">"You tried this recipe:"</string>
-  <string name="cPic">"Crop photo"</string>
-  <string name="repBtn">"REPLACE PHOTO"</string>
-  <string name="recPic">"Recipe photo"</string>
-  <string name="req">"Required"</string>
-  <string name="nwCat">"New category"</string>
-  <string name="nwYiU">"New yield unit"</string>
-  <string name="rmCmb">"Combination removed"</string>
-  <string name="rmN">"Note removed"</string>
-  <string name="rmIns">"Instruction removed"</string>
-  <string name="rmIng">"Ingredient removed"</string>
-  <string name="kEdit">"KEEP EDITING"</string>
-  <string name="disBtn">"DISCARD"</string>
-  <string name="disc">"This recipe has unsaved changes. What would you like to do?"</string>
-  <string name="unsaved">"Unsaved changes"</string>
-  <string name="ser">"Search"</string>
-  <string name="dBtn">"DELETE"</string>
-  <string name="sltd">"selected"</string>
-  <string name="recs">"recipes"</string>
-  <string name="delRecsInfo">"You are about to permanently delete:"</string>
-  <string name="delRecInfo">"You are about to permanently delete the recipe:"</string>
-  <string name="conf">"Confirm"</string>
-  <string name="rmTry">"Removed from Try Later"</string>
-  <string name="aTry">"Added to Try Later"</string>
-  <string name="unfavd">"Removed from Favourites"</string>
-  <string name="favd">"Added to Favourites"</string>
-  <string name="aFBu">"Add a recipe to perform a backup"</string>
-  <string name="dend">"Access denied"</string>
-  <string name="conBtn">"CONTINUE"</string>
-  <string name="nNBtn">"NOT NOW"</string>
-  <string name="reqAcc">"EnRecipes requires storage permission in order to set recipe photo, export and import data"</string>
-  <string name="grant">"Grant access"</string>
-  <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
-  <string name="nThmInfo">"Restart EnRecipes to use the new theme"</string>
-  <string name="rst">"RESTART"</string>
-  <string name="appRst">"App restart required"</string>
-  <string name="aNBtn">"ADD NEW"</string>
-  <string name="ovw">"Overview"</string>
-  <string name="fil">"Recipe as file"</string>
-  <string name="rec">"Recipe as text"</string>
-  <string name="pht">"Recipe photo"</string>
-  <string name="shr">"Share"</string>
-  <string name="recTitle">"My Healthy Recipe"</string>
-  <string name="recListEmp">"Nothing here! Add some recipes and try again"</string>
-  <string name="selRec">"Select recipe"</string>
-  <string name="aBtn">"ADD"</string>
-  <string name="rmLIInfo">"Existing recipes will not be affected"</string>
-  <string name="rmUInfo">"You are about to remove the unit:"</string>
-  <string name="rmYUInfo">"You are about to remove the yield unit:"</string>
-  <string name="rmCatInfo">"You are about to remove the category:"</string>
-  <string name="rmCuiInfo">"You are about to remove the cuisine:"</string>
-  <string name="rBtn">"REMOVE"</string>
-  <string name="cBtn">"CANCEL"</string>
-  <string name="srt">"Sort by"</string>
-  <string name="stp">"Step"</string>
-  <string name="it">"Item"</string>
-  <string name="aNoBtn">"ADD NOTE"</string>
-  <string name="nos">"Notes"</string>
-  <string name="no">"Note"</string>
-  <string name="addCmbBtn">"ADD COMBINATION"</string>
-  <string name="cmbs">"Combinations"</string>
-  <string name="cmb">"Combination"</string>
-  <string name="aStpBtn">"ADD STEP"</string>
-  <string name="inss">"Instructions"</string>
-  <string name="ins">"Instruction"</string>
-  <string name="aIngBtn">"ADD INGREDIENT"</string>
-  <string name="ings">"Ingredients"</string>
-  <string name="ing">"Ingredient"</string>
-  <string name="yieldU">"Yield unit"</string>
-  <string name="yieldQ">"Yield quantity"</string>
-  <string name="cookT">"Cooking time"</string>
-  <string name="prepT">"Preparation time"</string>
-  <string name="cat">"Category"</string>
-  <string name="title">"Title"</string>
-  <string name="editRec">"Edit recipe"</string>
-  <string name="newRec">"New recipe"</string>
-  <string name="tgInfo">"For reporting issues, suggestions and feedback"</string>
-  <string name="joinTG">"Join the Telegram group"</string>
-  <string name="ver">"Version"</string>
-  <string name="impInfo">"Supports full backups exported by this app"</string>
-  <string name="impBu">"Import data"</string>
-  <string name="buInfo">"Generates a ZIP file containing all your data that can be imported back"</string>
-  <string name="expBu">"Export full backup"</string>
-  <string name="db">"Database"</string>
-  <string name="sysDef">"System default"</string>
-  <string name="lang">"Language"</string>
-  <string name="intf">"Interface"</string>
-  <string name="noRecsInFtr">"No recipes match your search in the Filtered recipes"</string>
-  <string name="noRecsInFavs">"No recipes match your search in the Favourites list"</string>
-  <string name="noRecsInTL">"No recipes match your search in the Try Later list"</string>
-  <string name="noRecs">"No recipes match your search"</string>
-  <string name="fsList">"Your favourite recipes are listed here"</string>
-  <string name="noFavs">"No favourites yet"</string>
-  <string name="tLInfo">"Recipes you want to try later are listed here"</string>
-  <string name="aD">"All done!"</string>
-  <string name="pANo">"Use the pencil button to add notes"</string>
-  <string name="pACmb">"Use the pencil button to add combinations"</string>
-  <string name="pAIns">"Use the pencil button to add instructions"</string>
-  <string name="pAIng">"Use the pencil button to add ingredients"</string>
-  <string name="plsAdd">"Use the plus button to add one"</string>
-  <string name="strAdd">"Start adding your recipes!"</string>
-  <string name="grocery">"Grocery List"</string>
-  <string name="planner">"Meal Planner"</string>
-  <string name="favourites">"Favourites"</string>
-  <string name="trylater">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 aa1700aa..c7de808d 100644
--- a/app/resources/Android/src/main/res/values-ru/strings.xml
+++ b/app/resources/Android/src/main/res/values-ru/strings.xml
@@ -1,203 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="undo">"Вернуть"</string>
   <string name="trnsl">"Перевести"</string>
-  <string name="trylater">"Попробовать позже"</string>
-  <string name="favourites">"Избранное"</string>
-  <string name="planner">"Планировщик питания"</string>
-  <string name="grocery">"Список продуктов"</string>
-  <string name="strAdd">"Начните добавлять свои рецепты!"</string>
-  <string name="plsAdd">"Используйте кнопку плюса, чтобы добавить рецепт"</string>
-  <string name="pAIng">"Используйте кнопку карандаша, чтобы добавить ингредиенты"</string>
-  <string name="pAIns">"Используйте кнопку карандаша, чтобы добавить инструкции"</string>
-  <string name="pACmb">"Используйте кнопку карандаша, чтобы добавить несколько комбинаций"</string>
-  <string name="pANo">"Используйте кнопку карандаша, чтобы добавить заметки"</string>
-  <string name="aD">"Все сделано!"</string>
-  <string name="tLInfo">"Здесь будут перечислены рецепты, которые вы хотите попробовать позже"</string>
-  <string name="noFavs">"Пока что нет любимых рецептов"</string>
-  <string name="fsList">"Здесь будут перечислены рецепты, которые вы отметили как любимые"</string>
-  <string name="noRecsInTL">"В списке \"Попробовать позже\" по вашему запросу ничего не найдено"</string>
-  <string name="noRecs">"По вашему запросу ничего не найдено"</string>
-  <string name="noRecsInFavs">"В избранном по вашему запросу ничего не найдено"</string>
-  <string name="noRecsInFtr">"В отфильтрованных рецептах по вашему запросу ничего не найдено"</string>
-  <string name="intf">"Интерфейс"</string>
-  <string name="lang">"Язык"</string>
-  <string name="sysDef">"По умолчанию"</string>
-  <string name="db">"База данных"</string>
-  <string name="expBu">"Экспорт полной резервной копии"</string>
-  <string name="buInfo">"Создает zip-файл, содержащий все ваши данные, которые можно будет импортировать обратно"</string>
-  <string name="impBu">"Импортировать данные"</string>
-  <string name="impInfo">"Поддерживает полные резервные копии, созданные этим приложением"</string>
-  <string name="ver">"Версия"</string>
-  <string name="joinTG">"Присоединяйтесь к группе в Telegram"</string>
-  <string name="tgInfo">"Для сообщения о проблемах, предложений и отзывов"</string>
-  <string name="newRec">"Новый рецепт"</string>
-  <string name="editRec">"Редактировать рецепт"</string>
-  <string name="title">"Заголовок"</string>
-  <string name="cat">"Категория"</string>
-  <string name="prepT">"Время подготовки"</string>
-  <string name="cookT">"Время готовки"</string>
-  <string name="yieldQ">"Подавать в количестве"</string>
-  <string name="yieldU">"Подавать в"</string>
-  <string name="ing">"Ингредиент"</string>
-  <string name="ings">"Ингредиенты"</string>
-  <string name="aIngBtn">"ДОБАВИТЬ ИНГРЕДИЕНТ"</string>
-  <string name="ins">"Инструкция"</string>
-  <string name="inss">"Инструкции"</string>
-  <string name="aStpBtn">"ДОБАВИТЬ ШАГ"</string>
-  <string name="cmb">"Комбинация"</string>
-  <string name="cmbs">"Комбинации"</string>
-  <string name="addCmbBtn">"ДОБАВИТЬ КОМБИНАЦИЮ"</string>
-  <string name="no">"Заметка"</string>
-  <string name="nos">"Заметки"</string>
-  <string name="aNoBtn">"ДОБАВИТЬ ЗАМЕТКУ"</string>
-  <string name="it">"Ингредиент"</string>
-  <string name="stp">"Шаг"</string>
-  <string name="srt">"Сортировать по"</string>
-  <string name="cBtn">"ОТМЕНИТЬ"</string>
-  <string name="rBtn">"УДАЛИТЬ"</string>
-  <string name="rmCuiInfo">"Вы собираетесь удалить кухню:"</string>
-  <string name="rmCatInfo">"Вы собираетесь удалить категорию:"</string>
-  <string name="rmYUInfo">"Вы собираетесь удалить единицу измерения подачи:"</string>
-  <string name="rmUInfo">"Вы собираетесь удалить единицу измерения:"</string>
-  <string name="rmLIInfo">"На существующие рецепты это не повлияет"</string>
-  <string name="aBtn">"ДОБАВИТЬ"</string>
-  <string name="selRec">"Выберите рецепт"</string>
-  <string name="recListEmp">"Здесь ничего нет! Добавьте рецепты и попробуйте еще раз"</string>
-  <string name="recTitle">"Мой полезный рецепт"</string>
-  <string name="shr">"Поделиться"</string>
-  <string name="pht">"Фото рецепта"</string>
-  <string name="ovw">"Краткое описание"</string>
-  <string name="aNBtn">"ДОБАВИТЬ НОВОЕ"</string>
-  <string name="appRst">"Требуется перезапуск приложения"</string>
-  <string name="rst">"ПЕРЕЗАПУСТИТЬ"</string>
-  <string name="nThmInfo">"Перезапустите EnRecipes, чтобы использовать новую тему"</string>
-  <string name="nLangInfo">"Перезапустите EnRecipes, чтобы использовать новый язык"</string>
-  <string name="grant">"Предоставить разрешение"</string>
-  <string name="reqAcc">"EnRecipes требует доступ к файлам для установки фото рецептов, экспорта и импорта данных"</string>
-  <string name="nNBtn">"НЕ СЕЙЧАС"</string>
-  <string name="conBtn">"ПРОДОЛЖИТЬ"</string>
-  <string name="dend">"В доступе отказано"</string>
-  <string name="aFBu">"Добавьте рецепт для резервного копирования"</string>
-  <string name="favd">"Добавлено в избранное"</string>
-  <string name="unfavd">"Удалено из избранного"</string>
-  <string name="aTry">"Добавлено в \"Попробовать позже\""</string>
-  <string name="rmTry">"Удалено из \"Попробовать позже\""</string>
-  <string name="conf">"Подтвердить"</string>
-  <string name="delRecInfo">"Вы собираетесь полностью удалить рецепт:"</string>
-  <string name="delRecsInfo">"Вы собираетесь безвозвратно удалить:"</string>
-  <string name="recs">"рецепты"</string>
-  <string name="sltd">"выбрано"</string>
-  <string name="dBtn">"УДАЛИТЬ"</string>
-  <string name="ser">"Поиск"</string>
-  <string name="unsaved">"Несохраненные изменения"</string>
-  <string name="disc">"В этом рецепте есть несохраненные изменения. Что бы Вы хотели сделать?"</string>
-  <string name="disBtn">"ОТМЕНИТЬ"</string>
-  <string name="kEdit">"ПРОДОЛЖИТЬ РЕДАКТИРОВАНИЕ"</string>
-  <string name="rmIng">"Ингредиент удален"</string>
-  <string name="rmIns">"Инструкция удалена"</string>
-  <string name="rmN">"Заметка удалена"</string>
-  <string name="rmCmb">"Комбинация удалена"</string>
-  <string name="nwYiU">"Новая единица измерения подачи"</string>
-  <string name="nwCat">"Новая категория"</string>
-  <string name="req">"Требуется"</string>
-  <string name="recPic">"Фото рецепта"</string>
-  <string name="repBtn">"ЗАМЕНИТЬ ФОТО"</string>
-  <string name="cPic">"Обрезать фотографию"</string>
-  <string name="triedInfo">"Вы пробовали этот рецепт:"</string>
-  <string name="ltAgo">"давно"</string>
-  <string name="vrfy">"Проверка"</string>
-  <string name="appCrd">"Отправлено через EnRecipes. Загрузите его на F-Droid, IzzyOnDroid или в Play Store."</string>
-  <string name="gh">"Посмотреть на GitHub"</string>
-  <string name="priv">"Политика конфиденциальности"</string>
-  <string name="guide">"Руководство пользователя"</string>
-  <string name="opts">"Параметры"</string>
-  <string name="sVw">"Встряхнуть, чтобы показать случайный рецепт"</string>
-  <string name="sVwInfo">"Помогает выбрать, что приготовить, когда вы не можете решить"</string>
-  <string name="rest">"Сброс"</string>
-  <string name="restCuiL">"Сбросить список кухонь"</string>
-  <string name="restCatL">"Сбросить список категорий"</string>
-  <string name="restYUL">"Сбросить список единиц измерения подачи"</string>
-  <string name="restUL">"Сбросить список единиц измерения"</string>
-  <string name="restInfo">"Сброс списка удалит записи, созданные пользователем, и восстановит записи по умолчанию. На существующие рецепты это не повлияет."</string>
-  <string name="restDone">"Сброс выполнен"</string>
-  <string name="resNF">"Рецепт не найден"</string>
-  <string name="newCui">"Новая кухня"</string>
-  <string name="newUnit">"Новая единица измерения"</string>
-  <string name="cui">"Кухня"</string>
-  <string name="cuis">"Кухни"</string>
-  <string name="allCuis">"Все кухни"</string>
-  <string name="allCats">"Все категории"</string>
-  <string name="allTs">"Все теги"</string>
-  <string name="noTs">"Нету доступных тегов"</string>
-  <string name="ts">"Теги"</string>
-  <string name="tsInfo">"разделяйте пробелами"</string>
-  <string name="impSuc">"Импортировано успешно"</string>
-  <string name="recF">"рецепты найдены"</string>
-  <string name="recI">"рецепты импортированы"</string>
-  <string name="recE">"рецепты уже существуют"</string>
-  <string name="recU">"рецепты обновлены"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"Отфильтрованные рецепты"</string>
-  <string name="stars">"Оценка"</string>
-  <string name="untRec">"Рецепт без названия"</string>
-  <string name="recRm">"Рецепт удален"</string>
-  <string name="impFail">"Импорт не удался"</string>
-  <string name="buInc">"Неправильный или поврежденный файл резервной копии"</string>
-  <string name="buEmp">"Файл резервной копии пуст"</string>
-  <string name="buMod">"Файл резервной копии был изменен в другом месте"</string>
-  <string name="buSuc">"Резервная копия успешно сохранена в папку Загрузки"</string>
-  <string name="donate">"Пожертвовать"</string>
-  <string name="appInfo">"EnRecipes - это цифровая кулинарная книга с открытым исходным кодом, обеспечивающая конфиденциальность, которая позволяет вам создавать, управлять и делиться своими рецептами"</string>
-  <string name="trySer">"ИСКАТЬ ВО ВСЕХ РЕЦЕПТАХ?"</string>
-  <string name="January">"Январь"</string>
-  <string name="February">"Февраль"</string>
-  <string name="March">"Март"</string>
-  <string name="April">"Апрель"</string>
-  <string name="May">"Май"</string>
-  <string name="June">"Июнь"</string>
-  <string name="July">"Июль"</string>
-  <string name="August">"Август"</string>
-  <string name="September">"Сентябрь"</string>
-  <string name="October">"Октябрь"</string>
-  <string name="November">"Ноябрь"</string>
-  <string name="December">"Декабрь"</string>
-  <string name="SUN">"ВС"</string>
-  <string name="MON">"ПН"</string>
-  <string name="TUE">"ВТ"</string>
-  <string name="WED">"СР"</string>
-  <string name="THU">"ЧТ"</string>
-  <string name="FRI">"ПТ"</string>
   <string name="SAT">"СБ"</string>
+  <string name="FRI">"ПТ"</string>
+  <string name="THU">"ЧТ"</string>
+  <string name="WED">"СР"</string>
+  <string name="TUE">"ВТ"</string>
+  <string name="MON">"ПН"</string>
+  <string name="SUN">"ВС"</string>
+  <string name="December">"Декабрь"</string>
+  <string name="November">"Ноябрь"</string>
+  <string name="October">"Октябрь"</string>
+  <string name="September">"Сентябрь"</string>
+  <string name="August">"Август"</string>
+  <string name="July">"Июль"</string>
+  <string name="June">"Июнь"</string>
+  <string name="May">"Май"</string>
+  <string name="April">"Апрель"</string>
+  <string name="March">"Март"</string>
+  <string name="February">"Февраль"</string>
+  <string name="January">"Январь"</string>
+  <string name="trySer">"ИСКАТЬ ВО ВСЕХ РЕЦЕПТАХ?"</string>
   <string name="help">"Помощь"</string>
-  <string name="rec">"Рецепт в виде текста"</string>
-  <string name="dAgo">"дней назад"</string>
-  <string name="wAgo">"недель назад"</string>
-  <string name="mAgo">"месяцев назад"</string>
+  <string name="appInfo">"EnRecipes - это цифровая кулинарная книга с открытым исходным кодом, обеспечивающая конфиденциальность, которая позволяет вам создавать, управлять и делиться своими рецептами"</string>
+  <string name="donate">"Пожертвовать"</string>
   <string name="invFile">"Неверный формат файла"</string>
-  <string name="fil">"Рецепт в виде файла"</string>
-  <string name="_Import_failed_Z1dbs6t">"Импорт не удался"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Убрать рецепт из закусок?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Убрать рецепт из ужиныов?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Убрать рецепт из обедов?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Убрать рецепт из завтраков?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Рецепт без названия"</string>
-  <string name="_Star_rating_Z11p4Kw">"Оценка"</string>
+  <string name="buSuc">"Резервная копия успешно сохранена в папку Загрузки"</string>
+  <string name="buMod">"Файл резервной копии был изменен в другом месте"</string>
+  <string name="buEmp">"Файл резервной копии пуст"</string>
+  <string name="buInc">"Неправильный или поврежденный файл резервной копии"</string>
+  <string name="impFail">"Импорт не удался"</string>
+  <string name="recRm">"Рецепт удален"</string>
+  <string name="untRec">"Рецепт без названия"</string>
+  <string name="stars">"Оценка"</string>
   <string name="Created">"Создано"</string>
-  <string name="_Filtered_result_1AMEXe">"Отфильтрованный результат"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"Отфильтрованные рецепты"</string>
   <string name="OK">"ОК"</string>
-  <string name="_recipes_updated_Z2arFrR">"рецепты обновлены"</string>
-  <string name="_recipes_already_exists_2jqW2s">"рецепты уже существуют"</string>
-  <string name="_recipes_imported_1NGeRw">"рецепты импортированы"</string>
-  <string name="_recipes_found_ZDdUgV">"рецепты найдены"</string>
-  <string name="_Import_summary_244SkL">"Общая информация про импорт"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"разделяйте пробелами"</string>
-  <string name="Tags">"Теги"</string>
-  <string name="_No_tags_available_Z1C5GqD">"Нету доступных тегов"</string>
-  <string name="_All_Tags_28gMyY">"Все теги"</string>
-  <string name="_All_Categories_Z23JSTS">"Все категории"</string>
+  <string name="recU">"рецепты обновлены"</string>
+  <string name="recE">"рецепты уже существуют"</string>
+  <string name="recI">"рецепты импортированы"</string>
+  <string name="recF">"рецепты найдены"</string>
+  <string name="impSuc">"Импортировано успешно"</string>
+  <string name="tsInfo">"разделяйте пробелами"</string>
+  <string name="ts">"Теги"</string>
+  <string name="noTs">"Нету доступных тегов"</string>
+  <string name="allTs">"Все теги"</string>
+  <string name="allCats">"Все категории"</string>
   <string name="Vietnamese">"Вьетнамская"</string>
   <string name="Turkish">"Турецкая"</string>
   <string name="Thai">"Тайская"</string>
@@ -228,17 +77,12 @@
   <string name="British">"Британская"</string>
   <string name="Brazilian">"Бразильская кухня"</string>
   <string name="American">"Американская"</string>
-  <string name="_All_Cuisines_2hjCp9">"Все кухни"</string>
-  <string name="Cuisines">"Кухни"</string>
-  <string name="Cuisine">"Кухня"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Вы уверены что хотите удалить"</string>
-  <string name="Units">"Единицы измерения"</string>
-  <string name="_Remove_unit__2x26yq">"Удалить единицу измерения?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Удалить единицу измерения подачи?"</string>
-  <string name="_Remove_category__2reaxz">"Удалить категорию?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Удалить кухню?"</string>
-  <string name="_New_unit_1CVEEA">"Новая единица измерения"</string>
-  <string name="_New_cuisine_Zrvs3z">"Новая кухня"</string>
+  <string name="allCuis">"Все кухни"</string>
+  <string name="cuis">"Кухни"</string>
+  <string name="cui">"Кухня"</string>
+  <string name="Unit">"Единица измерения"</string>
+  <string name="newUnit">"Новая единица измерения"</string>
+  <string name="newCui">"Новая кухня"</string>
   <string name="Challenging">"Сложный"</string>
   <string name="Moderate">"Средний"</string>
   <string name="Easy">"Легкий"</string>
@@ -249,139 +93,139 @@
   <string name="Rating">"Рейтинг"</string>
   <string name="_Slowest_first_hHjY6">"Сначала самые медленные"</string>
   <string name="_Quickest_first_Z1CpP7N">"Самый быстрый сначала"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"По вашему запросу не найдено ни одного рецепта в отфильтрованном результате"</string>
-  <string name="_Recipe_not_found_2qGveM">"Рецепт не найден"</string>
-  <string name="_Reset_successful_YxqWK">"Сброс выполнен успешно"</string>
-  <string name="_Reset_units_list_msRS3">"Сбросить список единиц измерения"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Сбросить список единиц измерения подачи"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Сбросить список категорий"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Сбросить список кухонь"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Сброс списка НЕ удалит ваши существующие записи, а только восстановит удаленные записи по умолчанию."</string>
-  <string name="Reset">"Сброс"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Помогает выбрать, что приготовить, когда вы не можете решить"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Встряхнуть, чтобы показать случайный рецепт"</string>
-  <string name="Options">"Параметры"</string>
-  <string name="_User_guide_2uDJCF">"Руководство пользователя"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Политика конфиденциальности"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"Проект на GitHub"</string>
-  <string name="Translator">"Переводчик"</string>
-  <string name="Contributors">"Участники"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Отправлено через EnRecipes. Скачайте его в Play Store или F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"В доступе отказано"</string>
-  <string name="_Import_successful_2bLM3e">"Импортировано успешно"</string>
-  <string name="_Verifying____cS102">"Проверка …"</string>
-  <string name="_long_time_ago_1nwlFA">"давно"</string>
-  <string name="_months_ago_Z1TsskA">"несколько месяцев назад"</string>
-  <string name="_weeks_ago_Z2sT1GA">"несколько недель назад"</string>
-  <string name="_days_ago_2iCYkm">"несколько дней назад"</string>
+  <string name="resNF">"Рецепт не найден"</string>
+  <string name="restDone">"Сброс выполнен"</string>
+  <string name="restInfo">"Сброс списка удалит записи, созданные пользователем, и восстановит записи по умолчанию. На существующие рецепты это не повлияет."</string>
+  <string name="restUL">"Сбросить список единиц измерения"</string>
+  <string name="restYUL">"Сбросить список единиц измерения подачи"</string>
+  <string name="restCatL">"Сбросить список категорий"</string>
+  <string name="restCuiL">"Сбросить список кухонь"</string>
+  <string name="rest">"Сброс"</string>
+  <string name="sVwInfo">"Помогает выбрать, что приготовить, когда вы не можете решить"</string>
+  <string name="sVw">"Встряхнуть, чтобы показать случайный рецепт"</string>
+  <string name="opts">"Параметры"</string>
+  <string name="guide">"Руководство пользователя"</string>
+  <string name="priv">"Политика конфиденциальности"</string>
+  <string name="gh">"Посмотреть на GitHub"</string>
+  <string name="appCrd">"Отправлено через EnRecipes. Загрузите его на F-Droid, IzzyOnDroid или в Play Store."</string>
+  <string name="vrfy">"Проверка"</string>
+  <string name="ltAgo">"давно"</string>
+  <string name="mAgo">"месяцев назад"</string>
+  <string name="wAgo">"недель назад"</string>
+  <string name="dAgo">"дней назад"</string>
   <string name="yesterday">"вчера"</string>
   <string name="today">"сегодня"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"Вы пробовали этот рецепт:"</string>
+  <string name="triedInfo">"Вы пробовали этот рецепт:"</string>
   <string name="snacks">"закуски"</string>
   <string name="dinner">"ужин"</string>
   <string name="lunch">"обед"</string>
   <string name="breakfast">"Завтрак"</string>
-  <string name="_Crop_photo_1VL04J">"Обрезать фотографию"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"ЗАМЕНИТЬ ФОТО"</string>
-  <string name="_Recipe_photo_eqm9B">"Фото для рецепта"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes требует доступ к файлам, чтобы установить фото для рецепта."</string>
-  <string name="Required">"Требуется"</string>
-  <string name="_New_category_Weg73">"Новая категория"</string>
-  <string name="_New_yield_unit_1Oevd2">"Новая единица измерения подачи"</string>
-  <string name="_Remove_note__2wyMVE">"Удалить заметку?"</string>
-  <string name="_Remove_combination__1dr2LS">"Удалить комбинацию?"</string>
-  <string name="_Remove_instruction__vkJfi">"Удалить инструкцию?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Удалить ингредиент?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"ПРОДОЛЖИТЬ РЕДАКТИРОВАНИЕ"</string>
-  <string name="DISCARD">"ОТМЕНИТЬ"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Вы уверены, что хотите отменить несохраненные изменения этого рецепта?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Несохраненные изменения"</string>
-  <string name="Search">"Поиск"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Вы уверены, что хотите удалить рецепт"</string>
-  <string name="DELETE">"УДАЛИТЬ"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Удалить рецепт?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Удалено из \"Попробовать позже\""</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Добавлено в \"Попробовать позже\""</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Удалено из избранного"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Добавлено в избранное"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Добавьте хотя бы один рецепт для резервного копирования"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes требует доступ к файлам для резервного копирования ваших данных на это устройство."</string>
-  <string name="CONTINUE">"ПРОДОЛЖИТЬ"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"НЕ СЕЙЧАС"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes требует доступ к файлам, чтобы импортировать ваши данные из предыдущей резервной копии."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Предоставить разрешение"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"Необходимо перезапустить приложение, чтобы изменение языка вступило в силу."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"Необходимо перезапустить приложение, чтобы изменение темы вступило в силу."</string>
-  <string name="RESTART">"ПЕРЕЗАПУСТИТЬ"</string>
-  <string name="_Restart_required_Z22YINL">"Требуется перезапуск"</string>
+  <string name="cPic">"Обрезать фотографию"</string>
+  <string name="repBtn">"ЗАМЕНИТЬ ФОТО"</string>
+  <string name="recPic">"Фото рецепта"</string>
+  <string name="req">"Требуется"</string>
+  <string name="nwCat">"Новая категория"</string>
+  <string name="nwYiU">"Новая единица измерения подачи"</string>
+  <string name="rmCmb">"Комбинация удалена"</string>
+  <string name="rmN">"Заметка удалена"</string>
+  <string name="rmIns">"Инструкция удалена"</string>
+  <string name="rmIng">"Ингредиент удален"</string>
+  <string name="kEdit">"ПРОДОЛЖИТЬ РЕДАКТИРОВАНИЕ"</string>
+  <string name="disBtn">"ОТМЕНИТЬ"</string>
+  <string name="disc">"В этом рецепте есть несохраненные изменения. Что бы Вы хотели сделать?"</string>
+  <string name="unsaved">"Несохраненные изменения"</string>
+  <string name="ser">"Поиск"</string>
+  <string name="dBtn">"УДАЛИТЬ"</string>
+  <string name="sltd">"выбрано"</string>
+  <string name="recs">"рецепты"</string>
+  <string name="delRecsInfo">"Вы собираетесь безвозвратно удалить:"</string>
+  <string name="delRecInfo">"Вы собираетесь полностью удалить рецепт:"</string>
+  <string name="conf">"Подтвердить"</string>
+  <string name="rmTry">"Удалено из \"Попробовать позже\""</string>
+  <string name="aTry">"Добавлено в \"Попробовать позже\""</string>
+  <string name="unfavd">"Удалено из избранного"</string>
+  <string name="favd">"Добавлено в избранное"</string>
+  <string name="aFBu">"Добавьте рецепт для резервного копирования"</string>
+  <string name="dend">"В доступе отказано"</string>
+  <string name="conBtn">"ПРОДОЛЖИТЬ"</string>
+  <string name="nNBtn">"НЕ СЕЙЧАС"</string>
+  <string name="reqAcc">"EnRecipes требует доступ к файлам для установки фото рецептов, экспорта и импорта данных"</string>
+  <string name="grant">"Предоставить разрешение"</string>
+  <string name="nLangInfo">"Перезапустите EnRecipes, чтобы использовать новый язык"</string>
+  <string name="nThmInfo">"Перезапустите EnRecipes, чтобы использовать новую тему"</string>
+  <string name="rst">"ПЕРЕЗАПУСТИТЬ"</string>
+  <string name="appRst">"Требуется перезапуск приложения"</string>
   <string name="SET">"УСТАНОВИТЬ"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ДОБАВИТЬ НОВОЕ"</string>
-  <string name="Share">"Поделиться"</string>
-  <string name="Overview">"Краткое описание"</string>
-  <string name="Recipe">"Рецепт"</string>
-  <string name="Photo">"Фото"</string>
+  <string name="aNBtn">"ДОБАВИТЬ НОВОЕ"</string>
+  <string name="ovw">"Краткое описание"</string>
+  <string name="fil">"Рецепт в виде файла"</string>
+  <string name="rec">"Рецепт в виде текста"</string>
+  <string name="pht">"Фото рецепта"</string>
+  <string name="shr">"Поделиться"</string>
   <string name="min">"мин"</string>
   <string name="hr">"ч"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"Мой полезный рецепт"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Здесь ничего! Добавьте рецепты и попробуйте еще раз."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Выберите рецепт"</string>
-  <string name="ADD">"ДОБАВИТЬ"</string>
-  <string name="REMOVE">"УДАЛИТЬ"</string>
-  <string name="CANCEL">"ОТМЕНИТЬ"</string>
-  <string name="_Sort_by_Zq01TF">"Сортировать по"</string>
-  <string name="Step">"Шаг"</string>
-  <string name="Item">"Ингредиент"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ДОБАВИТЬ ЗАМЕТКУ"</string>
-  <string name="Notes">"Заметки"</string>
-  <string name="Note">"Заметка"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ДОБАВИТЬ КОМБИНАЦИЮ"</string>
-  <string name="Combinations">"Комбинации"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ДОБАВИТЬ ШАГ"</string>
-  <string name="Instructions">"Инструкции"</string>
-  <string name="Instruction">"Инструкция"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ДОБАВИТЬ ИНГРЕДИЕНТ"</string>
-  <string name="Ingredients">"Ингредиенты"</string>
-  <string name="Ingredient">"Ингредиент"</string>
-  <string name="_Yield_measured_in_2OoRT">"Подавать в"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Подавать в количестве"</string>
-  <string name="_Cooking_time_2w2fEw">"Время готовки"</string>
-  <string name="_Preparation_time_15BfxT">"Время подготовки"</string>
-  <string name="Category">"Категория"</string>
-  <string name="Title">"Заголовок"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Редактировать рецепт"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"Новый рецепт"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Автор"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"для сообщения о проблемах, предложений и отзывов"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Присоединяйтесь к группе в Telegram"</string>
-  <string name="Version">"Версия"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Поддерживает полные резервные копии, созданные этим приложением"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Импорт из резервной копии"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Создает zip-файл, содержащий все ваши данные. Этот файл можно импортировать обратно."</string>
-  <string name="_Export_a_full_backup_TJfra">"Экспорт полной резервной копии"</string>
-  <string name="Database">"База данных"</string>
+  <string name="recTitle">"Мой полезный рецепт"</string>
+  <string name="recListEmp">"Здесь ничего нет! Добавьте рецепты и попробуйте еще раз"</string>
+  <string name="selRec">"Выберите рецепт"</string>
+  <string name="aBtn">"ДОБАВИТЬ"</string>
+  <string name="rmLIInfo">"На существующие рецепты это не повлияет"</string>
+  <string name="rmUInfo">"Вы собираетесь удалить единицу измерения:"</string>
+  <string name="rmYUInfo">"Вы собираетесь удалить единицу измерения подачи:"</string>
+  <string name="rmCatInfo">"Вы собираетесь удалить категорию:"</string>
+  <string name="rmCuiInfo">"Вы собираетесь удалить кухню:"</string>
+  <string name="rBtn">"УДАЛИТЬ"</string>
+  <string name="cBtn">"ОТМЕНИТЬ"</string>
+  <string name="srt">"Сортировать по"</string>
+  <string name="stp">"Шаг"</string>
+  <string name="it">"Ингредиент"</string>
+  <string name="aNoBtn">"ДОБАВИТЬ ЗАМЕТКУ"</string>
+  <string name="nos">"Заметки"</string>
+  <string name="no">"Заметка"</string>
+  <string name="addCmbBtn">"ДОБАВИТЬ КОМБИНАЦИЮ"</string>
+  <string name="cmbs">"Комбинации"</string>
+  <string name="cmb">"Комбинация"</string>
+  <string name="aStpBtn">"ДОБАВИТЬ ШАГ"</string>
+  <string name="inss">"Инструкции"</string>
+  <string name="ins">"Инструкция"</string>
+  <string name="aIngBtn">"ДОБАВИТЬ ИНГРЕДИЕНТ"</string>
+  <string name="ings">"Ингредиенты"</string>
+  <string name="ing">"Ингредиент"</string>
+  <string name="yieldU">"Подавать в"</string>
+  <string name="yieldQ">"Подавать в количестве"</string>
+  <string name="cookT">"Время готовки"</string>
+  <string name="prepT">"Время подготовки"</string>
+  <string name="cat">"Категория"</string>
+  <string name="title">"Заголовок"</string>
+  <string name="editRec">"Редактировать рецепт"</string>
+  <string name="newRec">"Новый рецепт"</string>
+  <string name="tgInfo">"Для сообщения о проблемах, предложений и отзывов"</string>
+  <string name="joinTG">"Присоединяйтесь к группе в Telegram"</string>
+  <string name="ver">"Версия"</string>
+  <string name="impInfo">"Поддерживает полные резервные копии, созданные этим приложением"</string>
+  <string name="impBu">"Импортировать данные"</string>
+  <string name="buInfo">"Создает zip-файл, содержащий все ваши данные, которые можно будет импортировать обратно"</string>
+  <string name="expBu">"Экспорт полной резервной копии"</string>
+  <string name="db">"База данных"</string>
   <string name="Dark">"Темная"</string>
   <string name="Light">"Светлая"</string>
   <string name="Theme">"Тема"</string>
-  <string name="_System_default_Z1jruVS">"По умолчанию"</string>
-  <string name="_App_language_DzFsk">"Язык приложения"</string>
-  <string name="Interface">"Интерфейс"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"В списке \"Попробовать позже\" по вашему запросу ничего не найдено"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"В избранном по вашему запросу ничего не найдено "</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"По вашему запросу ничего не найдено в этой категории"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"По вашему запросу ничего не найдено"</string>
-  <string name="_No_recipes_found_Z125IxD">"Рецептов не найдено"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Похоже что в категории нет рецептов"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Здесь будут перечислены рецепты, которые вы отметили как любимые."</string>
-  <string name="_No_favourites_yet_aPSoG">"Пока что нет любимых рецептов"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Здесь будут перечислены рецепты, которые вы хотите попробовать позже"</string>
-  <string name="_All_done__72KYl">"Все сделано!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Используйте кнопку карандаша, чтобы добавить заметки"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Используйте кнопку карандаша, чтобы добавить несколько комбинаций"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Используйте кнопку карандаша, чтобы добавить инструкции"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Используйте кнопку карандаша, чтобы добавить ингредиенты"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Используйте кнопку плюса, чтобы добавить рецепт"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Начните добавлять свои рецепты!"</string>
+  <string name="sysDef">"По умолчанию"</string>
+  <string name="lang">"Язык"</string>
+  <string name="intf">"Интерфейс"</string>
+  <string name="noRecsInFtr">"В отфильтрованных рецептах по вашему запросу ничего не найдено"</string>
+  <string name="noRecsInFavs">"В избранном по вашему запросу ничего не найдено"</string>
+  <string name="noRecsInTL">"В списке \"Попробовать позже\" по вашему запросу ничего не найдено"</string>
+  <string name="noRecs">"По вашему запросу ничего не найдено"</string>
+  <string name="fsList">"Здесь будут перечислены рецепты, которые вы отметили как любимые"</string>
+  <string name="noFavs">"Пока что нет любимых рецептов"</string>
+  <string name="tLInfo">"Здесь будут перечислены рецепты, которые вы хотите попробовать позже"</string>
+  <string name="aD">"Все сделано!"</string>
+  <string name="pANo">"Используйте кнопку карандаша, чтобы добавить заметки"</string>
+  <string name="pACmb">"Используйте кнопку карандаша, чтобы добавить несколько комбинаций"</string>
+  <string name="pAIns">"Используйте кнопку карандаша, чтобы добавить инструкции"</string>
+  <string name="pAIng">"Используйте кнопку карандаша, чтобы добавить ингредиенты"</string>
+  <string name="plsAdd">"Используйте кнопку плюса, чтобы добавить рецепт"</string>
+  <string name="strAdd">"Начните добавлять свои рецепты!"</string>
   <string name="large">"большой"</string>
   <string name="medium">"средний"</string>
   <string name="small">"маленький"</string>
@@ -409,7 +253,6 @@
   <string name="tbsp">"ст.л."</string>
   <string name="dsp">"д.л."</string>
   <string name="tsp">"ч.л.."</string>
-  <string name="Unit">"Единица измерения"</string>
   <string name="unit">"единица измерения"</string>
   <string name="Loaf">"Буханка"</string>
   <string name="Patty">"Лепешка"</string>
@@ -454,20 +297,21 @@
   <string name="Appetizers">"Закуски"</string>
   <string name="About">"О приложении"</string>
   <string name="Settings">"Настройки"</string>
-  <string name="Categories">"Категории"</string>
-  <string name="_Meal_Planner_2aq4oj">"Планировщик питания"</string>
-  <string name="Favourites">"Избранное"</string>
-  <string name="_Try_Later_If7PG">"Попробовать позже"</string>
+  <string name="grocery">"Список продуктов"</string>
+  <string name="planner">"Планировщик питания"</string>
+  <string name="favourites">"Избранное"</string>
+  <string name="trylater">"Попробовать позже"</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>
-  <string name="undo">"Undo"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 555a8442..bd396d23 100644
--- a/app/resources/Android/src/main/res/values-ta/strings.xml
+++ b/app/resources/Android/src/main/res/values-ta/strings.xml
@@ -2,206 +2,51 @@
 <resources>
   <string name="undo">"பின்வாங்கு"</string>
   <string name="trnsl">"மொழிபெயர்"</string>
-  <string name="delRecsInfo">"நீங்கள் நிரந்தரமாக நீக்க உள்ளீர்கள்:"</string>
-  <string name="recs">"சமையல் குறிப்புகள்"</string>
-  <string name="sltd">"தேர்ந்தெடுக்கப்பட்டது"</string>
-  <string name="January">"ஜனவரி"</string>
-  <string name="February">"பிப்ரவரி"</string>
-  <string name="March">"மார்ச்"</string>
-  <string name="April">"ஏப்ரல்"</string>
-  <string name="May">"மே"</string>
-  <string name="June">"ஜூன்"</string>
-  <string name="July">"ஜூலை"</string>
-  <string name="August">"ஆகஸ்ட்"</string>
-  <string name="September">"செப்டம்பர்"</string>
-  <string name="October">"அக்டோபர்"</string>
-  <string name="November">"நவம்பர்"</string>
-  <string name="December">"டிசம்பர்"</string>
-  <string name="TUE">"செவ்வாய்"</string>
-  <string name="SUN">"ஞாயிறு"</string>
-  <string name="MON">"திங்கள்"</string>
-  <string name="WED">"புதன்"</string>
-  <string name="THU">"வியாழன்"</string>
-  <string name="FRI">"வெள்ளி"</string>
   <string name="SAT">"சனி"</string>
-  <string name="fil">"சமையல் குறிப்பு கோப்பாக"</string>
-  <string name="reqAcc">"செய்முறை புகைப்படம் அமைக்க, தரவை ஏற்றுமதி மற்றும் இறக்குமதி செய்ய என்ரெசிபீஸ்க்கு சேமிப்பு அனுமதி தேவை"</string>
-  <string name="conf">"உறுதிசெய்க"</string>
-  <string name="delRecInfo">"நீங்கள் சமையல் குறிப்பை நிரந்தரமாக நீக்க உள்ளீர்கள்:"</string>
-  <string name="disc">"இந்த சமையல் குறிப்பில் சேமிக்கப்படாத மாற்றங்கள் உள்ளன. நீங்கள் என்ன செய்ய விரும்புகிறீர்கள்?"</string>
-  <string name="disBtn">"நிராகரி"</string>
-  <string name="kEdit">"தொடர்ந்து திருத்து"</string>
-  <string name="rmIng">"தேவையான பொருள் நீக்கப்பட்டது"</string>
-  <string name="rmIns">"செய்முறை நீக்கப்பட்டது"</string>
-  <string name="rmN">"குறிப்பு நீக்கப்பட்டது"</string>
-  <string name="rmCmb">"சேர்க்கை நீக்கப்பட்டது"</string>
-  <string name="nwYiU">"புதிய மகசூல் அலகு"</string>
-  <string name="nwCat">"புதிய பகுப்பு"</string>
-  <string name="req">"தேவையான"</string>
-  <string name="recPic">"சமையல் குறிப்பு புகைப்படம்"</string>
-  <string name="repBtn">"புகைப்படத்தை மாற்று"</string>
-  <string name="cPic">"படத்தை வெட்டு"</string>
-  <string name="dAgo">"நாட்களுக்கு முன்பு"</string>
-  <string name="wAgo">"வாரங்களுக்கு முன்பு"</string>
-  <string name="mAgo">"மாதங்களுக்கு முன்பு"</string>
-  <string name="vrfy">"சரிபார்க்கிறது"</string>
-  <string name="appCrd">"என்ரெசிபீஸ் வழியாக பகிரப்பட்டது. அதை எஃப்-டிரயோடு, IzzyOnDroid அல்லது ப்ளே ஸ்டோர் இருந்து பெறுங்கள்."</string>
-  <string name="gh">"கிட்ஹப்பில் காண்க"</string>
-  <string name="priv">"தனியுரிமைக் கொள்கை"</string>
-  <string name="guide">"பயனர் வழிகாட்டி"</string>
-  <string name="opts">"விருப்பங்கள்"</string>
-  <string name="sVw">"சாதனத்தை அசைத்து சீரற்ற சமையல் குறிப்பை காண்க"</string>
-  <string name="sVwInfo">"நீங்கள் தீர்மானிக்க முடியாதபோது என்ன சமைக்கலாம் என்பதைத் தேர்வுசெய்ய உதவும்"</string>
-  <string name="rest">"மீட்டமை"</string>
-  <string name="restCuiL">"உணவு வகை பட்டியலை மீட்டமை"</string>
-  <string name="restCatL">"பகுப்பு பட்டியலை மீட்டமை"</string>
-  <string name="restYUL">"மகசூல் அலகு பட்டியலை மீட்டமை"</string>
-  <string name="restUL">"அலகு பட்டியலை மீட்டமை"</string>
-  <string name="restInfo">"பட்டியலை மீட்டமைப்பது பயனர் உருவாக்கிய உள்ளீடுகளை நீக்கி இயல்புநிலை உள்ளீடுகளை மீட்டமைக்கும். தற்போதுள்ள சமையல் குறிப்புகள் பாதிக்கப்படாது."</string>
-  <string name="restDone">"மீட்டமைக்கப்பட்டது"</string>
-  <string name="resNF">"சமையல் குறிப்பு கிடைக்கவில்லை"</string>
-  <string name="newCui">"புதிய உணவு வகை"</string>
-  <string name="newUnit">"புதிய அலகு"</string>
-  <string name="cui">"உணவு வகை"</string>
-  <string name="cuis">"உணவு வகைகள்"</string>
-  <string name="allCuis">"அனைத்து உணவு வகைகள்"</string>
-  <string name="allCats">"அனைத்து பகுப்புகள்"</string>
-  <string name="allTs">"அனைத்து குறிச்சொற்கள்"</string>
-  <string name="noTs">"குறிச்சொற்கள் எதுவும் கிடைக்கவில்லை"</string>
-  <string name="ts">"குறிச்சொற்கள்"</string>
-  <string name="tsInfo">"இடைவெளிகளுடன் பிரிக்கவும்"</string>
-  <string name="impSuc">"வெற்றிகரமாக இறக்குமதி செய்யப்பட்டது"</string>
-  <string name="recF">"சமையல் குறிப்புகள் கண்டறியப்பட்டது"</string>
-  <string name="recI">"சமையல் குறிப்புகள் இறக்குமதி செய்யப்பட்டது"</string>
-  <string name="recE">"சமையல் குறிப்புகள் ஏற்கனவே உள்ளது"</string>
-  <string name="recU">"சமையல் குறிப்புகள் புதுப்பிக்கப்பட்டது"</string>
-  <string name="_Filtered_recipes_Z1alhhu">"வடிகட்டப்பட்ட சமையல் குறிப்புகள்"</string>
-  <string name="stars">"நட்சத்திர மதிப்பீடு"</string>
-  <string name="untRec">"தலைப்பிடாத சமையல் குறிப்பு"</string>
-  <string name="recRm">"சமையல் குறிப்பு நீக்கப்பட்டது"</string>
-  <string name="impFail">"இறக்குமதி தோல்வியுற்றது"</string>
-  <string name="buInc">"தவறான அல்லது சிதைந்த காப்பு கோப்பு"</string>
-  <string name="buEmp">"காப்பு கோப்பு காலியாக உள்ளது"</string>
-  <string name="buMod">"காப்பு கோப்பு வேறு இடத்தில் மாற்றப்பட்டுள்ளது"</string>
-  <string name="buSuc">"காப்பு கோப்பு பதிவிறக்ககோப்புறையில் வெற்றிகரமாக சேமிக்கப்பட்டது"</string>
-  <string name="invFile">"தவறான கோப்பு"</string>
-  <string name="donate">"நன்கொடை செய்க"</string>
-  <string name="appInfo">"என்ரெசிபீஸ் என்பது ஒரு திறந்த மூல, தனியுரிமைக்கு ஏற்ற டிஜிட்டல் சமையல் புத்தகம், இது உங்கள் சமையல் குறிப்புகளை உருவாக்க, நிர்வகிக்க மற்றும் பகிர உதவுகிறது"</string>
-  <string name="help">"உதவி"</string>
+  <string name="FRI">"வெள்ளி"</string>
+  <string name="THU">"வியாழன்"</string>
+  <string name="WED">"புதன்"</string>
+  <string name="TUE">"செவ்வாய்"</string>
+  <string name="MON">"திங்கள்"</string>
+  <string name="SUN">"ஞாயிறு"</string>
+  <string name="December">"டிசம்பர்"</string>
+  <string name="November">"நவம்பர்"</string>
+  <string name="October">"அக்டோபர்"</string>
+  <string name="September">"செப்டம்பர்"</string>
+  <string name="August">"ஆகஸ்ட்"</string>
+  <string name="July">"ஜூலை"</string>
+  <string name="June">"ஜூன்"</string>
+  <string name="May">"மே"</string>
+  <string name="April">"ஏப்ரல்"</string>
+  <string name="March">"மார்ச்"</string>
+  <string name="February">"பிப்ரவரி"</string>
+  <string name="January">"ஜனவரி"</string>
   <string name="trySer">"எல்லா சமையல் குறிப்புகளிலும் தேடவா?"</string>
-  <string name="dBtn">"நீக்கு"</string>
-  <string name="ser">"தேடு"</string>
-  <string name="unsaved">"சேமிக்கப்படாத மாற்றங்கள்"</string>
-  <string name="triedInfo">"இச்சமையல் குறிப்பை முயற்சித்தீர்கள்:"</string>
-  <string name="ltAgo">"நீண்ட காலத்திற்கு முன்பு"</string>
-  <string name="trylater">"பின்னர் முயற்சிக்க"</string>
-  <string name="favourites">"பிடித்தவை"</string>
-  <string name="planner">"உணவுத் திட்டம்"</string>
-  <string name="grocery">"மளிகை பட்டியல்"</string>
-  <string name="strAdd">"உங்கள் சமையல் குறிப்புகளைச் சேர்க்கத் தொடங்குங்கள்!"</string>
-  <string name="plsAdd">"ஒன்றைச் சேர்க்க பிளஸ் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="pAIng">"தேவையான பொருட்களைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="pAIns">"செய்முறைகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="pACmb">"சேர்க்கைகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="pANo">"குறிப்புகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="aD">"அனைத்தும் செய்யப்பட்டுள்ளன!"</string>
-  <string name="noFavs">"பிடித்தவை எதுவும் இல்லை"</string>
-  <string name="fsList">"உங்களுக்கு பிடித்த சமையல் குறிப்புகள் இங்கே பட்டியலிடப்படும்"</string>
-  <string name="tLInfo">"நீங்கள் பின்னர் முயற்சிக்க விரும்பும் சமையல் குறிப்புகள் இங்கே பட்டியலிடப்படும்"</string>
-  <string name="noRecsInTL">"பின்னர் முயற்சிக்க பட்டியலில் உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
-  <string name="noRecsInFavs">"பிடித்தவை பட்டியலில் உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
-  <string name="noRecsInFtr">"வடிகட்டப்பட்ட சமையல் குறிப்புகளில் உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
-  <string name="intf">"இடைமுகம்"</string>
-  <string name="lang">"மொழி"</string>
-  <string name="sysDef">"அமைப்பு இயல்புநிலை"</string>
-  <string name="noRecs">"உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
-  <string name="db">"தரவுத்தளம்"</string>
-  <string name="expBu">"முழு மறுபிரதி ஏற்றுமதி"</string>
-  <string name="buInfo">"மீண்டும் இறக்குமதி செய்யக்கூடிய உங்கள் எல்லா தரவையும் கொண்ட ஒரு ZIP கோப்பை உருவாக்குகிறது"</string>
-  <string name="impBu">"தரவு இறக்குமதி"</string>
-  <string name="impInfo">"இந்த பயன்பாட்டின் மூலம் ஏற்றுமதி செய்யப்பட்ட முழு காப்புப்பிரதிகளை ஆதரிக்கும்"</string>
-  <string name="ver">"பதிப்பு"</string>
-  <string name="joinTG">"டெலிகிராம் குழுவில் சேரவும்"</string>
-  <string name="tgInfo">"சிக்கல்கள், பரிந்துரைகள் மற்றும் கருத்துக்களைப் புகாரளியுங்கள்"</string>
-  <string name="newRec">"புதிய சமையல் குறிப்பு"</string>
-  <string name="editRec">"சமையல் குறிப்பை திருத்து"</string>
-  <string name="title">"தலைப்பு"</string>
-  <string name="cat">"பகுப்பு"</string>
-  <string name="prepT">"தயாரிப்பு நேரம்"</string>
-  <string name="cookT">"சமைக்கும் நேரம்"</string>
-  <string name="yieldQ">"மகசூல் அளவு"</string>
-  <string name="yieldU">"மகசூல் அலகு"</string>
-  <string name="ing">"தேவையான பொருள்"</string>
-  <string name="ings">"தேவையான பொருட்கள்"</string>
-  <string name="aIngBtn">"பொருளைச் சேர்"</string>
-  <string name="ins">"செய்முறை"</string>
-  <string name="inss">"செய்முறைகள்"</string>
-  <string name="aStpBtn">"செய்முறையைச் சேர்"</string>
-  <string name="cmb">"சேர்க்கை"</string>
-  <string name="cmbs">"சேர்க்கைகள்"</string>
-  <string name="addCmbBtn">"சேர்க்கையைச் சேர்"</string>
-  <string name="no">"குறிப்பு"</string>
-  <string name="nos">"குறிப்புகள்"</string>
-  <string name="aNoBtn">"குறிப்பைச் சேர்"</string>
-  <string name="it">"பொருள்"</string>
-  <string name="srt">"இதன்படி வரிசைப்படுத்து"</string>
-  <string name="cBtn">"ரத்துசெய்"</string>
-  <string name="rBtn">"அகற்று"</string>
-  <string name="rmCatInfo">"நீங்கள் பகுப்பை நீக்க உள்ளீர்கள்:"</string>
-  <string name="rmCuiInfo">"நீங்கள் உணவு வகையை நீக்க உள்ளீர்கள்:"</string>
-  <string name="rmYUInfo">"நீங்கள் மகசூல் அலகு நீக்க உள்ளீர்கள்:"</string>
-  <string name="rmUInfo">"நீங்கள் அலகு நீக்க உள்ளீர்கள்:"</string>
-  <string name="rmLIInfo">"தற்போதுள்ள சமையல் குறிப்புகள் பாதிக்கப்படாது"</string>
-  <string name="aBtn">"சேர்"</string>
-  <string name="selRec">"செய்முறையைத் தேர்ந்தெடுக்கவும்"</string>
-  <string name="recListEmp">"இங்கு எதுவுமில்லை! சில சமையல் குறிப்பிப்புகளை சேர்த்து மீண்டும் முயற்சிக்கவும்"</string>
-  <string name="recTitle">"எனது ஆரோக்கியமான சமையல் குறிப்பு"</string>
-  <string name="pht">"சமையல் குறிப்பு புகைப்படம்"</string>
-  <string name="rec">"சமையல் குறிப்பு உரையாக"</string>
-  <string name="ovw">"கண்ணோட்டம்"</string>
-  <string name="shr">"பகிர்"</string>
-  <string name="aNBtn">"புதியவை சேர்"</string>
-  <string name="appRst">"பயன்பாட்டு மறுதொடக்கம் தேவை"</string>
-  <string name="rst">"மறுதொடக்கம்"</string>
-  <string name="nThmInfo">"புதிய தீம் பயன்படுத்த என்ரெசிபீஸ் ஐ மறுதொடக்கம் செய்யுங்கள்"</string>
-  <string name="nLangInfo">"புதிய மொழியைப் பயன்படுத்த என்ரெசிபீஸ் ஐ மறுதொடக்கம் செய்யுங்கள்"</string>
-  <string name="grant">"அனுமதி வழங்கவும்"</string>
-  <string name="expReq">"காப்புப்பிரதியை ஏற்றுமதி செய்ய சேமிப்பு அனுமதி தேவை."</string>
-  <string name="impReq">"காப்புப்பிரதியை இறக்குமதி செய்ய சேமிப்பு அனுமதி தேவை."</string>
-  <string name="phtReq">"செய்முறை புகைப்படத்தை அமைக்க சேமிப்பு அனுமதி தேவை."</string>
-  <string name="nNBtn">"இப்போது இல்லை"</string>
-  <string name="conBtn">"தொடர்"</string>
-  <string name="dend">"அனுமதி மறுக்கப்பட்டது"</string>
-  <string name="aFBu">"காப்புப்பிரதி செய்ய சமையல் குறிப்பைச் சேர்க்கவும்"</string>
-  <string name="favd">"பிடித்தவையில் சேர்க்கப்பட்டது"</string>
-  <string name="unfavd">"பிடித்தவற்றிலிருந்து அகற்றப்பட்டது"</string>
-  <string name="aTry">"பின்னர் முயற்சிக்க சேர்க்கப்பட்டது"</string>
-  <string name="stp">"செய்முறை"</string>
-  <string name="rmTry">"பின்னர் முயற்சிப்பதில் இருந்து அகற்றப்பட்டது"</string>
-  <string name="_Invalid_file__Z2bRAst">"தவறான கோப்பு:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"காப்பு கோப்பு வெளிப்புறமாக மாற்றப்பட்டுள்ளது."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"காப்பு கோப்பு காலியாக உள்ளது."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"காப்பு கோப்பு தவறானது அல்லது சிதைந்துள்ளது."</string>
-  <string name="_Import_failed_Z1dbs6t">"இறக்குமதி தோல்வியுற்றது"</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"தின்பண்டங்களிலிருந்து சமையல் குறிப்பை அகற்றவா?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"இரவு உணவில் இருந்து சமையல் குறிப்பை அகற்றவா?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"மதிய உணவில் இருந்து சமையல் குறிப்பை அகற்றவா?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"காலை உணவில் இருந்து சமையல் குறிப்பை அகற்றவா?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"பெயரிடப்படாத சமையல் குறிப்பு"</string>
-  <string name="_Star_rating_Z11p4Kw">"நட்சத்திர மதிப்பீடு"</string>
+  <string name="help">"உதவி"</string>
+  <string name="appInfo">"என்ரெசிபீஸ் என்பது ஒரு திறந்த மூல, தனியுரிமைக்கு ஏற்ற டிஜிட்டல் சமையல் புத்தகம், இது உங்கள் சமையல் குறிப்புகளை உருவாக்க, நிர்வகிக்க மற்றும் பகிர உதவுகிறது"</string>
+  <string name="donate">"நன்கொடை செய்க"</string>
+  <string name="invFile">"தவறான கோப்பு"</string>
+  <string name="buSuc">"காப்பு கோப்பு பதிவிறக்ககோப்புறையில் வெற்றிகரமாக சேமிக்கப்பட்டது"</string>
+  <string name="buMod">"காப்பு கோப்பு வேறு இடத்தில் மாற்றப்பட்டுள்ளது"</string>
+  <string name="buEmp">"காப்பு கோப்பு காலியாக உள்ளது"</string>
+  <string name="buInc">"தவறான அல்லது சிதைந்த காப்பு கோப்பு"</string>
+  <string name="impFail">"இறக்குமதி தோல்வியுற்றது"</string>
+  <string name="recRm">"சமையல் குறிப்பு நீக்கப்பட்டது"</string>
+  <string name="untRec">"தலைப்பிடாத சமையல் குறிப்பு"</string>
+  <string name="stars">"நட்சத்திர மதிப்பீடு"</string>
   <string name="Created">"உருவாக்கப்பட்டது"</string>
-  <string name="_Filtered_result_1AMEXe">"வடிகட்டப்பட்ட முடிவு"</string>
+  <string name="_Filtered_recipes_Z1alhhu">"வடிகட்டப்பட்ட சமையல் குறிப்புகள்"</string>
   <string name="OK">"சரி"</string>
-  <string name="_recipes_updated_Z2arFrR">"சமையல் குறிப்புகள் புதுப்பிக்கப்பட்டது"</string>
-  <string name="_recipes_already_exists_2jqW2s">"சமையல் குறிப்புகள் ஏற்கனவே உள்ளது"</string>
-  <string name="_recipes_imported_1NGeRw">"சமையல் குறிப்புகள் இறக்குமதி செய்யப்பட்டது"</string>
-  <string name="_recipes_found_ZDdUgV">"சமையல் குறிப்புகள் கண்டறியப்பட்டது"</string>
-  <string name="_Import_summary_244SkL">"இறக்குமதி சுருக்கம்"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"இடைவெளிகளுடன் பிரிக்கவும்"</string>
-  <string name="Tags">"குறிச்சொற்கள்"</string>
-  <string name="_No_tags_available_Z1C5GqD">"குறிச்சொற்கள் எதுவுமில்லை"</string>
-  <string name="_All_Tags_28gMyY">"அனைத்து குறிச்சொற்கள்"</string>
-  <string name="_All_Categories_Z23JSTS">"அனைத்து பகுப்புகள்"</string>
+  <string name="recU">"சமையல் குறிப்புகள் புதுப்பிக்கப்பட்டது"</string>
+  <string name="recE">"சமையல் குறிப்புகள் ஏற்கனவே உள்ளது"</string>
+  <string name="recI">"சமையல் குறிப்புகள் இறக்குமதி செய்யப்பட்டது"</string>
+  <string name="recF">"சமையல் குறிப்புகள் கண்டறியப்பட்டது"</string>
+  <string name="impSuc">"வெற்றிகரமாக இறக்குமதி செய்யப்பட்டது"</string>
+  <string name="tsInfo">"இடைவெளிகளுடன் பிரிக்கவும்"</string>
+  <string name="ts">"குறிச்சொற்கள்"</string>
+  <string name="noTs">"குறிச்சொற்கள் எதுவும் கிடைக்கவில்லை"</string>
+  <string name="allTs">"அனைத்து குறிச்சொற்கள்"</string>
+  <string name="allCats">"அனைத்து பகுப்புகள்"</string>
   <string name="Vietnamese">"வியட்நாமிய"</string>
   <string name="Turkish">"துருக்கிய"</string>
   <string name="Thai">"தாய்"</string>
@@ -232,17 +77,12 @@
   <string name="British">"பிரிட்டிஷ்"</string>
   <string name="Brazilian">"பிரேசிலிய"</string>
   <string name="American">"அமெரிக்க"</string>
-  <string name="_All_Cuisines_2hjCp9">"அனைத்து உணவு வகைகள்"</string>
-  <string name="Cuisines">"உணவு வகைகள்"</string>
-  <string name="Cuisine">"உணவு வகை"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"இதை நிச்சயமாக அகற்ற விரும்புகிறீர்களா"</string>
-  <string name="Units">"அலகுகள்"</string>
-  <string name="_Remove_unit__2x26yq">"அலகை அகற்றவா?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"மகசூல் அலகை அகற்றவா?"</string>
-  <string name="_Remove_category__2reaxz">"பகுப்பை அகற்றவா?"</string>
-  <string name="_Remove_cuisine__22ftcL">"உணவு வகையை அகற்றவா?"</string>
-  <string name="_New_unit_1CVEEA">"புதிய அலகு"</string>
-  <string name="_New_cuisine_Zrvs3z">"புதிய உணவு வகை"</string>
+  <string name="allCuis">"அனைத்து உணவு வகைகள்"</string>
+  <string name="cuis">"உணவு வகைகள்"</string>
+  <string name="cui">"உணவு வகை"</string>
+  <string name="Unit">"அலகு"</string>
+  <string name="newUnit">"புதிய அலகு"</string>
+  <string name="newCui">"புதிய உணவு வகை"</string>
   <string name="Challenging">"சவாலானது"</string>
   <string name="Moderate">"மிதமானது"</string>
   <string name="Easy">"எளிது"</string>
@@ -253,139 +93,139 @@
   <string name="Rating">"மதிப்பீடு"</string>
   <string name="_Slowest_first_hHjY6">"மெதுவானவை முதலில்"</string>
   <string name="_Quickest_first_Z1CpP7N">"விரைவானவை முதலில்"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"உங்கள் தேடல் வடிகட்டப்பட்ட முடிவில் எந்த சமையல் குறிப்புகளுடனும் பொருந்தவில்லை"</string>
-  <string name="_Recipe_not_found_2qGveM">"சமையல் குறிப்பு கிடைக்கவில்லை"</string>
-  <string name="_Reset_successful_YxqWK">"வெற்றிகரமாக மீட்டமைக்கப்பட்டது"</string>
-  <string name="_Reset_units_list_msRS3">"அலகுகள் பட்டியலை மீட்டமை"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"மகசூல் அலகுகள் பட்டியலை மீட்டமை"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"பகுப்புகள் பட்டியலை மீட்டமை"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"உணவு வகைகள் பட்டியலை மீட்டமை"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"பட்டியலை மீட்டமைப்பது உங்கள் இருக்கும் உள்ளீடுகளை நீக்காது, ஆனால் நீக்கப்பட்ட இயல்புநிலை உள்ளீடுகளை மட்டுமே மீட்டமைக்கும்."</string>
-  <string name="Reset">"மீட்டமை"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"நீங்கள் தீர்மானிக்க முடியாதபோது என்ன சமைக்க வேண்டும் என்பதைத் தேர்வுசெய்ய உதவும்"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"சாதனத்தை அசைத்து சீரற்ற சமையல் குறிப்பை காண்க"</string>
-  <string name="Options">"விருப்பங்கள்"</string>
-  <string name="_User_guide_2uDJCF">"பயனர் வழிகாட்டி"</string>
-  <string name="_Privacy_policy_Zb4ht5">"தனியுரிமைக் கொள்கை"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"கிட்ஹப்பில் காண்க"</string>
-  <string name="Translator">"மொழிபெயர்ப்பாளர்"</string>
-  <string name="Contributors">"பங்களிப்பாளர்கள்"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"என்ரெசிபீஸ் வழியாக பகிரப்பட்டது. அதை ப்ளே ஸ்டோர் அல்லது எஃப்-டிரயோடு இருந்து பெறுங்கள்."</string>
-  <string name="_Permission_denied_Z7wlWK">"அனுமதி மறுக்கப்பட்டது"</string>
-  <string name="_Import_successful_2bLM3e">"வெற்றிகரமாக இறக்குமதி செய்யப்பட்டது"</string>
-  <string name="_Verifying____cS102">"சரிபார்க்கிறது…"</string>
-  <string name="_long_time_ago_1nwlFA">"வெகுகாலத்திற்கு முன்பு"</string>
-  <string name="_months_ago_Z1TsskA">"மாதங்களுக்கு முன்பு"</string>
-  <string name="_weeks_ago_Z2sT1GA">"வாரங்களுக்கு முன்பு"</string>
-  <string name="_days_ago_2iCYkm">"நாட்களுக்கு முன்பு"</string>
+  <string name="resNF">"சமையல் குறிப்பு கிடைக்கவில்லை"</string>
+  <string name="restDone">"மீட்டமைக்கப்பட்டது"</string>
+  <string name="restInfo">"பட்டியலை மீட்டமைப்பது பயனர் உருவாக்கிய உள்ளீடுகளை நீக்கி இயல்புநிலை உள்ளீடுகளை மீட்டமைக்கும். தற்போதுள்ள சமையல் குறிப்புகள் பாதிக்கப்படாது."</string>
+  <string name="restUL">"அலகு பட்டியலை மீட்டமை"</string>
+  <string name="restYUL">"மகசூல் அலகு பட்டியலை மீட்டமை"</string>
+  <string name="restCatL">"பகுப்பு பட்டியலை மீட்டமை"</string>
+  <string name="restCuiL">"உணவு வகை பட்டியலை மீட்டமை"</string>
+  <string name="rest">"மீட்டமை"</string>
+  <string name="sVwInfo">"நீங்கள் தீர்மானிக்க முடியாதபோது என்ன சமைக்கலாம் என்பதைத் தேர்வுசெய்ய உதவும்"</string>
+  <string name="sVw">"சாதனத்தை அசைத்து சீரற்ற சமையல் குறிப்பை காண்க"</string>
+  <string name="opts">"விருப்பங்கள்"</string>
+  <string name="guide">"பயனர் வழிகாட்டி"</string>
+  <string name="priv">"தனியுரிமைக் கொள்கை"</string>
+  <string name="gh">"கிட்ஹப்பில் காண்க"</string>
+  <string name="appCrd">"என்ரெசிபீஸ் வழியாக பகிரப்பட்டது. அதை எஃப்-டிரயோடு, IzzyOnDroid அல்லது ப்ளே ஸ்டோர் இருந்து பெறுங்கள்."</string>
+  <string name="vrfy">"சரிபார்க்கிறது"</string>
+  <string name="ltAgo">"நீண்ட காலத்திற்கு முன்பு"</string>
+  <string name="mAgo">"மாதங்களுக்கு முன்பு"</string>
+  <string name="wAgo">"வாரங்களுக்கு முன்பு"</string>
+  <string name="dAgo">"நாட்களுக்கு முன்பு"</string>
   <string name="yesterday">"நேற்று"</string>
   <string name="today">"இன்று"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"இச்சமையல் குறிப்பை முயற்சித்தீர்கள்:"</string>
+  <string name="triedInfo">"இச்சமையல் குறிப்பை முயற்சித்தீர்கள்:"</string>
   <string name="snacks">"தின்பண்டங்கள்"</string>
   <string name="dinner">"இரவு உணவு"</string>
   <string name="lunch">"மதிய உணவு"</string>
   <string name="breakfast">"காலை உணவு"</string>
-  <string name="_Crop_photo_1VL04J">"படத்தை வெட்டு"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"புகைப்படத்தை மாற்று"</string>
-  <string name="_Recipe_photo_eqm9B">"சமையல் குறிப்பு புகைப்படம்"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"சமையல் குறிப்பு புகைப்படத்தை அமைக்க என்ரெசிபீஸ்க்கு சேமிப்பு அனுமதி தேவை."</string>
-  <string name="Required">"தேவையான"</string>
-  <string name="_New_category_Weg73">"புதிய பகுப்பு"</string>
-  <string name="_New_yield_unit_1Oevd2">"புதிய மகசூல் அலகு"</string>
-  <string name="_Remove_note__2wyMVE">"குறிப்பை அகற்றவா?"</string>
-  <string name="_Remove_combination__1dr2LS">"சேர்க்கையை அகற்றவா?"</string>
-  <string name="_Remove_instruction__vkJfi">"செய்முறையை அகற்றவா?"</string>
-  <string name="_Remove_ingredient__2puvMO">"பொருளை அகற்றவா?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"தொடர்ந்து திருத்து"</string>
-  <string name="DISCARD">"நிராகரி"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"இந்த சமையல் குறிப்பில் சேமிக்கப்படாத மாற்றங்களை நிராகரிக்க விரும்புகிறீர்களா?"</string>
-  <string name="_Unsaved_changes_9fqb4">"சேமிக்கப்படாத மாற்றங்கள்"</string>
-  <string name="Search">"தேடு"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"இந்த சமையல் குறிப்பை நீக்க விரும்புகிறீர்களா"</string>
-  <string name="DELETE">"நீக்கு"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"சமையல் குறிப்பை நீக்கவா?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"பின்னர் முயற்சிப்பதில் இருந்து நீக்கப்பட்டது"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"பின்னர் முயற்சிக்க சேர்க்கப்பட்டது"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"பிடித்தவற்றிலிருந்து அகற்றப்பட்டது"</string>
-  <string name="_Added_to_Favourites_2mzllO">"பிடித்தவையில் சேர்க்கப்பட்டது"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"காப்புப்பிரதி செய்ய குறைந்தபட்சம் ஒரு சமையல் குறிப்பு சேர்க்கவும்"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"இந்தச் சாதனத்தில் உங்கள் தரவை காப்புப் பிரதி எடுக்க என்ரெசிபீஸ்க்கு சேமிப்பக அனுமதி தேவைப்படுகிறது."</string>
-  <string name="CONTINUE">"தொடர்"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"இப்போது இல்லை"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"முந்தைய காப்புப்பிரதியிலிருந்து உங்கள் தரவை இறக்குமதி செய்ய என்ரெசிபீஸ்க்கு சேமிப்பு அனுமதி தேவைப்படுகிறது."</string>
-  <string name="_Grant_permission_Z1UQBuh">"அனுமதி வழங்கவும்"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"பயன்பாட்டு மொழி நடைமுறைக்கு வருவதற்கு என்ரெசிபீஸ் ஐ மீண்டும் தொடங்க வேண்டும்."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"தீம் மாற்றம் நடைமுறைக்கு வருவதற்கு என்ரெசிபீஸ் ஐ மீண்டும் தொடங்க வேண்டும்."</string>
-  <string name="RESTART">"மறுதொடக்கம்"</string>
-  <string name="_Restart_required_Z22YINL">"மறுதொடக்கம் தேவை"</string>
+  <string name="cPic">"படத்தை வெட்டு"</string>
+  <string name="repBtn">"புகைப்படத்தை மாற்று"</string>
+  <string name="recPic">"சமையல் குறிப்பு புகைப்படம்"</string>
+  <string name="req">"தேவையான"</string>
+  <string name="nwCat">"புதிய பகுப்பு"</string>
+  <string name="nwYiU">"புதிய மகசூல் அலகு"</string>
+  <string name="rmCmb">"சேர்க்கை நீக்கப்பட்டது"</string>
+  <string name="rmN">"குறிப்பு நீக்கப்பட்டது"</string>
+  <string name="rmIns">"செய்முறை நீக்கப்பட்டது"</string>
+  <string name="rmIng">"தேவையான பொருள் நீக்கப்பட்டது"</string>
+  <string name="kEdit">"தொடர்ந்து திருத்து"</string>
+  <string name="disBtn">"நிராகரி"</string>
+  <string name="disc">"இந்த சமையல் குறிப்பில் சேமிக்கப்படாத மாற்றங்கள் உள்ளன. நீங்கள் என்ன செய்ய விரும்புகிறீர்கள்?"</string>
+  <string name="unsaved">"சேமிக்கப்படாத மாற்றங்கள்"</string>
+  <string name="ser">"தேடு"</string>
+  <string name="dBtn">"நீக்கு"</string>
+  <string name="sltd">"தேர்ந்தெடுக்கப்பட்டது"</string>
+  <string name="recs">"சமையல் குறிப்புகள்"</string>
+  <string name="delRecsInfo">"நீங்கள் நிரந்தரமாக நீக்க உள்ளீர்கள்:"</string>
+  <string name="delRecInfo">"நீங்கள் சமையல் குறிப்பை நிரந்தரமாக நீக்க உள்ளீர்கள்:"</string>
+  <string name="conf">"உறுதிசெய்க"</string>
+  <string name="rmTry">"பின்னர் முயற்சிப்பதில் இருந்து அகற்றப்பட்டது"</string>
+  <string name="aTry">"பின்னர் முயற்சிக்க சேர்க்கப்பட்டது"</string>
+  <string name="unfavd">"பிடித்தவற்றிலிருந்து அகற்றப்பட்டது"</string>
+  <string name="favd">"பிடித்தவையில் சேர்க்கப்பட்டது"</string>
+  <string name="aFBu">"காப்புப்பிரதி செய்ய சமையல் குறிப்பைச் சேர்க்கவும்"</string>
+  <string name="dend">"அனுமதி மறுக்கப்பட்டது"</string>
+  <string name="conBtn">"தொடர்"</string>
+  <string name="nNBtn">"இப்போது இல்லை"</string>
+  <string name="reqAcc">"செய்முறை புகைப்படம் அமைக்க, தரவை ஏற்றுமதி மற்றும் இறக்குமதி செய்ய என்ரெசிபீஸ்க்கு சேமிப்பு அனுமதி தேவை"</string>
+  <string name="grant">"அனுமதி வழங்கவும்"</string>
+  <string name="nLangInfo">"புதிய மொழியைப் பயன்படுத்த என்ரெசிபீஸ் ஐ மறுதொடக்கம் செய்யுங்கள்"</string>
+  <string name="nThmInfo">"புதிய தீம் பயன்படுத்த என்ரெசிபீஸ் ஐ மறுதொடக்கம் செய்யுங்கள்"</string>
+  <string name="rst">"மறுதொடக்கம்"</string>
+  <string name="appRst">"பயன்பாட்டு மறுதொடக்கம் தேவை"</string>
   <string name="SET">"அமை"</string>
-  <string name="_ADD_NEW_Zv8FjM">"புதியனவற்றை சேர்"</string>
-  <string name="Share">"பகிர்"</string>
-  <string name="Overview">"கண்ணோட்டம்"</string>
-  <string name="Recipe">"சமையல் குறிப்பு"</string>
-  <string name="Photo">"புகைப்படம்"</string>
+  <string name="aNBtn">"புதியவை சேர்"</string>
+  <string name="ovw">"கண்ணோட்டம்"</string>
+  <string name="fil">"சமையல் குறிப்பு கோப்பாக"</string>
+  <string name="rec">"சமையல் குறிப்பு உரையாக"</string>
+  <string name="pht">"சமையல் குறிப்பு புகைப்படம்"</string>
+  <string name="shr">"பகிர்"</string>
   <string name="min">"நிமிடம்"</string>
   <string name="hr">"மணி"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"எனது ஆரோக்கியமான சமையல் குறிப்பு"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"இங்கு எதுவுமில்லை! சில சமையல் குறிப்பிப்புகளை சேர்த்து மீண்டும் முயற்சிக்கவும்."</string>
-  <string name="_Select_a_recipe_2lL8x2">"ஒரு சமையல் குறிப்பை தேர்ந்தெடுக்கவும்"</string>
-  <string name="ADD">"சேர்"</string>
-  <string name="REMOVE">"அகற்று"</string>
-  <string name="CANCEL">"ரத்துசெய்"</string>
-  <string name="_Sort_by_Zq01TF">"வரிசை விதி"</string>
-  <string name="Step">"செயஂமுறை"</string>
-  <string name="Item">"பொருள்"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"குறிப்பைச் சேர்"</string>
-  <string name="Notes">"குறிப்புகள்"</string>
-  <string name="Note">"குறிப்பு"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"சேர்க்கையைச் சேர்"</string>
-  <string name="Combinations">"சேர்க்கைகள்"</string>
-  <string name="_ADD_STEP_ZyMPOe">"செய்முறையைச் சேர்"</string>
-  <string name="Instructions">"செய்முறைகள்"</string>
-  <string name="Instruction">"செய்முறை"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"பொருளைச் சேர்"</string>
-  <string name="Ingredients">"தேவையான பொருட்கள்"</string>
-  <string name="Ingredient">"தேவையான பொருள்"</string>
-  <string name="_Yield_measured_in_2OoRT">"மகசூல் அலகு"</string>
-  <string name="_Yield_quantity_ZHx3jw">"மகசூல் அளவு"</string>
-  <string name="_Cooking_time_2w2fEw">"சமைக்கும் நேரம்"</string>
-  <string name="_Preparation_time_15BfxT">"தயாரிப்பு நேரம்"</string>
-  <string name="Category">"பகுப்பு"</string>
-  <string name="Title">"தலைப்பு"</string>
-  <string name="_Edit_recipe_ZPvwDP">"சமையல் குறிப்பை திருத்து"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"புதிய சமையல் குறிப்பு"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"பா. விஷ்ணு ராகவ்"</string>
-  <string name="Author">"ஆக்கியோன்"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"சிக்கல்கள், பரிந்துரைகள் மற்றும் கருத்துக்களைப் புகாரளிக்க"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"டெலிகிராம் குழுவில் சேரவும்"</string>
-  <string name="Version">"பதிப்பு"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"இந்த பயன்பாட்டின் மூலம் ஏற்றுமதி செய்யப்பட்ட முழு காப்புப்பிரதிகளை ஆதரிக்கும்"</string>
-  <string name="_Import_from_backup_Z28HsC0">"காப்புப்பிரதியிலிருந்து இறக்குமதி செய்க"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"இது உங்கள் எல்லா தரவையும் கொண்ட ஒரு ஜிப் கோப்பை உருவாக்குகிறது. இந்த கோப்பை மீண்டும் இறக்குமதி செய்யலாம்."</string>
-  <string name="_Export_a_full_backup_TJfra">"முழு காப்புப்பிரதியை ஏற்றுமதி செய்க"</string>
-  <string name="Database">"தரவுத்தளம்"</string>
+  <string name="recTitle">"எனது ஆரோக்கியமான சமையல் குறிப்பு"</string>
+  <string name="recListEmp">"இங்கு எதுவுமில்லை! சில சமையல் குறிப்பிப்புகளை சேர்த்து மீண்டும் முயற்சிக்கவும்"</string>
+  <string name="selRec">"செய்முறையைத் தேர்ந்தெடுக்கவும்"</string>
+  <string name="aBtn">"சேர்"</string>
+  <string name="rmLIInfo">"தற்போதுள்ள சமையல் குறிப்புகள் பாதிக்கப்படாது"</string>
+  <string name="rmUInfo">"நீங்கள் அலகு நீக்க உள்ளீர்கள்:"</string>
+  <string name="rmYUInfo">"நீங்கள் மகசூல் அலகு நீக்க உள்ளீர்கள்:"</string>
+  <string name="rmCatInfo">"நீங்கள் பகுப்பை நீக்க உள்ளீர்கள்:"</string>
+  <string name="rmCuiInfo">"நீங்கள் உணவு வகையை நீக்க உள்ளீர்கள்:"</string>
+  <string name="rBtn">"அகற்று"</string>
+  <string name="cBtn">"ரத்துசெய்"</string>
+  <string name="srt">"இதன்படி வரிசைப்படுத்து"</string>
+  <string name="stp">"செய்முறை"</string>
+  <string name="it">"பொருள்"</string>
+  <string name="aNoBtn">"குறிப்பைச் சேர்"</string>
+  <string name="nos">"குறிப்புகள்"</string>
+  <string name="no">"குறிப்பு"</string>
+  <string name="addCmbBtn">"சேர்க்கையைச் சேர்"</string>
+  <string name="cmbs">"சேர்க்கைகள்"</string>
+  <string name="cmb">"சேர்க்கை"</string>
+  <string name="aStpBtn">"செய்முறையைச் சேர்"</string>
+  <string name="inss">"செய்முறைகள்"</string>
+  <string name="ins">"செய்முறை"</string>
+  <string name="aIngBtn">"பொருளைச் சேர்"</string>
+  <string name="ings">"தேவையான பொருட்கள்"</string>
+  <string name="ing">"தேவையான பொருள்"</string>
+  <string name="yieldU">"மகசூல் அலகு"</string>
+  <string name="yieldQ">"மகசூல் அளவு"</string>
+  <string name="cookT">"சமைக்கும் நேரம்"</string>
+  <string name="prepT">"தயாரிப்பு நேரம்"</string>
+  <string name="cat">"பகுப்பு"</string>
+  <string name="title">"தலைப்பு"</string>
+  <string name="editRec">"சமையல் குறிப்பை திருத்து"</string>
+  <string name="newRec">"புதிய சமையல் குறிப்பு"</string>
+  <string name="tgInfo">"சிக்கல்கள், பரிந்துரைகள் மற்றும் கருத்துக்களைப் புகாரளியுங்கள்"</string>
+  <string name="joinTG">"டெலிகிராம் குழுவில் சேரவும்"</string>
+  <string name="ver">"பதிப்பு"</string>
+  <string name="impInfo">"இந்த பயன்பாட்டின் மூலம் ஏற்றுமதி செய்யப்பட்ட முழு காப்புப்பிரதிகளை ஆதரிக்கும்"</string>
+  <string name="impBu">"தரவு இறக்குமதி"</string>
+  <string name="buInfo">"மீண்டும் இறக்குமதி செய்யக்கூடிய உங்கள் எல்லா தரவையும் கொண்ட ஒரு ZIP கோப்பை உருவாக்குகிறது"</string>
+  <string name="expBu">"முழு மறுபிரதி ஏற்றுமதி"</string>
+  <string name="db">"தரவுத்தளம்"</string>
   <string name="Dark">"இருள்"</string>
   <string name="Light">"ஒளி"</string>
   <string name="Theme">"தீம்"</string>
-  <string name="_System_default_Z1jruVS">"கணினி இயல்புநிலை"</string>
-  <string name="_App_language_DzFsk">"பயன்பாட்டு மொழி"</string>
-  <string name="Interface">"இடைமுகம்"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"உங்கள் தேடல் நீங்கள் முயற்சிக்க வேண்டிய பட்டியலில் உள்ள எந்த சமையல் குறிப்புகளுடனும் பொருந்தவில்ல"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"உங்கள் தேடல் உங்களுக்கு பிடித்தவற்றில் எந்த சமையல் குறிப்புகளுடனும் பொருந்தவில்லைை"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"உங்கள் தேடல் இப்பகுப்பில் எந்த சமையல் குறிப்புகளுடனும் பொருந்தவில்லை"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"உங்கள் தேடல் எந்த சமையல் குறிப்புகளுடனும் பொருந்தவில்லை"</string>
-  <string name="_No_recipes_found_Z125IxD">"எந்த சமையல் குறிப்புகளும் இல்லை"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"இந்த பகுப்பில் எந்த சமையல் குறிப்புகளும் இல்லை"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"நீங்கள் பிடித்ததாகக் குறிக்கும் சமையல் குறிப்புகள் இங்கே பட்டியலிடப்படும்"</string>
-  <string name="_No_favourites_yet_aPSoG">"இன்னும் பிடித்தவை எதுவும் இல்லை"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"முயற்சிக்க வேண்டும் என நீங்கள் குறிக்கும் சமையல் குறிப்புகள் இங்கே பட்டியலிடப்படும்"</string>
-  <string name="_All_done__72KYl">"அனைத்தும் செய்யப்பட்டுள்ளன!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"சில குறிப்புகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"சில சேர்க்கைகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"செய்முறைகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"தேவையான பொருட்களைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"ஒரு சமையல் குறிப்பைச் சேர்க்க பிளஸ் பொத்தானைப் பயன்படுத்தவும்"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"உங்கள் சமையல் குறிப்புகளைச் சேர்க்கத் தொடங்குங்கள்!"</string>
+  <string name="sysDef">"அமைப்பு இயல்புநிலை"</string>
+  <string name="lang">"மொழி"</string>
+  <string name="intf">"இடைமுகம்"</string>
+  <string name="noRecsInFtr">"வடிகட்டப்பட்ட சமையல் குறிப்புகளில் உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
+  <string name="noRecsInFavs">"பிடித்தவை பட்டியலில் உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
+  <string name="noRecsInTL">"பின்னர் முயற்சிக்க பட்டியலில் உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
+  <string name="noRecs">"உங்கள் தேடலுடன் எந்த சமையல் குறிப்புகளும் பொருந்தவில்லை"</string>
+  <string name="fsList">"உங்களுக்கு பிடித்த சமையல் குறிப்புகள் இங்கே பட்டியலிடப்படும்"</string>
+  <string name="noFavs">"பிடித்தவை எதுவும் இல்லை"</string>
+  <string name="tLInfo">"நீங்கள் பின்னர் முயற்சிக்க விரும்பும் சமையல் குறிப்புகள் இங்கே பட்டியலிடப்படும்"</string>
+  <string name="aD">"அனைத்தும் செய்யப்பட்டுள்ளன!"</string>
+  <string name="pANo">"குறிப்புகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
+  <string name="pACmb">"சேர்க்கைகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
+  <string name="pAIns">"செய்முறைகளைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
+  <string name="pAIng">"தேவையான பொருட்களைச் சேர்க்க பென்சில் பொத்தானைப் பயன்படுத்தவும்"</string>
+  <string name="plsAdd">"ஒன்றைச் சேர்க்க பிளஸ் பொத்தானைப் பயன்படுத்தவும்"</string>
+  <string name="strAdd">"உங்கள் சமையல் குறிப்புகளைச் சேர்க்கத் தொடங்குங்கள்!"</string>
   <string name="large">"பெரிய"</string>
   <string name="medium">"நடுத்தர"</string>
   <string name="small">"சிறிய"</string>
@@ -413,7 +253,6 @@
   <string name="tbsp">"தேக்கரண்டி"</string>
   <string name="dsp">"இனிப்பு ஸ்பூன்"</string>
   <string name="tsp">"டீஸ்பூன்"</string>
-  <string name="Unit">"அலகு"</string>
   <string name="unit">"அலகு"</string>
   <string name="Loaf">"ரொட்டித் துண்டு"</string>
   <string name="Patty">"வடை"</string>
@@ -458,16 +297,21 @@
   <string name="Appetizers">"பசித்தூண்டி"</string>
   <string name="About">"பற்றி"</string>
   <string name="Settings">"அமைப்புகள்"</string>
-  <string name="Categories">"பிரிவுகள்"</string>
-  <string name="_Meal_Planner_2aq4oj">"உணவுத் திட்டம்"</string>
-  <string name="Favourites">"பிடித்தவை"</string>
-  <string name="_Try_Later_If7PG">"பின்னர் முயற்சிக்க"</string>
+  <string name="grocery">"மளிகை பட்டியல்"</string>
+  <string name="planner">"உணவுத் திட்டம்"</string>
+  <string name="favourites">"பிடித்தவை"</string>
+  <string name="trylater">"பின்னர் முயற்சிக்க"</string>
   <string name="EnRecipes">"என்ரெசிபீஸ்"</string>
   <string name="_app_name_1k3Sbz">"என்ரெசிபீஸ்"</string>
   <string name="app_name">"என்ரெசிபீஸ்"</string>
   <string name="title_activity_kimera">"என்ரெசிபீஸ்"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</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 d939bbe1..f4c90d0b 100644
--- a/app/resources/Android/src/main/res/values-te/strings.xml
+++ b/app/resources/Android/src/main/res/values-te/strings.xml
@@ -300,174 +300,18 @@
   <string name="planner">""</string>
   <string name="favourites">""</string>
   <string name="trylater">""</string>
-  <string name="EnRecipes">""</string>
-  <string name="_app_name_1k3Sbz">""</string>
-  <string name="app_name">""</string>
-  <string name="title_activity_kimera">""</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>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
   <string name="undo">"Undo"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-v21/styles.xml b/app/resources/Android/src/main/res/values-v21/styles.xml
index 5b36921d..eb27e7ad 100644
--- a/app/resources/Android/src/main/res/values-v21/styles.xml
+++ b/app/resources/Android/src/main/res/values-v21/styles.xml
@@ -1,28 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Application theme -->
     <style name="AppThemeBase21" parent="AppThemeBase">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
-        <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
-    </style>
-
-    <style name="AppTheme" parent="AppThemeBase21">
-    </style>
-
-    <!-- Default style for DatePicker - in spinner mode -->
-    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
-        <item name="android:datePickerMode">spinner</item>
-    </style>
-
-    <!-- Default style for TimePicker - in spinner mode -->
-    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
-        <item name="android:timePickerMode">spinner</item>
-    </style>
-
-    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
-        <item name="android:elevation">4dp</item>
-        <!-- <item name="android:paddingTop">24dp</item> -->
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/resources/Android/src/main/res/values-v29/styles.xml b/app/resources/Android/src/main/res/values-v29/styles.xml
index 58504a20..7542925a 100644
--- a/app/resources/Android/src/main/res/values-v29/styles.xml
+++ b/app/resources/Android/src/main/res/values-v29/styles.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Application theme -->
     <style name="AppThemeBase29" parent="AppThemeBase21">
         <item name="android:forceDarkAllowed">false</item>
     </style>
-
-    <style name="AppTheme" parent="AppThemeBase29">
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/resources/Android/src/main/res/values/strings.xml b/app/resources/Android/src/main/res/values/strings.xml
index 4bee463b..34b9270f 100644
--- a/app/resources/Android/src/main/res/values/strings.xml
+++ b/app/resources/Android/src/main/res/values/strings.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="yld">"Yield"</string>
+  <string name="fltr">"Filter"</string>
+  <string name="apply">"APPLY"</string>
+  <string name="minimal">"Minimal"</string>
+  <string name="grid">"Grid"</string>
+  <string name="simple">"Simple"</string>
+  <string name="detailed">"Detailed"</string>
+  <string name="listVM">"List view mode"</string>
+  <string name="noAccSensor">"Accelerometer sensor is either disabled or is not working"</string>
   <string name="undo">"Undo"</string>
   <string name="trnsl">"Translate"</string>
   <string name="SAT">"SAT"</string>
@@ -121,7 +130,7 @@
   <string name="lunch">"lunch"</string>
   <string name="breakfast">"Breakfast"</string>
   <string name="cPic">"Crop photo"</string>
-  <string name="repBtn">"REPLACE PHOTO"</string>
+  <string name="repBtn">"REPLACE"</string>
   <string name="recPic">"Recipe photo"</string>
   <string name="req">"Required"</string>
   <string name="nwCat">"New category"</string>
@@ -152,7 +161,6 @@
   <string name="reqAcc">"EnRecipes requires storage permission in order to set recipe photo, export and import data"</string>
   <string name="grant">"Grant access"</string>
   <string name="nLangInfo">"Restart EnRecipes to use the new language"</string>
-  <string name="nThmInfo">"Restart EnRecipes to use the new theme"</string>
   <string name="rst">"RESTART"</string>
   <string name="appRst">"App restart required"</string>
   <string name="SET">"SET"</string>
@@ -175,7 +183,7 @@
   <string name="rmCuiInfo">"You are about to remove the cuisine:"</string>
   <string name="rBtn">"REMOVE"</string>
   <string name="cBtn">"CANCEL"</string>
-  <string name="srt">"Sort by"</string>
+  <string name="srt">"Sort"</string>
   <string name="stp">"Step"</string>
   <string name="it">"Item"</string>
   <string name="aNoBtn">"ADD NOTE"</string>
@@ -305,169 +313,5 @@
   <string name="_app_name_1k3Sbz">"EnRecipes"</string>
   <string name="app_name">"EnRecipes"</string>
   <string name="title_activity_kimera">"EnRecipes"</string>
-  <string name="_Import_failed_Z1dbs6t">"Import failed"</string>
-  <string name="_Invalid_file__Z2bRAst">"Invalid file:"</string>
-  <string name="_Backup_file_has_been_modified_externally__Wjiqq">"Backup file has been modified externally."</string>
-  <string name="_Backup_file_seems_empty__Zd7qfR">"Backup file seems empty."</string>
-  <string name="_Backup_file_is_incorrect_or_corrupt__1jXb8N">"Backup file is incorrect or corrupt."</string>
-  <string name="_Remove_recipe_from_snacks__MNnCU">"Remove recipe from snacks?"</string>
-  <string name="_Remove_recipe_from_dinner__8sWfY">"Remove recipe from dinner?"</string>
-  <string name="_Remove_recipe_from_lunch__Zwpsg2">"Remove recipe from lunch?"</string>
-  <string name="_Remove_recipe_from_breakfast__ZvYyFG">"Remove recipe from breakfast?"</string>
-  <string name="_Untitled_Recipe_Zv0UxP">"Untitled Recipe"</string>
-  <string name="_Star_rating_Z11p4Kw">"Star rating"</string>
-  <string name="_Filtered_result_1AMEXe">"Filtered result"</string>
-  <string name="_recipes_updated_Z2arFrR">"recipes updated"</string>
-  <string name="_recipes_already_exists_2jqW2s">"recipes already exists"</string>
-  <string name="_recipes_imported_1NGeRw">"recipes imported"</string>
-  <string name="_recipes_found_ZDdUgV">"recipes found"</string>
-  <string name="_Import_summary_244SkL">"Import summary"</string>
-  <string name="_separate_with_spaces_ZHKOfw">"separate with spaces"</string>
-  <string name="Tags">"Tags"</string>
-  <string name="_No_tags_available_Z1C5GqD">"No tags available"</string>
-  <string name="_All_Tags_28gMyY">"All Tags"</string>
-  <string name="_All_Categories_Z23JSTS">"All Categories"</string>
-  <string name="_All_Cuisines_2hjCp9">"All Cuisines"</string>
-  <string name="Cuisines">"Cuisines"</string>
-  <string name="Cuisine">"Cuisine"</string>
-  <string name="_Are_you_sure_you_want_to_remove_ZOnf22">"Are you sure you want to remove"</string>
-  <string name="Units">"Units"</string>
-  <string name="_Remove_unit__2x26yq">"Remove unit?"</string>
-  <string name="_Remove_yield_unit__Z1duBWR">"Remove yield unit?"</string>
-  <string name="_Remove_category__2reaxz">"Remove category?"</string>
-  <string name="_Remove_cuisine__22ftcL">"Remove cuisine?"</string>
-  <string name="_New_unit_1CVEEA">"New unit"</string>
-  <string name="_New_cuisine_Zrvs3z">"New cuisine"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_the_filtered_result_1TV6QQ">"Your search did not match any recipes in the filtered result"</string>
-  <string name="_Recipe_not_found_2qGveM">"Recipe not found"</string>
-  <string name="_Reset_successful_YxqWK">"Reset successful"</string>
-  <string name="_Reset_units_list_msRS3">"Reset units list"</string>
-  <string name="_Reset_yield_units_list_ZjouMk">"Reset yield units list"</string>
-  <string name="_Reset_categories_list_Z1JmKra">"Reset categories list"</string>
-  <string name="_Reset_cuisines_list_1kWL8I">"Reset cuisines list"</string>
-  <string name="_Resetting_a_list_will_NOT_delete_your_existing_entries_but_only_restores_the_deleted_default_entries__Z28mk0h">"Resetting a list will NOT delete your existing entries but only restores the deleted default entries."</string>
-  <string name="Reset">"Reset"</string>
-  <string name="_Helps_you_choose_what_to_cook_when_you_can_t_decide_muiMv">"Helps you choose what to cook when you can\'t decide"</string>
-  <string name="_Shake_to_view_random_recipe_ZTK9F2">"Shake to view random recipe"</string>
-  <string name="Options">"Options"</string>
-  <string name="_User_guide_2uDJCF">"User guide"</string>
-  <string name="_Privacy_policy_Zb4ht5">"Privacy policy"</string>
-  <string name="_View_on_GitHub_Z2qOqmx">"View on GitHub"</string>
-  <string name="Translator">"Translator"</string>
-  <string name="Contributors">"Contributors"</string>
-  <string name="_Shared_via_EnRecipes__Get_it_on_Play_Store_or_F_Droid__Z2oTOK1">"Shared via EnRecipes. Get it on Play Store or F-Droid."</string>
-  <string name="_Permission_denied_Z7wlWK">"Permission denied"</string>
-  <string name="_Import_successful_2bLM3e">"Import successful"</string>
-  <string name="_Verifying____cS102">"Verifying..."</string>
-  <string name="_long_time_ago_1nwlFA">"long time ago"</string>
-  <string name="_months_ago_Z1TsskA">"months ago"</string>
-  <string name="_weeks_ago_Z2sT1GA">"weeks ago"</string>
-  <string name="_days_ago_2iCYkm">"days ago"</string>
-  <string name="_You_tried_this_recipe__ZUJOl3">"You tried this recipe:"</string>
-  <string name="_Crop_photo_1VL04J">"Crop photo"</string>
-  <string name="_REPLACE_PHOTO_ZLHhwH">"REPLACE PHOTO"</string>
-  <string name="_Recipe_photo_eqm9B">"Recipe photo"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_set_recipe_photo__23OnNT">"EnRecipes requires storage permission in order to set recipe photo."</string>
-  <string name="Required">"Required"</string>
-  <string name="_New_category_Weg73">"New category"</string>
-  <string name="_New_yield_unit_1Oevd2">"New yield unit"</string>
-  <string name="_Remove_note__2wyMVE">"Remove note?"</string>
-  <string name="_Remove_combination__1dr2LS">"Remove combination?"</string>
-  <string name="_Remove_instruction__vkJfi">"Remove instruction?"</string>
-  <string name="_Remove_ingredient__2puvMO">"Remove ingredient?"</string>
-  <string name="_KEEP_EDITING_1o9uy3">"KEEP EDITING"</string>
-  <string name="DISCARD">"DISCARD"</string>
-  <string name="_Are_you_sure_you_want_to_discard_unsaved_changes_to_this_recipe__Z1G7sVC">"Are you sure you want to discard unsaved changes to this recipe?"</string>
-  <string name="_Unsaved_changes_9fqb4">"Unsaved changes"</string>
-  <string name="Search">"Search"</string>
-  <string name="_Are_you_sure_you_want_to_delete_the_recipe_29DH9w">"Are you sure you want to delete the recipe"</string>
-  <string name="DELETE">"DELETE"</string>
-  <string name="_Delete_recipe__Z2tMYtE">"Delete recipe?"</string>
-  <string name="_Removed_from_Try_Later_1h5Bkp">"Removed from Try Later"</string>
-  <string name="_Added_to_Try_Later_Z1gaF37">"Added to Try Later"</string>
-  <string name="_Removed_from_Favourites_Z5k7LR">"Removed from Favourites"</string>
-  <string name="_Added_to_Favourites_2mzllO">"Added to Favourites"</string>
-  <string name="_Add_at_least_one_recipe_to_perform_a_backup_17xYaH">"Add at least one recipe to perform a backup"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_backup_your_data_to_this_device__2cbvIq">"EnRecipes requires storage permission in order to backup your data to this device."</string>
-  <string name="CONTINUE">"CONTINUE"</string>
-  <string name="_NOT_NOW_Z1HD7qX">"NOT NOW"</string>
-  <string name="_EnRecipes_requires_storage_permission_in_order_to_import_your_data_from_a_previous_backup__1CKjb7">"EnRecipes requires storage permission in order to import your data from a previous backup."</string>
-  <string name="_Grant_permission_Z1UQBuh">"Grant permission"</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_app_language_to_take_effect__ZWGUtY">"EnRecipes needs to be restarted for the app language to take effect."</string>
-  <string name="_EnRecipes_needs_to_be_restarted_for_the_theme_change_to_take_effect__2kU319">"EnRecipes needs to be restarted for the theme change to take effect."</string>
-  <string name="RESTART">"RESTART"</string>
-  <string name="_Restart_required_Z22YINL">"Restart required"</string>
-  <string name="_ADD_NEW_Zv8FjM">"ADD NEW"</string>
-  <string name="Share">"Share"</string>
-  <string name="Overview">"Overview"</string>
-  <string name="Recipe">"Recipe"</string>
-  <string name="Photo">"Photo"</string>
-  <string name="_My_Healthy_Recipe_Z1EqB8f">"My Healthy Recipe"</string>
-  <string name="_Nothing_here__Add_some_recipes_and_try_again__Z25A7Q">"Nothing here! Add some recipes and try again."</string>
-  <string name="_Select_a_recipe_2lL8x2">"Select a recipe"</string>
-  <string name="ADD">"ADD"</string>
-  <string name="REMOVE">"REMOVE"</string>
-  <string name="CANCEL">"CANCEL"</string>
-  <string name="_Sort_by_Zq01TF">"Sort by"</string>
-  <string name="Step">"Step"</string>
-  <string name="Item">"Item"</string>
-  <string name="_ADD_NOTE_ZyNw1r">"ADD NOTE"</string>
-  <string name="Notes">"Notes"</string>
-  <string name="Note">"Note"</string>
-  <string name="_ADD_COMBINATION_2q9HWq">"ADD COMBINATION"</string>
-  <string name="Combinations">"Combinations"</string>
-  <string name="_ADD_STEP_ZyMPOe">"ADD STEP"</string>
-  <string name="Instructions">"Instructions"</string>
-  <string name="Instruction">"Instruction"</string>
-  <string name="_ADD_INGREDIENT_29sSLU">"ADD INGREDIENT"</string>
-  <string name="Ingredients">"Ingredients"</string>
-  <string name="Ingredient">"Ingredient"</string>
-  <string name="_Yield_measured_in_2OoRT">"Yield measured in"</string>
-  <string name="_Yield_quantity_ZHx3jw">"Yield quantity"</string>
-  <string name="_Cooking_time_2w2fEw">"Cooking time"</string>
-  <string name="_Preparation_time_15BfxT">"Preparation time"</string>
-  <string name="Category">"Category"</string>
-  <string name="Title">"Title"</string>
-  <string name="_Edit_recipe_ZPvwDP">"Edit recipe"</string>
-  <string name="_New_recipe_Z1Y2YKJ">"New recipe"</string>
-  <string name="_Vishnu_Raghav_B_1qnRnC">"Vishnu Raghav B"</string>
-  <string name="Author">"Author"</string>
-  <string name="_for_reporting_issues__suggestions_and_feedback_Z1JUmyE">"for reporting issues, suggestions and feedback"</string>
-  <string name="_Join_the_Telegram_group_ZAXQgc">"Join the Telegram group"</string>
-  <string name="Version">"Version"</string>
-  <string name="_Supports_full_backups_exported_by_this_app_ZYs4f2">"Supports full backups exported by this app"</string>
-  <string name="_Import_from_backup_Z28HsC0">"Import from backup"</string>
-  <string name="_Generates_a_zip_file_that_contains_all_your_data__This_file_can_be_imported_back__Z19m3xY">"Generates a zip file that contains all your data. This file can be imported back."</string>
-  <string name="_Export_a_full_backup_TJfra">"Export a full backup"</string>
-  <string name="Database">"Database"</string>
-  <string name="_System_default_Z1jruVS">"System default"</string>
-  <string name="_App_language_DzFsk">"App language"</string>
-  <string name="Interface">"Interface"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_try_later_list_Z2wWbA1">"Your search did not match any recipes in your try later list"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_your_favourites_1ylvHN">"Your search did not match any recipes in your favourites"</string>
-  <string name="_Your_search_did_not_match_any_recipes_in_this_category_P7J4V">"Your search did not match any recipes in this category"</string>
-  <string name="_Your_search_did_not_match_any_recipes_Z1eppHH">"Your search did not match any recipes"</string>
-  <string name="_No_recipes_found_Z125IxD">"No recipes found"</string>
-  <string name="_Category_looks_empty_ZAK5qU">"Category looks empty"</string>
-  <string name="_Recipes_you_mark_as_favourite_will_be_listed_here_Z1iIHgY">"Recipes you mark as favourite will be listed here"</string>
-  <string name="_No_favourites_yet_aPSoG">"No favourites yet"</string>
-  <string name="_Recipes_you_mark_as_try_later_will_be_listed_here_Z1ITwPV">"Recipes you mark as try later will be listed here"</string>
-  <string name="_All_done__72KYl">"All done!"</string>
-  <string name="_Use_the_pencil_button_to_add_some_notes_Z1wyyeb">"Use the pencil button to add some notes"</string>
-  <string name="_Use_the_pencil_button_to_add_some_combinations_6NhFS">"Use the pencil button to add some combinations"</string>
-  <string name="_Use_the_pencil_button_to_add_some_instructions_ZAi0PH">"Use the pencil button to add some instructions"</string>
-  <string name="_Use_the_pencil_button_to_add_some_ingredients_Z1xOX8S">"Use the pencil button to add some ingredients"</string>
-  <string name="_Use_the_plus_button_to_add_one_1h20ms">"Use the plus button to add one"</string>
-  <string name="_Start_adding_your_recipes__rwnVV">"Start adding your recipes!"</string>
-  <string name="Categories">"Categories"</string>
-  <string name="_Meal_Planner_2aq4oj">"Meal Planner"</string>
-  <string name="Favourites">"Favourites"</string>
-  <string name="_Try_Later_If7PG">"Try Later"</string>
-  <string name="delRec">"delRec"</string>
-  <string name="expReq">"expReq"</string>
-  <string name="Donate">"Donate"</string>
-  <string name="Combination">"Combination"</string>
-  <string name="impReq">"impReq"</string>
-  <string name="phtReq">"phtReq"</string>
-  <string name="noRecsHint">"noRecsHint"</string>
+  <string name="nThmInfo">"nThmInfo"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values/styles.xml b/app/resources/Android/src/main/res/values/styles.xml
index 9e105fb8..50ac98a6 100644
--- a/app/resources/Android/src/main/res/values/styles.xml
+++ b/app/resources/Android/src/main/res/values/styles.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<!-- theme to use FOR launch screen -->
-	<style name="LaunchScreenThemeBase" parent="Theme.MaterialComponents.NoActionBar">
-		<item name="toolbarStyle">
-			@style/NativeScriptToolbarStyle
-		</item>
+	<style name="LaunchScreenThemeBase" parent="Theme.AppCompat.NoActionBar">
 		<item name="colorPrimary">
 			@color/ns_primary
 		</item>
@@ -26,14 +22,7 @@
 	</style>
 	<style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
 	</style>
-	<!-- theme to use AFTER launch screen is loaded -->
-	<style name="AppThemeBase" parent="Theme.MaterialComponents.Light.NoActionBar">
-		<item name="searchViewStyle">
-			@style/SearchViewMy
-		</item>
-		<item name="toolbarStyle">
-			@style/NativeScriptToolbarStyle
-		</item>
+	<style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
 		<item name="colorPrimary">
 			@color/ns_primary
 		</item>
@@ -44,40 +33,20 @@
 			@color/ns_accent
 		</item>
 		<item name="colorControlNormal">
-			#858585
+			#00858585
+		</item>
+		<item name="android:windowTranslucentStatus">
+			false
 		</item>
 	</style>
 	<style name="AppTheme" parent="AppThemeBase">
+		<item name="android:listViewStyle">@style/Widget.MyTheme.ListView</item>
+		<item name="android:scrollViewStyle">@style/Widget.MyTheme.ScrollView</item>
 	</style>
-	<!-- theme for action-bar -->
-	<style name="NativeScriptToolbarStyleBase" parent="Widget.MaterialComponents.Toolbar">
-		<item name="contentInsetStart">
-			0dp
-		</item>
-		<item name="contentInsetEnd">
-			0dp
-		</item>
-		<item name="android:background">
-			@color/ns_primary
-		</item>
-		<item name="theme">
-			@style/ThemeOverlay.MaterialComponents.ActionBar
-		</item>
-		<item name="popupTheme">
-			@style/ThemeOverlay.MaterialComponents
-		</item>
+	<style name="Widget.MyTheme.ListView" parent="android:Widget.ListView">
+    	<item name="android:overScrollMode">never</item>
 	</style>
-	<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
-	</style>
-	<!-- theme for searchview -->
-	<style name="SearchViewMy" parent="Widget.AppCompat.Light.SearchView">
-		<item name="searchHintIcon">
-			@null
-		</item>
-		<!--
-		<item name="closeIcon">
-		@null
-		</item>
-		-->
+	<style name="Widget.MyTheme.ScrollView" parent="android:Widget.ScrollView">
+		<item name="android:overScrollMode">never</item>
 	</style>
 </resources>
diff --git a/app/shared/mixins.js b/app/shared/mixins.js
new file mode 100644
index 00000000..0bafc954
--- /dev/null
+++ b/app/shared/mixins.js
@@ -0,0 +1,20 @@
+export const lvMixin = {
+  methods: {
+    listViewLoad(args) {
+      let e = args.object.android
+      e.setSelector(new android.graphics.drawable.StateListDrawable())
+      e.setDivider(null)
+      e.setDividerHeight(0)
+    },
+    animateInOut(dur, rev, draw) {
+      const start = Date.now()
+      let timer = setInterval(() => {
+        const passed = Date.now() - start
+        let val = passed / dur
+        if (val > 1) val = 1
+        draw(rev ? 1 - val : val)
+        if (val === 1) clearInterval(timer)
+      }, 17) // 1000ms/60fps=16.66ms => 17ms
+    },
+  },
+}
diff --git a/app/shared/utils.js b/app/shared/utils.js
index ba2e7194..11f5f0a6 100644
--- a/app/shared/utils.js
+++ b/app/shared/utils.js
@@ -1,17 +1,17 @@
 import { Application, Utils } from '@nativescript/core'
 export const restartApp = () => {
-  const mStartActivity = new android.content.Intent(
+  let mStartActivity = new android.content.Intent(
     Application.android.context,
     Application.android.startActivity.getClass()
   )
-  const mPendingIntentId = parseInt(Math.random() * 100000, 10)
-  const mPendingIntent = android.app.PendingIntent.getActivity(
+  let mPendingIntentId = Math.random() * 100000
+  let mPendingIntent = android.app.PendingIntent.getActivity(
     Application.android.context,
     mPendingIntentId,
     mStartActivity,
     android.app.PendingIntent.FLAG_CANCEL_CURRENT
   )
-  const mgr = Application.android.context.getSystemService(
+  let mgr = Application.android.context.getSystemService(
     android.content.Context.ALARM_SERVICE
   )
   mgr.set(
@@ -22,7 +22,7 @@ export const restartApp = () => {
   android.os.Process.killProcess(android.os.Process.myPid())
 }
 export const openAppSettingsPage = () => {
-  const intent = new android.content.Intent(
+  let intent = new android.content.Intent(
     android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
   )
   intent.addCategory(android.content.Intent.CATEGORY_DEFAULT)
@@ -42,3 +42,9 @@ export const hasAccelerometer = () => {
     android.hardware.Sensor.TYPE_ACCELEROMETER
   )
 }
+export const vibrate = (duration) => {
+  let vibratorService = Application.android.context.getSystemService(
+    android.content.Context.VIBRATOR_SERVICE
+  )
+  if (vibratorService.hasVibrator()) vibratorService.vibrate(duration)
+}
diff --git a/app/store.js b/app/store.js
index 0b896359..c0921f2d 100644
--- a/app/store.js
+++ b/app/store.js
@@ -1,150 +1,156 @@
-import Vue from "vue";
-import Vuex from "vuex";
-Vue.use(Vuex);
-import {Couchbase} from "nativescript-couchbase-plugin";
-import {getFileAccess, File, ApplicationSettings} 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 Vue from 'vue'
+import Vuex from 'vuex'
+Vue.use(Vuex)
+import { CouchBase } from '@triniwiz/nativescript-couchbase'
+import {
+  Application,
+  getFileAccess,
+  File,
+  ApplicationSettings,
+} 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')
 const defaultCuisines = [
-  "American",
-  "Brazilian",
-  "British",
-  "Chinese",
-  "Danish",
-  "Egyptian",
-  "Filipino",
-  "French",
-  "German",
-  "Greek",
-  "Indian",
-  "Irish",
-  "Italian",
-  "Jamaican",
-  "Japanese",
-  "Jewish",
-  "Kenyan",
-  "Korean",
-  "Mexican",
-  "Nigerian",
-  "Portuguese",
-  "Russian",
-  "Scottish",
-  "Spanish",
-  "Sri Lankan",
-  "Swedish",
-  "Thai",
-  "Turkish",
-  "Vietnamese"
-];
+  'American',
+  'Brazilian',
+  'British',
+  'Chinese',
+  'Danish',
+  'Egyptian',
+  'Filipino',
+  'French',
+  'German',
+  'Greek',
+  'Indian',
+  'Irish',
+  'Italian',
+  'Jamaican',
+  'Japanese',
+  'Jewish',
+  'Kenyan',
+  'Korean',
+  'Mexican',
+  'Nigerian',
+  'Portuguese',
+  'Russian',
+  'Scottish',
+  'Spanish',
+  'Sri Lankan',
+  'Swedish',
+  'Thai',
+  'Turkish',
+  'Vietnamese',
+]
 const defaultCategories = [
-  "Appetizers",
-  "Barbecue",
-  "Beverages",
-  "Breads",
-  "Breakfast",
-  "Desserts",
-  "Dinner",
-  "Drinks",
-  "Healthy",
-  "Lunch",
-  "Main dishes",
-  "Meat",
-  "Noodles",
-  "Pasta",
-  "Poultry",
-  "Rice",
-  "Salads",
-  "Sauces",
-  "Seafood",
-  "Side dishes",
-  "Snacks",
-  "Soups",
-  "Undefined",
-  "Vegan",
-  "Vegetarian"
-];
+  'Appetizers',
+  'Barbecue',
+  'Beverages',
+  'Breads',
+  'Breakfast',
+  'Desserts',
+  'Dinner',
+  'Drinks',
+  'Healthy',
+  'Lunch',
+  'Main dishes',
+  'Meat',
+  'Noodles',
+  'Pasta',
+  'Poultry',
+  'Rice',
+  'Salads',
+  'Sauces',
+  'Seafood',
+  'Side dishes',
+  'Snacks',
+  'Soups',
+  'Undefined',
+  'Vegan',
+  'Vegetarian',
+]
 const defaultYieldUnits = [
-  "Serving",
-  "Piece",
-  "Teaspoon",
-  "Tablespoon",
-  "Fluid Ounce",
-  "Ounce",
-  "Pound",
-  "Gram",
-  "Kilogram",
-  "Cup",
-  "Gallon",
-  "Millilitre",
-  "Litre",
-  "Roll",
-  "Patty",
-  "Loaf"
-];
+  'Serving',
+  'Piece',
+  'Teaspoon',
+  'Tablespoon',
+  'Fluid Ounce',
+  'Ounce',
+  'Pound',
+  'Gram',
+  'Kilogram',
+  'Cup',
+  'Gallon',
+  'Millilitre',
+  'Litre',
+  'Roll',
+  'Patty',
+  'Loaf',
+]
 const defaultUnits = [
-  "unit",
-  "tsp",
-  "dsp",
-  "tbsp",
-  "fl oz",
-  "cup",
-  "pt",
-  "qt",
-  "gal",
-  "ml",
-  "l",
-  "oz",
-  "lb",
-  "mg",
-  "g",
-  "kg",
-  "cm",
-  "in",
-  "leaf",
-  "clove",
-  "piece",
-  "pinch",
-  "drop",
-  "dozen",
-  "stick",
-  "small",
-  "medium",
-  "large"
-];
+  'unit',
+  'tsp',
+  'dsp',
+  'tbsp',
+  'fl oz',
+  'cup',
+  'pt',
+  'qt',
+  'gal',
+  'ml',
+  'l',
+  'oz',
+  'lb',
+  'mg',
+  'g',
+  'kg',
+  'cm',
+  'in',
+  'leaf',
+  'clove',
+  'piece',
+  'pinch',
+  'drop',
+  'dozen',
+  'stick',
+  'small',
+  'medium',
+  'large',
+]
 const listItems = {
   cuisines: {
     db: userCuisinesDB,
-    key: "userCuisines",
-    stateName: "cuisines",
+    key: 'userCuisines',
+    stateName: 'cuisines',
     sort: true,
-    defaultItems: defaultCuisines
+    defaultItems: defaultCuisines,
   },
   categories: {
     db: userCategoriesDB,
-    key: "userCategories",
-    stateName: "categories",
+    key: 'userCategories',
+    stateName: 'categories',
     sort: true,
-    defaultItems: defaultCategories
+    defaultItems: defaultCategories,
   },
   yieldUnits: {
     db: userYieldUnitsDB,
-    key: "userYieldUnits",
-    stateName: "yieldUnits",
+    key: 'userYieldUnits',
+    stateName: 'yieldUnits',
     sort: false,
-    defaultItems: defaultYieldUnits
+    defaultItems: defaultYieldUnits,
   },
   units: {
     db: userUnitsDB,
-    key: "userUnits",
-    stateName: "units",
+    key: 'userUnits',
+    stateName: 'units',
     sort: false,
-    defaultItems: defaultUnits
-  }
-};
+    defaultItems: defaultUnits,
+  },
+}
+
 export default new Vuex.Store({
   state: {
     recipes: [],
@@ -154,625 +160,644 @@ export default new Vuex.Store({
     units: [],
     mealPlans: [],
     icon: {
-      alert: "\ue900",
-      back: "\ue901",
-      bag: "\ue902",
-      bagged: "\ue903",
-      cal: "\ue904",
-      cam: "\ue905",
-      category: "\ue906",
-      cog: "\ue907",
-      comb: "\ue908",
-      cuisine: "\ue909",
-      del: "\ue90a",
-      diff: "\ue90b",
-      don: "\ue90c",
-      done: "\ue90d",
-      edit: "\ue90e",
-      exp: "\ue910",
-      fav: "\ue911",
-      faved: "\ue912",
-      folder: "\ue913",
-      gh: "\ue914",
-      help: "\ue915",
-      home: "\ue916",
-      img: "\ue917",
-      imp: "\ue918",
-      info: "\ue919",
-      items: "\ue91a",
-      l1: "\ue91b",
-      l2: "\ue91c",
-      l3: "\ue91d",
-      lang: "\ue91e",
-      left: "\ue91f",
-      menu: "\ue920",
-      noresult: "\ue921",
-      notes: "\ue922",
-      plus: "\ue923",
-      plusc: "\ue924",
-      price: "\ue925",
-      priv: "\ue926",
-      err: "\ue90f",
-      res: "\ue927",
-      reset: "\ue928",
-      right: "\ue929",
-      save: "\ue92a",
-      sear: "\ue92b",
-      selall: "\ue92c",
-      share: "\ue92d",
-      shuf: "\ue92e",
-      sort: "\ue92f",
-      star: "\ue930",
-      starred: "\ue931",
-      steps: "\ue932",
-      succ: "\ue933",
-      tag: "\ue934",
-      text: "\ue935",
-      tg: "\ue936",
-      theme: "\ue937",
-      time: "\ue938",
-      timer: "\ue939",
-      tod: "\ue93a",
-      trans: "\ue93b",
-      tried: "\ue93c",
-      try: "\ue93d",
-      unit: "\ue93e",
-      x: "\ue93f",
-      yield: "\ue940",
-      zip: "\ue941"
+      alert: '\ue900',
+      back: '\ue901',
+      bag: '\ue902',
+      bagged: '\ue903',
+      cal: '\ue904',
+      cam: '\ue905',
+      category: '\ue906',
+      cog: '\ue907',
+      comb: '\ue908',
+      cuisine: '\ue909',
+      del: '\ue90a',
+      diff: '\ue90b',
+      don: '\ue90c',
+      done: '\ue90d',
+      edit: '\ue90e',
+      exp: '\ue910',
+      fav: '\ue911',
+      faved: '\ue912',
+      folder: '\ue913',
+      gh: '\ue914',
+      help: '\ue915',
+      home: '\ue916',
+      img: '\ue917',
+      imp: '\ue918',
+      info: '\ue919',
+      items: '\ue91a',
+      l1: '\ue91b',
+      l2: '\ue91c',
+      l3: '\ue91d',
+      lang: '\ue91e',
+      left: '\ue91f',
+      menu: '\ue920',
+      noresult: '\ue921',
+      notes: '\ue922',
+      plus: '\ue923',
+      plusc: '\ue924',
+      price: '\ue925',
+      priv: '\ue926',
+      err: '\ue90f',
+      res: '\ue927',
+      reset: '\ue928',
+      right: '\ue929',
+      save: '\ue92a',
+      sear: '\ue92b',
+      selall: '\ue92c',
+      share: '\ue92d',
+      shuf: '\ue92e',
+      sort: '\ue92f',
+      star: '\ue930',
+      starred: '\ue931',
+      steps: '\ue932',
+      succ: '\ue933',
+      tag: '\ue934',
+      text: '\ue935',
+      tg: '\ue936',
+      theme: '\ue937',
+      time: '\ue938',
+      timer: '\ue939',
+      tod: '\ue93a',
+      trans: '\ue93b',
+      tried: '\ue93c',
+      try: '\ue93d',
+      unit: '\ue93e',
+      x: '\ue93f',
+      yield: '\ue940',
+      zip: '\ue941',
     },
-    currentComponent: "EnRecipes",
-    sortType: "Oldest first",
+    currentComponent: 'EnRecipes',
+    sortType: 'Oldest first',
     language: [
       {
-        locale: "da",
-        title: "Dansk"
-      }, {
-        locale: "de",
-        title: "Deutsch"
-      }, {
-        locale: "en-GB",
-        title: "English (UK)"
-      }, {
-        locale: "es",
-        title: "Español"
-      }, {
-        locale: "fr",
-        title: "Français"
-      }, {
-        locale: "fr-BE",
-        title: "Français (BE)"
-      }, {
-        locale: "fr-CA",
-        title: "Français (CA)"
-      }, {
-        locale: "fr-CH",
-        title: "Français (CH)"
-      }, {
-        locale: "it",
-        title: "Italiano"
-      }, {
-        locale: "nb-NO",
-        title: "Norsk bokmål"
-      }, {
-        locale: "nl",
-        title: "Nederlands"
-      }, {
-        locale: "pt",
-        title: "Português"
-      }, {
-        locale: "ru",
-        title: "Русский"
-      }, {
-        locale: "ta",
-        title: "தமிழ்"
-      }
+        locale: 'da',
+        title: 'Dansk',
+      },
+      {
+        locale: 'de',
+        title: 'Deutsch',
+      },
+      {
+        locale: 'en-GB',
+        title: 'English (UK)',
+      },
+      {
+        locale: 'es',
+        title: 'Español',
+      },
+      {
+        locale: 'fr',
+        title: 'Français',
+      },
+      {
+        locale: 'fr-BE',
+        title: 'Français (BE)',
+      },
+      {
+        locale: 'fr-CA',
+        title: 'Français (CA)',
+      },
+      {
+        locale: 'fr-CH',
+        title: 'Français (CH)',
+      },
+      {
+        locale: 'it',
+        title: 'Italiano',
+      },
+      {
+        locale: 'nb-NO',
+        title: 'Norsk bokmål',
+      },
+      {
+        locale: 'nl',
+        title: 'Nederlands',
+      },
+      {
+        locale: 'pt',
+        title: 'Português',
+      },
+      {
+        locale: 'ru',
+        title: 'Русский',
+      },
+      {
+        locale: 'ta',
+        title: 'தமிழ்',
+      },
     ],
     shakeEnabled: true,
     importSummary: {
       found: 0,
       imported: 0,
-      updated: 0
-    }
+      updated: 0,
+    },
+    layout: 'detailed',
+    selectedCuisine: null,
+    selectedCategory: null,
+    selectedTag: null,
+    appTheme: 'Light',
   },
   mutations: {
+    setTheme(state, theme) {
+      ApplicationSettings.setString('appTheme', theme)
+      state.appTheme = theme
+    },
+    clearFilter(state) {
+      state.selectedCuisine = state.selectedCategory = state.selectedTag = null
+    },
+    setLayout(state, type) {
+      state.layout = type
+    },
     setSortType(state, sortType) {
       state.sortType = sortType
     },
-    initializeRecipes(state) {
-      EnRecipesDB.query({select: []}).forEach(r => {
+    initRecipes(state) {
+      EnRecipesDB.query({ select: [] }).forEach((r) => {
         if (r.timeRequired) {
-          r.prepTime = "00:00";
-          r.cookTime = r.timeRequired;
-          delete 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"))
+        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);
-      });
-      state.shakeEnabled = ApplicationSettings.getBoolean("shakeEnabled", true)
-      state.sortType = ApplicationSettings.getString("sortType", "Oldest first")
+        state.recipes.push(r)
+      })
+      state.shakeEnabled = ApplicationSettings.getBoolean('shakeEnabled', true)
+      state.sortType = ApplicationSettings.getString('sortType', 'Oldest first')
     },
     importRecipes(state, recipes) {
-      let localRecipesIDs,
-        partition
+      let localRecipesIDs, partition
       let imported = 0
       let updated = 0
       function getUpdatedData(data) {
-        return data.map(recipe => {
-          let r = Object.assign({}, recipe);
+        return data.map((recipe) => {
+          let r = Object.assign({}, recipe)
           if (r.timeRequired) {
-            r.prepTime = "00:00";
-            r.cookTime = r.timeRequired;
-            delete 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"))
+          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
-          return r;
-        });
+          return r
+        })
       }
       function createDocuments(data) {
-        data = getUpdatedData(data);
-        state.recipes = [
-          ...state.recipes,
-          ...data
-        ];
-        data.forEach(recipe => {
+        data = getUpdatedData(data)
+        state.recipes = [...state.recipes, ...data]
+        data.forEach((recipe) => {
           imported++
-          EnRecipesDB.createDocument(recipe, recipe.id);
-        });
+          EnRecipesDB.createDocument(recipe, recipe.id)
+        })
       }
       function updateDocuments(data) {
-        data = getUpdatedData(data);
-        data.forEach(recipe => {
-          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;
-          }).filter(e => e >= 0)[0];
+        data = getUpdatedData(data)
+        data.forEach((recipe) => {
+          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
+            })
+            .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], recipe)
+            EnRecipesDB.updateDocument(recipe.id, recipe)
           }
-        });
+        })
       }
       if (state.recipes.length) {
-        localRecipesIDs = state.recipes.map(e => e.id);
-        partition = recipes.reduce((result, recipe, i) => {
-          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);
+        localRecipesIDs = state.recipes.map((e) => e.id)
+        partition = recipes.reduce(
+          (result, recipe, i) => {
+            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
     },
-    addRecipe(state, {id, recipe}) {
-      state.recipes.push(recipe);
-      EnRecipesDB.createDocument(recipe, id);
+    addRecipe(state, { id, recipe }) {
+      state.recipes.push(recipe)
+      EnRecipesDB.createDocument(recipe, id)
     },
-    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);
+    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);
+    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]);
+          state.recipes[i].combinations.splice(e.combinations.indexOf(id), 1)
+          EnRecipesDB.updateDocument(state.recipes[i].id, state.recipes[i])
         }
-      });
+      })
     },
     deleteRecipes(state, ids) {
-      ids.forEach(id => {
-        let index = state.recipes.findIndex(e => e.id === id)
-        getFileAccess().deleteFile(state.recipes[index].imageSrc);
-        state.recipes.splice(index, 1);
-        EnRecipesDB.deleteDocument(id);
+      ids.forEach((id) => {
+        let index = state.recipes.findIndex((e) => e.id === 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]);
+            state.recipes[i].combinations.splice(e.combinations.indexOf(id), 1)
+            EnRecipesDB.updateDocument(state.recipes[i].id, state.recipes[i])
           }
-        });
-      });
+        })
+      })
     },
-    initializeListItems(state) {
+    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;
+        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;
+          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 {
+            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].sort()
             }
-            state[stateName] = defaultItems;
-            db.createDocument({
-              [key]: []
-            }, key);
+            state[stateName] = defaultItems
+            db.createDocument(
+              {
+                [key]: [],
+              },
+              key
+            )
           }
         }
-      }["cuisines", "categories", "yieldUnits", "units"].forEach(item => {
-        initialize(item);
-      });
+      }
+      ;['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]});
+    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] })
     },
-    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());
+    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())
       if (lowercase.indexOf(item.toLowerCase()) == -1) {
-        state[stateName].push(item);
-        db.updateDocument(key, {[key]: state[stateName]});
+        state[stateName].push(item)
+        db.updateDocument(key, { [key]: state[stateName] })
         if (listItems[listName].sort)
-          state[stateName].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
+          state[stateName].sort((a, b) =>
+            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();
-      }
-    ,
+    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];
+      let stateName = listItems[listName].stateName
+      let defaultItems = listItems[listName].defaultItems
+      state[listName] = [...defaultItems]
       if (listItems[listName].sort) {
-        state[stateName].sort();
+        state[stateName].sort()
       }
     },
-    initializeMealPlans(state) {
-      let isMealPlansDBStored = mealPlansDB.query({select: []}).length;
+    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 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()
+            p.date = new Date(
+              d.getFullYear(),
+              d.getMonth(),
+              d.getDate(),
+              0
+            ).getTime()
             switch (new Date(p.date).getHours()) {
               case 0:
-                p.type = "breakfast"
-                break;
+                p.type = 'breakfast'
+                break
               case 5:
-                p.type = "lunch"
-                break;
+                p.type = 'lunch'
+                break
               case 10:
-                p.type = "dinner"
-                break;
+                p.type = 'dinner'
+                break
               case 15:
-                p.type = "snacks"
-                break;
+                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]
+          mealPlansDB.updateDocument('mealPlans', {
+            mealPlans: state.mealPlans,
+          })
+        } else state.mealPlans = [...plans]
       } else {
-        mealPlansDB.createDocument({
-          mealPlans: []
-        }, "mealPlans")
+        mealPlansDB.createDocument(
+          {
+            mealPlans: [],
+          },
+          'mealPlans'
+        )
       }
     },
     importMealPlans(state, mealPlans) {
-      let newMealPlans = mealPlans.filter(e => {
-        if (e.hasOwnProperty("eventColor")) {
-          return !state.mealPlans.some(f => {
+      let newMealPlans = mealPlans.filter((e) => {
+        if (e.hasOwnProperty('eventColor')) {
+          return !state.mealPlans.some((f) => {
             let d = new Date(e.startDate)
-            let date = new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0).getTime()
+            let date = new Date(
+              d.getFullYear(),
+              d.getMonth(),
+              d.getDate(),
+              0
+            ).getTime()
             let type
             switch (d.getHours()) {
               case 0:
-                type = "breakfast"
-                break;
+                type = 'breakfast'
+                break
               case 5:
-                type = "lunch"
-                break;
+                type = 'lunch'
+                break
               case 10:
-                type = "dinner"
-                break;
+                type = 'dinner'
+                break
               case 15:
-                type = "snacks"
-                break;
+                type = 'snacks'
+                break
             }
             return f.title === e.title && f.date === date && f.type === type
           })
         } else {
-          return !state.mealPlans.some(f => f.title === e.title && f.date === e.date && f.type === e.type)
+          return !state.mealPlans.some(
+            (f) => f.title === e.title && f.date === e.date && f.type === e.type
+          )
         }
       })
       let updatedMealPlans = []
-      if (newMealPlans[0].hasOwnProperty("eventColor")) {
-        newMealPlans.forEach(p => {
+      if (newMealPlans[0].hasOwnProperty('eventColor')) {
+        newMealPlans.forEach((p) => {
           let d = new Date(p.startDate)
-          p.date = new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0).getTime()
+          p.date = new Date(
+            d.getFullYear(),
+            d.getMonth(),
+            d.getDate(),
+            0
+          ).getTime()
           switch (d.getHours()) {
             case 0:
-              p.type = "breakfast"
-              break;
+              p.type = 'breakfast'
+              break
             case 5:
-              p.type = "lunch"
-              break;
+              p.type = 'lunch'
+              break
             case 10:
-              p.type = "dinner"
-              break;
+              p.type = 'dinner'
+              break
             case 15:
-              p.type = "snacks"
-              break;
+              p.type = 'snacks'
+              break
           }
           delete p.startDate
           delete p.endDate
           delete p.eventColor
           updatedMealPlans.push(p)
-        });
+        })
       }
-      state.mealPlans = [
-        ...state.mealPlans,
-        ...updatedMealPlans
-      ];
-      mealPlansDB.updateDocument("mealPlans", {mealPlans: state.mealPlans});
+      state.mealPlans = [...state.mealPlans, ...updatedMealPlans]
+      mealPlansDB.updateDocument('mealPlans', { mealPlans: state.mealPlans })
     },
-    addMealPlan(state, {title, date, type, index}) {
+    addMealPlan(state, { title, date, type, index }) {
       let mealPlan = {
         title,
         date,
-        type
+        type,
       }
-      if (index != null)
-        state.mealPlans.splice(index, 0, mealPlan);
-      else
-        state.mealPlans.push(mealPlan);
-      mealPlansDB.updateDocument("mealPlans", {
-        mealPlans: [...state.mealPlans]
-      });
+      if (index != null) state.mealPlans.splice(index, 0, mealPlan)
+      else state.mealPlans.push(mealPlan)
+      mealPlansDB.updateDocument('mealPlans', {
+        mealPlans: [...state.mealPlans],
+      })
     },
-    deleteMealPlan(state, {title, date, type, index}) {
-      state.mealPlans.splice(index, 1);
-      state.mealPlans = [...state.mealPlans];
-      mealPlansDB.updateDocument("mealPlans", {
-        mealPlans: [...state.mealPlans]
-      });
+    deleteMealPlan(state, { title, date, type, index }) {
+      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]);
-      state.recipes[index][key] = !state.recipes[index][key];
-      if (setDate)
-        state.recipes[index].lastTried = new Date();
-      EnRecipesDB.updateDocument(id, recipe);
+    toggleState(state, { id, recipe, key, setDate }) {
+      let index = state.recipes.indexOf(
+        state.recipes.filter((e) => e.id === id)[0]
+      )
+      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]);
-      state.recipes[index].tried = true;
-      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]
+      )
+      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]);
+      state.recipes[index].lastTried = new Date()
+      EnRecipesDB.updateDocument(state.recipes[index].id, state.recipes[index])
     },
-    setCurrentComponent(state, comp) {
-      state.currentComponent = comp;
+    setComponent(state, comp) {
+      state.currentComponent = comp
     },
-    unSyncCombinations(state, {id, combinations}) {
+    unSyncCombinations(state, { id, combinations }) {
       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]);
+          state.recipes[i].combinations.splice(e.combinations.indexOf(id), 1)
+          EnRecipesDB.updateDocument(state.recipes[i].id, state.recipes[i])
         }
-      });
+      })
     },
     setShake(state, shake) {
-      state.shakeEnabled = shake;
+      state.shakeEnabled = shake
     },
-    setRating(state, {id, recipe, rating}) {
-      let index = state.recipes.indexOf(state.recipes.filter(e => e.id === id)[0]);
+    setRating(state, { id, recipe, rating }) {
+      let index = state.recipes.indexOf(
+        state.recipes.filter((e) => e.id === id)[0]
+      )
       state.recipes[index].rating = rating
-      EnRecipesDB.updateDocument(id, recipe);
+      EnRecipesDB.updateDocument(id, recipe)
     },
-    toggleCart(state, {id, recipe}) {
-      let index = state.recipes.indexOf(state.recipes.filter(e => e.id === id)[0]);
+    toggleCart(state, { id, recipe }) {
+      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);
+      EnRecipesDB.updateDocument(id, recipe)
     },
     unlinkBrokenImages(state) {
       state.recipes.forEach((r, i) => {
         if (r.imageSrc && !File.exists(r.imageSrc)) {
           r.imageSrc = null
-          Object.assign(state.recipes[i], r);
-          EnRecipesDB.updateDocument(r.id, r);
+          Object.assign(state.recipes[i], r)
+          EnRecipesDB.updateDocument(r.id, r)
         }
       })
-    }
+    },
+    setCuisine(state, value) {
+      state.selectedCuisine = value
+    },
+    setCategory(state, value) {
+      state.selectedCategory = value
+    },
+    setTag(state, value) {
+      state.selectedTag = value
+    },
   },
   actions: {
-    setSortTypeAction({
-      commit
-    }, sortType) {
-      commit("setSortType", sortType)
+    setTheme({ commit }, theme) {
+      commit('setTheme', theme)
     },
-    initializeRecipes({commit}) {
-      commit("initializeRecipes");
+    clearFilter({ commit }) {
+      commit('clearFilter')
     },
-    importRecipesAction({
-      commit
-    }, recipes) {
-      commit("importRecipes", recipes);
+    setLayout({ commit }, type) {
+      commit('setLayout', type)
     },
-    addRecipeAction({
-      commit
-    }, recipe) {
-      commit("addRecipe", recipe);
+    setSortTypeAction({ commit }, sortType) {
+      commit('setSortType', sortType)
     },
-    overwriteRecipeAction({
-      commit
-    }, updatedRecipe) {
-      commit("overwriteRecipe", updatedRecipe);
+    initRecipes({ commit }) {
+      commit('initRecipes')
     },
-    deleteRecipeAction({
-      commit
-    }, recipe) {
-      commit("deleteRecipe", recipe);
+    importRecipesAction({ commit }, recipes) {
+      commit('importRecipes', recipes)
     },
-    deleteRecipesAction({
-      commit
-    }, ids) {
-      commit("deleteRecipes", ids);
+    addRecipeAction({ commit }, recipe) {
+      commit('addRecipe', recipe)
     },
-    initializeListItems({commit}) {
-      commit("initializeListItems");
+    overwriteRecipeAction({ commit }, updatedRecipe) {
+      commit('overwriteRecipe', updatedRecipe)
     },
-    importListItemsAction({
-      commit
-    }, data) {
-      commit("importListItems", data);
+    deleteRecipeAction({ commit }, recipe) {
+      commit('deleteRecipe', recipe)
     },
-    addListItemAction({
-      commit
-    }, item) {
-      commit("addListItem", item);
+    deleteRecipesAction({ commit }, ids) {
+      commit('deleteRecipes', ids)
     },
-    removeListItemAction({
-      commit
-    }, item) {
-      commit("removeListItem", item);
+    initListItems({ commit }) {
+      commit('initListItems')
     },
-    resetListItemsAction({
-      commit
-    }, listName) {
-      commit("resetListItems", listName);
+    importListItemsAction({ commit }, data) {
+      commit('importListItems', data)
     },
-    initializeMealPlans({commit}) {
-      commit("initializeMealPlans");
+    addListItemAction({ commit }, item) {
+      commit('addListItem', item)
     },
-    importMealPlansAction({
-      commit
-    }, mealPlans) {
-      commit("importMealPlans", mealPlans);
+    removeListItemAction({ commit }, item) {
+      commit('removeListItem', item)
     },
-    addMealPlanAction({
-      commit
-    }, mealPlan) {
-      commit("addMealPlan", mealPlan);
+    resetListItemsAction({ commit }, listName) {
+      commit('resetListItems', listName)
     },
-    deleteMealPlanAction({
-      commit
-    }, mealPlan) {
-      commit("deleteMealPlan", mealPlan);
+    initMealPlans({ commit }) {
+      commit('initMealPlans')
     },
-    toggleStateAction({
-      commit
-    }, toggledRecipe) {
-      commit("toggleState", toggledRecipe);
+    importMealPlansAction({ commit }, mealPlans) {
+      commit('importMealPlans', mealPlans)
     },
-    setRecipeAsTriedAction({
-      commit
-    }, recipe) {
-      commit("setRecipeAsTried", recipe);
+    addMealPlanAction({ commit }, mealPlan) {
+      commit('addMealPlan', mealPlan)
     },
-    setLastTriedDateAction({
-      commit
-    }, index) {
-      commit("setLastTriedDate", index);
+    deleteMealPlanAction({ commit }, mealPlan) {
+      commit('deleteMealPlan', mealPlan)
     },
-    setCurrentComponentAction({
-      commit
-    }, comp) {
-      commit("setCurrentComponent", comp);
+    toggleStateAction({ commit }, toggledRecipe) {
+      commit('toggleState', toggledRecipe)
     },
-    unSyncCombinationsAction({
-      commit
-    }, combinations) {
-      commit("unSyncCombinations", combinations);
+    setRecipeAsTriedAction({ commit }, recipe) {
+      commit('setRecipeAsTried', recipe)
     },
-    setShakeAction({
-      commit
-    }, shake) {
-      commit("setShake", shake);
+    setLastTriedDateAction({ commit }, index) {
+      commit('setLastTriedDate', index)
     },
-    setRatingAction({
-      commit
-    }, rating) {
-      commit("setRating", rating);
+    setComponent({ commit }, comp) {
+      commit('setComponent', comp)
     },
-    toggleCartAction({
-      commit
-    }, recipe) {
-      commit("toggleCart", recipe);
+    unSyncCombinationsAction({ commit }, combinations) {
+      commit('unSyncCombinations', combinations)
     },
-    unlinkBrokenImages({commit}) {
-      commit("unlinkBrokenImages");
-    }
-  }
-});
+    setShakeAction({ commit }, shake) {
+      commit('setShake', shake)
+    },
+    setRatingAction({ commit }, rating) {
+      commit('setRating', rating)
+    },
+    toggleCartAction({ commit }, recipe) {
+      commit('toggleCart', recipe)
+    },
+    unlinkBrokenImages({ commit }) {
+      commit('unlinkBrokenImages')
+    },
+    setCuisine({ commit }, value) {
+      commit('setCuisine', value)
+    },
+    setCategory({ commit }, value) {
+      commit('setCategory', value)
+    },
+    setTag({ commit }, value) {
+      commit('setTag', value)
+    },
+  },
+})
diff --git a/babel.config.js b/babel.config.js
deleted file mode 100644
index 7867afd5..00000000
--- a/babel.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = function (api) {
-  api.cache(true)
-
-  return {
-    presets: [['@babel/env', { targets: { esmodules: true } }]],
-  }
-}
diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt
new file mode 100644
index 00000000..a38469cf
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/7.txt
@@ -0,0 +1,8 @@
+- New: Redesigned user interface
+- New: Recipe list view modes
+- New: Black theme
+- Fixed: Crash on app start with blocked sensors #30
+- Improvement: Faster app start and navigation
+- Added app languages: French, Italian, Norwegian Bokmål
+- Updated translations
+- Several bug fixes
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 00000000..16d25c2a
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+      "~/*": ["app/*"]
+    }
+  },
+  "include": ["app/**/*"]
+}
diff --git a/nativescript.config.ts b/nativescript.config.ts
index 39fdeebc..6c01668e 100644
--- a/nativescript.config.ts
+++ b/nativescript.config.ts
@@ -2,11 +2,10 @@ import { NativeScriptConfig } from "@nativescript/core"
 
 export default {
   id: "com.vishnuraghav.enrecipes",
+  appPath: "app",
   appResourcesPath: "app/resources",
   android: {
     v8Flags: "--expose_gc",
     markingMode: "none",
-    codeCache: true,
   }
-  // appPath: "app",
 } as NativeScriptConfig
diff --git a/package-lock.json b/package-lock.json
index d963403f..882a89f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,69 +9,27 @@
       "version": "1.0.0",
       "license": "GPL",
       "dependencies": {
-        "@nativescript-community/gesturehandler": "^0.1.36",
-        "@nativescript-community/perms": "^2.1.4",
-        "@nativescript-community/ui-collectionview": "^4.0.24",
-        "@nativescript-community/ui-drawer": "0.0.22",
-        "@nativescript-community/ui-material-activityindicator": "^5.1.16",
-        "@nativescript-community/ui-material-button": "^5.1.16",
-        "@nativescript-community/ui-material-floatingactionbutton": "^5.1.16",
-        "@nativescript-community/ui-material-progress": "^5.1.16",
-        "@nativescript-community/ui-material-snackbar": "^5.1.16",
-        "@nativescript/core": "~7.0.0",
-        "@nativescript/localize": "^5.0.2",
-        "@nativescript/social-share": "^2.0.1",
-        "@nativescript/theme": "^3.0.1",
+        "@nativescript-community/perms": "^2.1.5",
+        "@nativescript-community/ui-collectionview": "^4.0.29",
+        "@nativescript/core": "~8.0.0",
+        "@nativescript/localize": "^5.0.4",
+        "@nativescript/social-share": "^2.0.4",
         "@nativescript/zip": "^5.0.0",
-        "@nstudio/nativescript-checkbox": "^2.0.4",
-        "nativescript-accelerometer": "^3.0.0",
-        "nativescript-couchbase-plugin": "^0.9.6",
-        "nativescript-feedback": "^2.0.0",
+        "@triniwiz/nativescript-accelerometer": "^4.0.3",
+        "@triniwiz/nativescript-couchbase": "^1.2.2",
         "nativescript-imagecropper": "^4.0.1",
         "nativescript-intl": "^4.0.2",
-        "nativescript-plugin-filepicker": "^1.0.0",
-        "nativescript-toast": "^2.0.0",
-        "nativescript-vibrate": "^4.0.1",
-        "nativescript-vue": "^2.8.3",
-        "vuex": "^3.6.0"
+        "nativescript-vue": "^2.8.4",
+        "vuex": "^3.6.2"
       },
       "devDependencies": {
-        "@babel/core": "^7.12.10",
-        "@babel/preset-env": "^7.12.11",
-        "@nativescript/android": "7.0.1",
-        "@nativescript/webpack": "^3.0.8",
-        "@types/node": "^14.14.20",
-        "babel-loader": "^8.2.2",
-        "nativescript-vue-template-compiler": "^2.8.3",
-        "node-sass": "^4.14.1",
-        "vue-loader": "^15.9.6"
-      }
-    },
-    "node_modules/@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 6.11.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/core/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
+        "@babel/core": "~7.1.0",
+        "@babel/preset-env": "~7.1.0",
+        "@nativescript/android": "8.0.0",
+        "@nativescript/webpack": "5.0.0-beta.0",
+        "babel-loader": "~8.0.0",
+        "nativescript-vue-template-compiler": "^2.8.4",
+        "sass": "^1.32.8"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -84,46 +42,40 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
-      "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
+      "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
       "dev": true
     },
     "node_modules/@babel/core": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz",
-      "integrity": "sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz",
+      "integrity": "sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helpers": "^7.13.0",
-        "@babel/parser": "^7.13.4",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.1.6",
+        "@babel/helpers": "^7.1.5",
+        "@babel/parser": "^7.1.6",
+        "@babel/template": "^7.1.2",
+        "@babel/traverse": "^7.1.6",
+        "@babel/types": "^7.1.6",
+        "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "semver": "^6.3.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.10",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
+      "version": "7.13.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
+      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.13.0",
@@ -151,12 +103,12 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
-      "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz",
+      "integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.13.8",
+        "@babel/compat-data": "^7.13.12",
         "@babel/helper-validator-option": "^7.12.17",
         "browserslist": "^4.14.5",
         "semver": "^6.3.0"
@@ -165,20 +117,13 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-      "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
@@ -194,25 +139,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.4.tgz",
-      "integrity": "sha512-K5V2GaQZ1gpB+FTXM4AFVG2p1zzhm67n9wrQCJYNzvuLzQybhJyftW7qeDd2uUxPDNdl5Rkon1rOAeUeNDZ28Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
     "node_modules/@babel/helper-explode-assignable-expression": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
@@ -253,38 +179,37 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.13.0"
+        "@babel/types": "^7.13.12"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+      "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.13.12"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
-      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "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==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
+        "@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/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "lodash": "^4.17.19"
+        "@babel/traverse": "^7.13.13",
+        "@babel/types": "^7.13.14"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
@@ -314,24 +239,24 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+      "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==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
+        "@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.0"
+        "@babel/types": "^7.13.12"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
-      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.13.12"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
@@ -377,9 +302,9 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
-      "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
+      "integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.12.13",
@@ -388,9 +313,9 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.12.11",
@@ -399,9 +324,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
+      "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -424,45 +349,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
-      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
-      "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
-      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-json-strings": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
@@ -476,45 +362,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
-      "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
-      "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
-      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
@@ -544,33 +391,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz",
-      "integrity": "sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
@@ -599,42 +419,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -647,42 +431,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
@@ -707,30 +455,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
-      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-transform-arrow-functions": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
@@ -898,18 +622,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
-      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-transform-modules-amd": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz",
@@ -968,18 +680,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
-      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
     "node_modules/@babel/plugin-transform-new-target": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
@@ -1017,18 +717,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
-      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-transform-regenerator": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
@@ -1041,18 +729,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
-      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
@@ -1114,18 +790,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
-      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
@@ -1140,104 +804,61 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.8.tgz",
-      "integrity": "sha512-Sso1xOpV4S3ofnxW2DsWTE5ziRk62jEAKLGuQ+EJHC+YHTbFG38QUTixO3JVa1cYET9gkJhO1pMu+/+2dDhKvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-option": "^7.12.17",
-        "@babel/plugin-proposal-async-generator-functions": "^7.13.8",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.13.8",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
-        "@babel/plugin-proposal-json-strings": "^7.13.8",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.13",
-        "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.8",
-        "@babel/plugin-proposal-private-methods": "^7.13.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.12.13",
-        "@babel/plugin-transform-arrow-functions": "^7.13.0",
-        "@babel/plugin-transform-async-to-generator": "^7.13.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
-        "@babel/plugin-transform-block-scoping": "^7.12.13",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-computed-properties": "^7.13.0",
-        "@babel/plugin-transform-destructuring": "^7.13.0",
-        "@babel/plugin-transform-dotall-regex": "^7.12.13",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
-        "@babel/plugin-transform-for-of": "^7.13.0",
-        "@babel/plugin-transform-function-name": "^7.12.13",
-        "@babel/plugin-transform-literals": "^7.12.13",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
-        "@babel/plugin-transform-modules-amd": "^7.13.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
-        "@babel/plugin-transform-modules-umd": "^7.13.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
-        "@babel/plugin-transform-new-target": "^7.12.13",
-        "@babel/plugin-transform-object-super": "^7.12.13",
-        "@babel/plugin-transform-parameters": "^7.13.0",
-        "@babel/plugin-transform-property-literals": "^7.12.13",
-        "@babel/plugin-transform-regenerator": "^7.12.13",
-        "@babel/plugin-transform-reserved-words": "^7.12.13",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
-        "@babel/plugin-transform-spread": "^7.13.0",
-        "@babel/plugin-transform-sticky-regex": "^7.12.13",
-        "@babel/plugin-transform-template-literals": "^7.13.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
-        "@babel/plugin-transform-unicode-regex": "^7.12.13",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.13.0",
-        "babel-plugin-polyfill-corejs2": "^0.1.4",
-        "babel-plugin-polyfill-corejs3": "^0.1.3",
-        "babel-plugin-polyfill-regenerator": "^0.1.2",
-        "core-js-compat": "^3.9.0",
-        "semver": "^6.3.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz",
+      "integrity": "sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==",
       "dev": true,
       "dependencies": {
+        "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
+        "@babel/plugin-proposal-async-generator-functions": "^7.1.0",
+        "@babel/plugin-proposal-json-strings": "^7.0.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.0.0",
+        "@babel/plugin-syntax-async-generators": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-transform-arrow-functions": "^7.0.0",
+        "@babel/plugin-transform-async-to-generator": "^7.1.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.0.0",
+        "@babel/plugin-transform-block-scoping": "^7.1.5",
+        "@babel/plugin-transform-classes": "^7.1.0",
+        "@babel/plugin-transform-computed-properties": "^7.0.0",
+        "@babel/plugin-transform-destructuring": "^7.0.0",
+        "@babel/plugin-transform-dotall-regex": "^7.0.0",
+        "@babel/plugin-transform-duplicate-keys": "^7.0.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.1.0",
+        "@babel/plugin-transform-for-of": "^7.0.0",
+        "@babel/plugin-transform-function-name": "^7.1.0",
+        "@babel/plugin-transform-literals": "^7.0.0",
+        "@babel/plugin-transform-modules-amd": "^7.1.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.1.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.0.0",
+        "@babel/plugin-transform-modules-umd": "^7.1.0",
+        "@babel/plugin-transform-new-target": "^7.0.0",
+        "@babel/plugin-transform-object-super": "^7.1.0",
+        "@babel/plugin-transform-parameters": "^7.1.0",
+        "@babel/plugin-transform-regenerator": "^7.0.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+        "@babel/plugin-transform-spread": "^7.0.0",
+        "@babel/plugin-transform-sticky-regex": "^7.0.0",
+        "@babel/plugin-transform-template-literals": "^7.0.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.0.0",
+        "@babel/plugin-transform-unicode-regex": "^7.0.0",
+        "browserslist": "^4.1.0",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.3.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz",
-      "integrity": "sha512-CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg==",
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
+      "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
@@ -1255,26 +876,25 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz",
+      "integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
+        "@babel/generator": "^7.13.9",
         "@babel/helper-function-name": "^7.12.13",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
+        "@babel/parser": "^7.13.13",
+        "@babel/types": "^7.13.13",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "globals": "^11.1.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "version": "7.13.14",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz",
+      "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.12.11",
@@ -1282,107 +902,39 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@nativescript-community/gesturehandler": {
-      "version": "0.1.36",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/gesturehandler/-/gesturehandler-0.1.36.tgz",
-      "integrity": "sha512-UXhiLxL8EurFGcDcnFJghPCfGeDgKtuNqvf9Wpeu9JMNO3hUkuGnzrripgyx89RtY52T77Kaykqtc5Ojgwwlfg==",
-      "dependencies": {
-        "@nativescript-community/observable": "^2.0.8"
+    "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==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/@nativescript-community/observable": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/observable/-/observable-2.0.9.tgz",
-      "integrity": "sha512-JsNztvBEdUH7I3+ECnIOOJ39J2sEdeaBSFk4JIkrsFeVGOx1E21SSJNkkQNN9H2BUsF9JgDoQ6rGKl3hmJkXTw=="
-    },
     "node_modules/@nativescript-community/perms": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nativescript-community/perms/-/perms-2.1.5.tgz",
       "integrity": "sha512-YHYgzeOvYkb6Nj2JAgor8D5YLxYvj0sxr2JfnVrkb7c/Z41lTr0PaoHvhElvK6iERobbGQ1w3HmV9eCHrDgv9g=="
     },
-    "node_modules/@nativescript-community/text": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/text/-/text-1.4.5.tgz",
-      "integrity": "sha512-fvEe8ThX8VZtJ6sUSpnyYxRBCUp8RRniZL/mySNJfSjQKgj2CoUs+l/8E2AVhHhDFki2NvAUQftH8wZc+fBK6g=="
-    },
     "node_modules/@nativescript-community/ui-collectionview": {
-      "version": "4.0.24",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.24.tgz",
-      "integrity": "sha512-pCKohI/Vf1g8VoDrhhPr70ojbKontnm1S0aIp0PnfAOGpWchYYbBwKwgSqSQnwamBihGFFmGj5NvnlaSCqFxFw=="
-    },
-    "node_modules/@nativescript-community/ui-drawer": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-drawer/-/ui-drawer-0.0.22.tgz",
-      "integrity": "sha512-7W8sMyR2N8PnqdFiUlC+6R5C6x8DqwPGZ3YTJGBpjp+5aO5JIqJPD8OmmCugpIzlWrt73vZ2Ap9mu5v/FoBGIg==",
-      "dependencies": {
-        "@nativescript-community/gesturehandler": "^0.1.35"
-      }
-    },
-    "node_modules/@nativescript-community/ui-material-activityindicator": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-activityindicator/-/ui-material-activityindicator-5.2.8.tgz",
-      "integrity": "sha512-x4QZNxbktFDSH+CxbujRf+ZRVNftZAEOxG3HMRZ0ZOsEv6d1mGzq4nu72wSznm/SVfNMTSX5VlX0k5Yc1wFbUA==",
-      "dependencies": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "node_modules/@nativescript-community/ui-material-button": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-button/-/ui-material-button-5.2.8.tgz",
-      "integrity": "sha512-nmfGMc9GZ24OhukCrzhek78r2T4GWELxL5KrlAuCRL+u5gKxfrpkKEHzoCeahHLSnsNV5gEskpaTAsOK5pMGPg==",
-      "dependencies": {
-        "@nativescript-community/text": "^1.3.10",
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "node_modules/@nativescript-community/ui-material-core": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-core/-/ui-material-core-5.2.8.tgz",
-      "integrity": "sha512-HduzWFu7uFPoQObBiItAf2+erla41eHNug9CFhxvWSHzLg7reAx5Ndr3loP6OwreayMHQ9td1gnFix6HWsbG0Q==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@nativescript/hook": "~2.0.0"
-      }
-    },
-    "node_modules/@nativescript-community/ui-material-floatingactionbutton": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-floatingactionbutton/-/ui-material-floatingactionbutton-5.2.8.tgz",
-      "integrity": "sha512-eq8XSdlbFAUBgCJFS+wYS6V4W/NA/dLQzJqAqWPNIaeFQSIVAZQrNxQsomCJvmB9qjxjekFkuHfpxOzSELwZyQ==",
-      "dependencies": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "node_modules/@nativescript-community/ui-material-progress": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-progress/-/ui-material-progress-5.2.8.tgz",
-      "integrity": "sha512-owVzALRbyjsX43SPWr9ILuo1/YBPNOdd/Jm1ItvPEvsdDIC/5Y0LZa2fjtl8wok3MX3x+aQrzA4GlAOP52+C/Q==",
-      "dependencies": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "node_modules/@nativescript-community/ui-material-snackbar": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-snackbar/-/ui-material-snackbar-5.2.8.tgz",
-      "integrity": "sha512-Gj4zZVLotM0lzJeagvn73YLGAOuXe/8vi0QkLW0kNc4JPxEFGSVHWTsUafyGwE0V12ZHYtdkH2X2+ryVIuTDsg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
+      "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=="
     },
     "node_modules/@nativescript/android": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-7.0.1.tgz",
-      "integrity": "sha512-VsZCJ5zfZo0+/lFwKz+S7iFb7MA2jgACB7y8dNje3/cnZl+moKPNjFqitoEP0DY4gLz9LJNbFIIaUt84tMdUSQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-8.0.0.tgz",
+      "integrity": "sha512-p7eGwmE2+EvkQ4vt4scIrWqVuXytKv+GiHofrVRME1zUaTNMLSdB9ZyQOukfIvCx09iIufD42wN2a0IkgcDBvw==",
       "dev": true
     },
     "node_modules/@nativescript/core": {
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-7.0.13.tgz",
-      "integrity": "sha512-mB/MA4H7u0KuB0M4GLX2B0Yhii1r6u1WLhRrH6Yi8ixQNMMyXo8OFRxbXWTGj8TEOVPkljExRyOw24QMLc70AA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.0.tgz",
+      "integrity": "sha512-SgftvD0jE3cKLLB2PV/Pd/aKvJVQqb44502mKgLxg0QayKaQcNNxt6rpnRfck0FLfxmNCS6zKMVbRY8oNy/EQQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@nativescript/hook": "~2.0.0",
-        "css-tree": "^1.0.0-alpha.39",
+        "css-tree": "^1.1.2",
         "reduce-css-calc": "^2.1.7",
         "tslib": "~2.0.0"
       }
@@ -1413,201 +965,333 @@
       "resolved": "https://registry.npmjs.org/@nativescript/social-share/-/social-share-2.0.4.tgz",
       "integrity": "sha512-fP/lK/wMmHDmWo4Uq8gG/mpsgUjT+/y7Qc+IdCgiqQkgWQtgXTM7H1ecemMYD9dCZo+gZ5UyOXE/E23ZN0DBAg=="
     },
-    "node_modules/@nativescript/theme": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@nativescript/theme/-/theme-3.0.1.tgz",
-      "integrity": "sha512-5rduFdEjjGyUgK+jaJ/2EHxi+qAgTZuK9XgfxHw0KJAIIWP9HNL8JV8IVUBeIodRPHhSJZJVQT7t+8peH/4dVQ=="
-    },
     "node_modules/@nativescript/webpack": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-3.0.9.tgz",
-      "integrity": "sha512-PK1aJCgW4niMl6pkDeadqRqx8nZmtfDhMnVmj5FGzY7pt99YcX+m1ixciidUjYXzcsxj9huPOq4moodX2m3JhQ==",
+      "version": "5.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.0.tgz",
+      "integrity": "sha512-dmuCbsGThDe1NNSyInrvbBmeTm6C4qupvFGSZcEqGgwJ9xJBUG92GRZJpCtrMi5J+kWnmh7M2W8pRL20KYUORg==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
-        "@angular-devkit/core": "~10.0.0",
-        "@nativescript/hook": "~2.0.0",
-        "clean-webpack-plugin": "~3.0.0",
-        "copy-webpack-plugin": "~6.0.2",
-        "css": "~3.0.0",
-        "css-loader": "~4.2.0",
-        "escape-string-regexp": "~4.0.0",
-        "fork-ts-checker-webpack-plugin": "~5.0.0",
-        "global-modules-path": "~2.3.0",
-        "loader-utils": "~2.0.0",
-        "minimatch": "~3.0.4",
-        "nativescript-worker-loader": "~0.12.0",
-        "properties-reader": "~2.0.0",
-        "proxy-lib": "0.4.0",
-        "raw-loader": "~4.0.0",
-        "resolve-url-loader": "~3.1.0",
-        "sass-loader": "~9.0.0",
-        "sax": "^1.2.4",
-        "schema-utils": "~2.7.0",
-        "semver": "^7.3.0",
-        "shelljs": "~0.8.4",
-        "tapable": "~1.1.3",
-        "terser": "~5.0.0",
-        "terser-webpack-plugin": "~3.0.6",
-        "ts-loader": "^8.0.2",
-        "webpack": "~4.44.1",
-        "webpack-bundle-analyzer": "~3.8.0",
-        "webpack-cli": "~3.3.12",
-        "webpack-sources": "~1.4.3"
+        "@babel/core": "7.13.14",
+        "@pmmmwh/react-refresh-webpack-plugin": "0.4.3",
+        "babel-loader": "8.2.2",
+        "chalk": "4.1.0",
+        "cli-highlight": "2.1.11",
+        "commander": "7.2.0",
+        "copy-webpack-plugin": "8.1.0",
+        "css": "3.0.0",
+        "css-loader": "5.2.0",
+        "dotenv-webpack": "7.0.2",
+        "fork-ts-checker-webpack-plugin": "6.2.0",
+        "loader-utils": "2.0.0",
+        "lodash.get": "4.4.2",
+        "micromatch": "4.0.2",
+        "postcss": "8.2.8",
+        "postcss-import": "14.0.0",
+        "postcss-loader": "5.2.0",
+        "raw-loader": "4.0.2",
+        "react-refresh": "0.10.0",
+        "sass": "1.32.8",
+        "sass-loader": "11.0.1",
+        "sax": "1.2.4",
+        "source-map": "0.7.3",
+        "terser-webpack-plugin": "5.1.1",
+        "ts-dedent": "2.1.0",
+        "ts-loader": "8.1.0",
+        "vue-loader": "15.9.6",
+        "webpack": "5.28.0",
+        "webpack-bundle-analyzer": "4.4.0",
+        "webpack-chain": "6.5.1",
+        "webpack-cli": "4.6.0",
+        "webpack-merge": "5.7.3",
+        "webpack-virtual-modules": "0.4.2"
       },
       "bin": {
-        "generate-android-snapshot": "bin/generate-android-snapshot",
-        "install-ns-webpack": "bin/install-ns-webpack",
-        "ns-bundle": "bin/ns-bundle",
-        "ns-verify-bundle": "bin/ns-verify-bundle",
-        "remove-ns-webpack": "bin/remove-ns-webpack",
-        "update-ns-webpack": "bin/update-ns-webpack"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/css-loader": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz",
-      "integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^6.0.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.32",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.3",
-        "postcss-modules-scope": "^2.2.0",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^2.7.0",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "nativescript-webpack": "dist/bin/index.js"
       },
       "peerDependencies": {
-        "webpack": "^4.27.0 || ^5.0.0"
+        "nativescript-vue-template-compiler": "^2.8.1"
+      },
+      "peerDependenciesMeta": {
+        "nativescript-vue-template-compiler": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+    "node_modules/@nativescript/webpack/node_modules/@babel/core": {
+      "version": "7.13.14",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz",
+      "integrity": "sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==",
       "dev": true,
       "dependencies": {
-        "postcss": "^7.0.14"
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.13.9",
+        "@babel/helper-compilation-targets": "^7.13.13",
+        "@babel/helper-module-transforms": "^7.13.14",
+        "@babel/helpers": "^7.13.10",
+        "@babel/parser": "^7.13.13",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.13",
+        "@babel/types": "^7.13.14",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/postcss": {
-      "version": "7.0.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/postcss-modules-local-by-default": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.32",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/postcss-modules-scope": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/@nativescript/webpack/node_modules/@babel/core/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+    "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": {
-        "has-flag": "^3.0.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/babel-loader": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^1.4.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/babel-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/babel-loader/node_modules/loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "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/find-cache-dir": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
       },
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@nativescript/webpack/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "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/@nativescript/zip": {
@@ -1650,120 +1334,54 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz",
+      "integrity": "sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==",
       "dev": true,
       "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
+        "ansi-html": "^0.0.7",
+        "error-stack-parser": "^2.0.6",
+        "html-entities": "^1.2.1",
+        "native-url": "^0.2.6",
+        "schema-utils": "^2.6.5",
+        "source-map": "^0.7.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 10.x"
+      },
+      "peerDependencies": {
+        "@types/webpack": "4.x",
+        "react-refresh": ">=0.8.3 <0.10.0",
+        "sockjs-client": "^1.4.0",
+        "type-fest": "^0.13.1",
+        "webpack": ">=4.43.0 <6.0.0",
+        "webpack-dev-server": "3.x",
+        "webpack-hot-middleware": "2.x",
+        "webpack-plugin-serve": "0.x || 1.x"
+      },
+      "peerDependenciesMeta": {
+        "@types/webpack": {
+          "optional": true
+        },
+        "sockjs-client": {
+          "optional": true
+        },
+        "type-fest": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        },
+        "webpack-hot-middleware": {
+          "optional": true
+        },
+        "webpack-plugin-serve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@nstudio/nativescript-checkbox": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nstudio/nativescript-checkbox/-/nativescript-checkbox-2.0.4.tgz",
-      "integrity": "sha512-ypIGAHxDE/2o3CzYohSdypdhiw4GjMcZ3H/qtF4z97HMcMqj+g5bYPDC9cRH97qgAez8jf/z3UX5OzOtnrNxug=="
-    },
-    "node_modules/@types/anymatch": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
-      "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
-      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "14.14.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
-      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "node_modules/@types/tapable": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
-      "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==",
-      "dev": true
-    },
-    "node_modules/@types/uglify-js": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.12.0.tgz",
-      "integrity": "sha512-sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@types/uglify-js/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@types/webpack": {
-      "version": "4.41.26",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz",
-      "integrity": "sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==",
-      "dev": true,
-      "dependencies": {
-        "@types/anymatch": "*",
-        "@types/node": "*",
-        "@types/tapable": "*",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/@types/webpack-sources": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz",
-      "integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.7.3"
-      }
-    },
-    "node_modules/@types/webpack-sources/node_modules/source-map": {
+    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
@@ -1772,15 +1390,66 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@types/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "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==",
+      "dev": 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.2",
+      "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-couchbase/-/nativescript-couchbase-1.2.2.tgz",
+      "integrity": "sha512-ZnDVDFDR9oHu16KiQszjzFbEl3wWyFrKuTGoYmR7J5K2yIUsMD9UdvwXelZyXN45Hw7d595JrhgXJZNJpuvHXw=="
+    },
+    "node_modules/@types/eslint": {
+      "version": "7.2.8",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.8.tgz",
+      "integrity": "sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
+      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.46",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz",
+      "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "14.14.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
+      "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
     "node_modules/@vue/component-compiler-utils": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz",
@@ -1800,16 +1469,6 @@
         "prettier": "^1.18.2"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
     "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
       "version": "7.0.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -1849,187 +1508,188 @@
         "node": ">=6"
       }
     },
-    "node_modules/@vue/component-compiler-utils/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
+      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
+        "@webassemblyjs/helper-numbers": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
+      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
+      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
       "dev": true
     },
-    "node_modules/@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
+      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0"
+        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
+      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
+      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
+      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
+      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
+      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
+      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/helper-wasm-section": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-opt": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "@webassemblyjs/wast-printer": "1.11.0"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
+      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
+      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
+      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
+      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
+        "@webassemblyjs/ast": "1.11.0",
         "@xtuc/long": "4.2.2"
       }
     },
+    "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==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x",
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "envinfo": "^7.7.3"
+      },
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "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==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -2042,29 +1702,10 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
+      "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -2074,44 +1715,18 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.2.tgz",
+      "integrity": "sha512-+bpA9MJsHdZ4bgfDcpk0ozQyhhVct7rzOmO0s1IIr0AGGgKBljss8n2zp11rRP2wid5VGeh04CgeKzgat5/25A==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
-    "node_modules/adjust-sourcemap-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz",
-      "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
-      },
-      "engines": {
-        "node": ">=8.9"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -2124,15 +1739,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": ">=5.0.0"
-      }
-    },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
@@ -2142,22 +1748,34 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
       "engines": {
-        "node": ">=0.4.2"
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
       }
     },
     "node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "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": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
@@ -2172,12 +1790,17 @@
         "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
+    },
     "node_modules/anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -2186,75 +1809,11 @@
         "node": ">= 8"
       }
     },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
     "node_modules/arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
-    "node_modules/arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
-      "dev": true
-    },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -2264,122 +1823,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -2401,34 +1844,19 @@
         "node": ">= 4.5.0"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-      "dev": true
-    },
     "node_modules/babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
       },
       "engines": {
-        "node": ">= 8.9"
+        "node": ">= 6.9"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0",
@@ -2461,6 +1889,18 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/babel-loader/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -2470,80 +1910,11 @@
         "object.assign": "^4.1.0"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.8.tgz",
-      "integrity": "sha512-kB5/xNR9GYDuRmVlL9EGfdKBSUVI/9xAU7PCahA/1hbC2Jbmks9dlBBYjHF9IHMNY2jV/G2lIG7z0tJIW27Rog==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.0",
-        "@babel/helper-define-polyfill-provider": "^0.1.4",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.6.tgz",
-      "integrity": "sha512-IkYhCxPrjrUWigEmkMDXYzM5iblzKCdCD8cZrSAkQOyhhJm26DcG+Mxbx13QT//Olkpkg/AlRdT2L+Ww4Ciphw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.1.4",
-        "core-js-compat": "^3.8.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.5.tgz",
-      "integrity": "sha512-EyhBA6uN94W97lR7ecQVTvH9F5tIIdEw3ZqHuU4zekMlW82k5cXNXniiB7PRxQm06BqAjVr4sDT1mOy4RcphIA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.1.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -2563,30 +1934,6 @@
         }
       ]
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "node_modules/bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/big-integer": {
       "version": "1.6.48",
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
@@ -2609,90 +1956,16 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.0"
-      },
-      "engines": {
-        "node": "0.4 || >=0.5.8"
-      }
-    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "node_modules/bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/bplist-creator": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
@@ -2733,119 +2006,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
     "node_modules/browserslist": {
       "version": "4.16.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
@@ -2869,91 +2029,11 @@
         "url": "https://opencollective.com/browserslist"
       }
     },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -2988,38 +2068,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/camelcase-keys/node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001192",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001192.tgz",
-      "integrity": "sha512-63OrUnwJj5T1rUmoyqYTdRWBqFFxZFlyZnRRjDR8NSUQFB6A+j/uBORU/SyJ5WzDLg4SPiZH40hQCBNdZ/jmAw==",
-      "dev": true
-    },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "version": "1.0.30001205",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz",
+      "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==",
       "dev": true
     },
     "node_modules/chalk": {
@@ -3036,27 +2088,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/chalk/node_modules/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,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
-      "dev": true
-    },
     "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,
-      "optional": true,
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -3073,15 +2109,6 @@
         "fsevents": "~2.3.1"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/chrome-trace-event": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
@@ -3100,216 +2127,122 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+    "node_modules/cli-highlight": {
+      "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": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "chalk": "^4.0.0",
+        "highlight.js": "^10.7.1",
+        "mz": "^2.4.0",
+        "parse5": "^5.1.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.0",
+        "yargs": "^16.0.0"
+      },
+      "bin": {
+        "highlight": "bin/highlight"
+      },
+      "engines": {
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
       }
     },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+    "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==",
       "dev": true,
       "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+    "node_modules/cli-highlight/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": {
-        "is-descriptor": "^0.1.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+    "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==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+    "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==",
+      "dev": true
+    },
+    "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==",
+      "dev": true,
+      "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==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clean-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
-      "dev": true,
-      "dependencies": {
-        "@types/webpack": "^4.4.31",
-        "del": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "*"
+        "node": ">=8"
       }
     },
     "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "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": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -3331,23 +2264,14 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
     },
     "node_modules/commondir": {
       "version": "1.0.1",
@@ -3355,53 +2279,11 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "node_modules/compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "dev": true,
-      "dependencies": {
-        "arity-n": "^1.0.4"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
-    },
     "node_modules/consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
@@ -3414,33 +2296,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -3450,85 +2305,19 @@
         "safe-buffer": "~5.1.1"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "node_modules/copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "node_modules/copy-concurrently/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/copy-concurrently/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/copy-webpack-plugin": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz",
-      "integrity": "sha512-zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.1.0.tgz",
+      "integrity": "sha512-Soiq8kXI2AZkpw3dSp18u6oU2JonC7UKv3UdXsKOmT1A5QT46ku9+6c0Qy29JDbSavQJNN1/eKGpd3QNw+cZWg==",
       "dev": true,
       "dependencies": {
-        "cacache": "^15.0.5",
-        "fast-glob": "^3.2.4",
-        "find-cache-dir": "^3.3.1",
+        "fast-glob": "^3.2.5",
         "glob-parent": "^5.1.1",
-        "globby": "^11.0.1",
-        "loader-utils": "^2.0.0",
+        "globby": "^11.0.3",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^2.7.0",
-        "serialize-javascript": "^4.0.0",
-        "webpack-sources": "^1.4.3"
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -3538,30 +2327,25 @@
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
+        "webpack": "^5.1.0"
       }
     },
-    "node_modules/core-js-compat": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.0.tgz",
-      "integrity": "sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ==",
+    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.3",
-        "semver": "7.0.0"
+        "@types/json-schema": "^7.0.6",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/core-util-is": {
@@ -3586,100 +2370,23 @@
         "node": ">=8"
       }
     },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
     "node_modules/cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 8"
       }
     },
     "node_modules/css": {
@@ -3694,17 +2401,16 @@
       }
     },
     "node_modules/css-loader": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.1.0.tgz",
-      "integrity": "sha512-mFs3Xe2UrzRzL0+ML6e7Q2e/Ozp/WpDcam0l1X+rXgkuFjjsNSrjiyimG6malUOZGVuEjzKp1NqEqN3exG7ZqQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.0.tgz",
+      "integrity": "sha512-MfRo2MjEeLXMlUkeUwN71Vx5oc6EJnx5UQ4Yi9iUtYQvrPtwLUucYptz0hc6n++kdNcyF5olYBS4vPjJDAcLkw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "camelcase": "^6.2.0",
         "cssesc": "^3.0.0",
         "icss-utils": "^5.1.0",
         "loader-utils": "^2.0.0",
-        "postcss": "^8.2.6",
+        "postcss": "^8.2.8",
         "postcss-modules-extract-imports": "^3.0.0",
         "postcss-modules-local-by-default": "^4.0.0",
         "postcss-modules-scope": "^3.0.0",
@@ -3724,21 +2430,16 @@
         "webpack": "^4.27.0 || ^5.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/css-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "yallist": "^4.0.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/css-loader/node_modules/schema-utils": {
@@ -3746,7 +2447,6 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
       "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.6",
         "ajv": "^6.12.5",
@@ -3761,11 +2461,10 @@
       }
     },
     "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3776,10 +2475,16 @@
         "node": ">=10"
       }
     },
+    "node_modules/css-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/css-tree": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
-      "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dependencies": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -3822,46 +2527,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -3885,15 +2550,6 @@
         }
       }
     },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -3924,144 +2580,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "node_modules/detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -4070,23 +2588,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -4099,14 +2600,37 @@
         "node": ">=8"
       }
     },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+    "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,
       "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
+        "node": ">=8"
+      }
+    },
+    "node_modules/dotenv-defaults": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.1.tgz",
+      "integrity": "sha512-ugFCyBF7ILuwpmznduHPQZBMucHHJ8T4OBManTEVjemxCm2+nqifSuW2lD2SNKdiKSH1E324kZSdJ8M04b4I/A==",
+      "dev": true,
+      "dependencies": {
+        "dotenv": "^8.2.0"
+      }
+    },
+    "node_modules/dotenv-webpack": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-7.0.2.tgz",
+      "integrity": "sha512-RY+/5uM/XY4bGtih9f9ic8hlrUDxVcZZBPWlnX/aHhaKxcVVX9SH/5VH7CSmvVo9GL6PKvQOA0X1bc552rnatQ==",
+      "dev": true,
+      "dependencies": {
+        "dotenv-defaults": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "webpack": "^4 || ^5"
       }
     },
     "node_modules/duplexer": {
@@ -4115,75 +2639,16 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "node_modules/ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.675",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.675.tgz",
-      "integrity": "sha512-GEQw+6dNWjueXGkGfjgm7dAMtXfEqrfDG3uWcZdeaD4cZ3dKYdPRQVruVXQRXtPLtOr5GNVVlNLRMChOZ611pQ==",
-      "dev": true
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "version": "1.3.704",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.704.tgz",
+      "integrity": "sha512-6cz0jvawlUe4h5AbfQWxPzb+8LzVyswGAWiGc32EJEmfj39HTQyNPkLXirc7+L4x5I6RgRkzua8Ryu5QZqc8cA==",
       "dev": true
     },
     "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "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
     },
     "node_modules/emojis-list": {
@@ -4195,24 +2660,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
     "node_modules/enhanced-resolve": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
@@ -4227,6 +2674,30 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.4.tgz",
+      "integrity": "sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -4248,37 +2719,20 @@
         "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+    "node_modules/error-stack-parser": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
+      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
       "dev": true,
       "dependencies": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
+        "stackframe": "^1.1.1"
       }
     },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
+    "node_modules/es-module-lexer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
+      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+      "dev": true
     },
     "node_modules/escalade": {
       "version": "3.1.1",
@@ -4289,35 +2743,26 @@
         "node": ">=6"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
     "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "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": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.8.0"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8.0.0"
       }
     },
     "node_modules/esrecurse": {
@@ -4350,24 +2795,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -4377,325 +2804,29 @@
         "node": ">=0.8.x"
       }
     },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+    "node_modules/execa": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
+      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
       "dev": true,
       "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "node": ">=10"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "dependencies": {
-        "type": "^2.0.0"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.3.0.tgz",
-      "integrity": "sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==",
-      "dev": true
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -4725,6 +2856,12 @@
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
     "node_modules/fastq": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -4734,28 +2871,6 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-      "dev": 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",
@@ -4768,251 +2883,42 @@
         "node": ">=8"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
       "dependencies": {
         "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+        "node": ">=6"
       }
     },
     "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/findup-sync": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "locate-path": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "node_modules/for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true,
-      "engines": {
-        "node": "*"
+        "node": ">=6"
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "5.0.14",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.14.tgz",
-      "integrity": "sha512-iwRdjgZx1Ll0DAMhmtOF4ffoICpiUxOqOHLrbIHmeCtZiwCrL/qscm+EXOJyzj3a9X8hLRLDEHy9FOyD6Gm42g==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.0.tgz",
+      "integrity": "sha512-DTNbOhq6lRdjYprukX54JMeYJgQ0zMow+R5BMLwWxEX2NAXthIkwnV8DBmsWjwNLSUItKZM4TCCJbtgrtKBu2Q==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.8.3",
         "@types/json-schema": "^7.0.5",
         "chalk": "^4.1.0",
+        "chokidar": "^3.4.2",
         "cosmiconfig": "^6.0.0",
         "deepmerge": "^4.2.2",
         "fs-extra": "^9.0.0",
@@ -5085,6 +2991,18 @@
         "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",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
@@ -5104,9 +3022,9 @@
       }
     },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -5130,59 +3048,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
+    "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",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/fs-extra": {
       "version": "9.1.0",
@@ -5199,36 +3069,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/fs-monkey": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.1.tgz",
       "integrity": "sha512-fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA==",
       "dev": true
     },
-    "node_modules/fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -5248,79 +3094,12 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/fstream/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/fstream/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "node_modules/gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "node_modules/gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "dependencies": {
-        "globule": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -5353,31 +3132,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+    "node_modules/get-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
+      "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/glob": {
@@ -5400,9 +3164,9 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
@@ -5411,38 +3175,12 @@
         "node": ">= 6"
       }
     },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-modules-path": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.1.tgz",
-      "integrity": "sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==",
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -5453,9 +3191,9 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
-      "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
+      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
       "dev": true,
       "dependencies": {
         "array-union": "^2.1.0",
@@ -5472,20 +3210,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globule": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -5493,39 +3217,18 @@
       "dev": true
     },
     "node_modules/gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
       "dependencies": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
+        "duplexer": "^0.1.2"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
+        "node": ">=10"
       },
-      "engines": {
-        "node": ">=6"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/has": {
@@ -5540,18 +3243,6 @@
         "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=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "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",
@@ -5573,139 +3264,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/hash-sum": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
       "dev": true
     },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -5715,97 +3279,28 @@
         "he": "bin/he"
       }
     },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+    "node_modules/highlight.js": {
+      "version": "10.7.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.1.tgz",
+      "integrity": "sha512-S6G97tHGqJ/U8DsXcEdnACbirtbx58Bx9CzIVeYli8OuswCfYI/LsXH2EiGcoGio1KAC3x4mmUwulOllJ2ZyRA==",
       "dev": true,
       "engines": {
-        "node": ">= 6.0.0"
+        "node": "*"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+    "node_modules/html-entities": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
       "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.17.0"
       }
     },
     "node_modules/icss-utils": {
@@ -5813,7 +3308,6 @@
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -5821,32 +3315,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==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
     "node_modules/ignore": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -5873,44 +3341,44 @@
       }
     },
     "node_modules/import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
       "dev": true,
       "dependencies": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
       },
       "bin": {
         "import-local-fixture": "fixtures/cli.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/import-local/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/import-local/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/import-local/node_modules/p-limit": {
@@ -5929,64 +3397,34 @@
       }
     },
     "node_modules/import-local/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/import-local/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
       "dependencies": {
-        "find-up": "^3.0.0"
+        "find-up": "^4.0.0"
       },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/in-publish": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
-      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
-      "dev": true,
-      "bin": {
-        "in-install": "in-install.js",
-        "in-publish": "in-publish.js",
-        "not-in-install": "not-in-install.js",
-        "not-in-publish": "not-in-publish.js"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -5997,12 +3435,6 @@
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
       "dev": true
     },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -6017,40 +3449,22 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
     "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
       "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
     },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "loose-envify": "^1.0.0"
       }
     },
     "node_modules/is-arrayish": {
@@ -6064,7 +3478,6 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -6072,12 +3485,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
     "node_modules/is-core-module": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
@@ -6090,44 +3497,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -6137,28 +3506,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "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,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/is-glob": {
@@ -6182,39 +3536,6 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -6227,34 +3548,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+    "node_modules/is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/isarray": {
@@ -6278,10 +3578,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+    "node_modules/javascript-stringify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz",
+      "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==",
       "dev": true
     },
     "node_modules/jest-worker": {
@@ -6319,11 +3619,14 @@
         "node": ">=8"
       }
     },
-    "node_modules/js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
-      "dev": true
+    "node_modules/js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
@@ -6331,12 +3634,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -6361,24 +3658,12 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "node_modules/json5": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
@@ -6406,21 +3691,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -6431,9 +3701,9 @@
       }
     },
     "node_modules/klona": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-1.1.2.tgz",
-      "integrity": "sha512-xf88rTeHiXk+XE2Vhi6yj8Wm3gMZrygGdKjJqN8HkV+PwF/t50/LdAKHoHpPcxFAlmQszTZ1CugrK25S7qDRLA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
       "dev": true,
       "engines": {
         "node": ">= 8"
@@ -6445,50 +3715,13 @@
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
       "dev": true
     },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
       "dev": true,
       "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
+        "node": ">=6.11.5"
       }
     },
     "node_modules/loader-utils": {
@@ -6506,15 +3739,16 @@
       }
     },
     "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/lodash": {
@@ -6523,59 +3757,45 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
       "dev": true
     },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
     "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-      "dev": true,
-      "dependencies": {
-        "sourcemap-codec": "^1.4.4"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
     "node_modules/make-error": {
@@ -6583,65 +3803,15 @@
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "node_modules/mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/memfs": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.0.tgz",
-      "integrity": "sha512-f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.1.tgz",
+      "integrity": "sha512-Y5vcpQzWTime4fBTr/fEnxXUxEYUgKbDlty1WX0gaa4ae14I6KmvK1S8HtXOX0elKAE6ENZJctkGtbTFYcRIUw==",
       "dev": true,
       "dependencies": {
         "fs-monkey": "1.0.1"
@@ -6663,33 +3833,6 @@
         "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
-    "node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
     "node_modules/merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
@@ -6723,15 +3866,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/micromatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -6745,35 +3879,16 @@
         "node": ">=8"
       }
     },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
       "dev": true,
       "bin": {
         "mime": "cli.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0.0"
       }
     },
     "node_modules/mime-db": {
@@ -6797,17 +3912,14 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
     },
     "node_modules/minimatch": {
       "version": "3.0.4",
@@ -6823,102 +3935,8 @@
     "node_modules/minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "node_modules/minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "node_modules/mkdirp": {
       "version": "1.0.4",
@@ -6931,62 +3949,28 @@
         "node": ">=10"
       }
     },
-    "node_modules/move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "node_modules/move-concurrently/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/move-concurrently/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "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
     },
-    "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "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",
+        "thenify-all": "^1.0.0"
+      }
     },
     "node_modules/nanoid": {
-      "version": "3.1.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
+      "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
       "dev": true,
-      "peer": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -6994,82 +3978,13 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "node_modules/native-url": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz",
+      "integrity": "sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==",
       "dev": true,
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nativescript-accelerometer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-accelerometer/-/nativescript-accelerometer-3.0.0.tgz",
-      "integrity": "sha512-2sEfxTzzeXae6sDvW2dymgsNb8Z6qgNQOCUKJz+G8GI00w807R+EK9+zOwQcaW6jne741D0laAwzTW+ofg9HqA==",
-      "peerDependencies": {
-        "tns-core-modules": ">2.0.0"
-      }
-    },
-    "node_modules/nativescript-couchbase-plugin": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/nativescript-couchbase-plugin/-/nativescript-couchbase-plugin-0.9.6.tgz",
-      "integrity": "sha512-kMA9KHQX82TFaGnGUhY94KLOLss4pb5QmghgoEdu1sLwd94I/f1MQ+kHWbuBOdFmdQJw5oCK+Sey+A22Nd5jgA=="
-    },
-    "node_modules/nativescript-feedback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-feedback/-/nativescript-feedback-2.0.0.tgz",
-      "integrity": "sha512-6ZE/g+s1xxez3pMRJa/r0f144VuyapgDjbo8D37nMC4F0WDQLKk8dC0405czhQxD2djVq3GEMfM/n0cuMbY53A=="
-    },
-    "node_modules/nativescript-hook": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/nativescript-hook/-/nativescript-hook-0.2.5.tgz",
-      "integrity": "sha512-ciGJtNbtMB2lGv8jAkUripkRjd3g8atX9VYPSt6e8PI6YPiOKeoma3xjcXoW66pFMYpHnfrbp6Mq9U/QtiQrVg==",
-      "peer": true,
-      "dependencies": {
-        "glob": "^6.0.1",
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "node_modules/nativescript-hook/node_modules/glob": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-      "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-      "peer": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/nativescript-hook/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "peer": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "querystring": "^0.2.0"
       }
     },
     "node_modules/nativescript-imagecropper": {
@@ -7085,317 +4000,33 @@
       "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-4.0.2.tgz",
       "integrity": "sha512-a8VGIFhLYCMtdTuZpiE2d9NcxLkkHGYt2EeG37aRTG4TjlMrUhV0IxfoTzj9zDGk1p1xAPSIo6yGPb2Z9hay2A=="
     },
-    "node_modules/nativescript-permissions": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.11.tgz",
-      "integrity": "sha512-4ox9WpVJPLfepPauqECvPfbxVE1hVPVVBLZxOs3d9+2Yrr0mSkJO7D7BQ4OUS90hHfRdPhf70aJKWxzJoqi63g=="
-    },
-    "node_modules/nativescript-plugin-filepicker": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-plugin-filepicker/-/nativescript-plugin-filepicker-1.0.0.tgz",
-      "integrity": "sha512-BOf7ycOQJGcg7ayzfbyFooMjngQgBAg6HAaws4fKQBRnI39aw7VVqXruuHSCDPqLW681/7GuECwWxknmAalOnQ==",
-      "dependencies": {
-        "nativescript-permissions": "~1.3.0"
-      }
-    },
-    "node_modules/nativescript-toast": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-toast/-/nativescript-toast-2.0.0.tgz",
-      "integrity": "sha512-xqyNfFS894oGfrEVO7CjpioAQLiLNNcd77Euq9XIUTf1U3W0PsIgAJbLP7+kkVGIJxdLtlBkbcQ4wDmf2DCi1w==",
-      "peerDependencies": {
-        "tns-core-modules": ">=2.x|| >= 3.x || >=4.x || >=5.x"
-      }
-    },
-    "node_modules/nativescript-vibrate": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/nativescript-vibrate/-/nativescript-vibrate-4.0.1.tgz",
-      "integrity": "sha512-T9VspAu+pgYM/AWLradA4HPv/tdfx8jrhIOD02PZs09KhJyjQE3BoubnHcmg0neeQAhgxHiuXGdit8QOAyKaBA=="
-    },
     "node_modules/nativescript-vue": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.8.3.tgz",
-      "integrity": "sha512-2F3Jv0Y1gzATjcVnFn7RaJm9QDAINOJNtQ4Wh0B3lGiC5qsmQy91IjF2wxVOzGk5QNA2v4shSG+Emco53n0+6w=="
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.8.4.tgz",
+      "integrity": "sha512-AA8Au1TUPtZX5L5JVH64QCzo7eeePViUzKHMTKwba4IYZX1Lm8Sspm4CN9wYzio8UAFylydqxhnOCdnwlxh8Ow=="
     },
     "node_modules/nativescript-vue-template-compiler": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.8.3.tgz",
-      "integrity": "sha512-xePEXKdQ1nLJbj4LF3VEyluz6SOL0dSonNb3gKGJ7nfGEgBywm8nUZdwmwGcy2/1JL4CWtRs9f9wz431McXBTg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.8.4.tgz",
+      "integrity": "sha512-WAYmVMYyHj4WBkcb3wjR9EjiQHz7zzcVTQJnyOcKJIm7yR1Tiskx+G2OxBd+7Id5zYxqC5Et+GojfO1CbRLUxA==",
       "dev": true,
       "dependencies": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"
       }
     },
-    "node_modules/nativescript-worker-loader": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/nativescript-worker-loader/-/nativescript-worker-loader-0.12.1.tgz",
-      "integrity": "sha512-phzXAmeqcPBHTlRTFKkbjVjpnisdXQM2VqIl4y/gfMHKG2y78bJNLQPTzsPSENK9V075FIS8nSs1WcrDav8yag==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.7.0"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "node_modules/next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "node_modules/node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "dev": true,
-      "dependencies": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/node-gyp/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/node-gyp/node_modules/semver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/node-gyp/node_modules/tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-      "dev": true,
-      "dependencies": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "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==",
       "dev": true
     },
-    "node_modules/node-sass": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
-      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "bin": {
-        "node-sass": "bin/node-sass"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/node-sass/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/node-sass/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": 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/node-sass/node_modules/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,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/node-sass/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/node-sass/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=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -7405,34 +4036,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "dependencies": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
+        "path-key": "^3.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
     "node_modules/object-assign": {
@@ -7444,91 +4057,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -7538,18 +4066,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object.assign": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
@@ -7568,30 +4084,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -7600,6 +4092,21 @@
         "wrappy": "1"
       }
     },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -7609,40 +4116,6 @@
         "opener": "bin/opener-bin.js"
       }
     },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -7659,15 +4132,15 @@
       }
     },
     "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/p-locate/node_modules/p-limit": {
@@ -7685,21 +4158,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -7709,23 +4167,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "dependencies": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -7738,19 +4179,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -7769,53 +4197,34 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+    "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
     },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+    "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,
-      "optional": true
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "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
     },
     "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/path-is-absolute": {
@@ -7826,19 +4235,13 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
     "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/path-parse": {
@@ -7847,12 +4250,6 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -7862,28 +4259,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/pbkdf2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "node_modules/picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -7905,69 +4280,38 @@
         "node": ">=6"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
-      "dependencies": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "find-up": "^3.0.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true,
+    "node_modules/plist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
+      "dependencies": {
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^9.0.7",
+        "xmldom": "^0.5.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
     "node_modules/postcss": {
-      "version": "8.2.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.6.tgz",
-      "integrity": "sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg==",
+      "version": "8.2.8",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz",
+      "integrity": "sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "colorette": "^1.2.1",
+        "colorette": "^1.2.2",
         "nanoid": "^3.1.20",
         "source-map": "^0.6.1"
       },
@@ -7979,12 +4323,99 @@
         "url": "https://opencollective.com/postcss/"
       }
     },
+    "node_modules/postcss-import": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
+      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.2.0.tgz",
+      "integrity": "sha512-uSuCkENFeUaOYsKrXm0eNNgVIxc71z8RcckLMbVw473rGojFnrUeqEz6zBgXsH2q1EIzXnO/4pEz9RhALjlITA==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/cosmiconfig": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/postcss-modules-extract-imports": {
       "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,
-      "peer": true,
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -7997,7 +4428,6 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
       "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
@@ -8015,7 +4445,6 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
       "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "postcss-selector-parser": "^6.0.4"
       },
@@ -8031,7 +4460,6 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "icss-utils": "^5.0.0"
       },
@@ -8068,7 +4496,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8086,83 +4513,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "node_modules/properties-reader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/properties-reader/-/properties-reader-2.0.0.tgz",
-      "integrity": "sha512-wEvznelF2vGq52VA51j8ZNoUZOeCJQd2kh5CGHLOhdLKKN176ZAdYv+WH6s6tj7IOBLFRkWhMPQjq8uzyFe37Q==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "~0.5.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/properties-reader/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-lib": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/proxy-lib/-/proxy-lib-0.4.0.tgz",
-      "integrity": "sha512-oUDDpf0NTtKPyXjBNUcKzwZhA9GjEdu8Z47GsxGv5rZvKyCqsSrHurJtlL1yp7uVzA2NOmxd4aX7qmB1ZOdCwQ==",
-      "dev": true,
-      "dependencies": {
-        "osenv": "0.1.4"
-      }
-    },
-    "node_modules/proxy-lib/node_modules/osenv": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-      "dev": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -8175,63 +4531,6 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
       "dev": true
     },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "node_modules/pumpify/node_modules/pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -8241,37 +4540,19 @@
         "node": ">=6"
       }
     },
-    "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
       "dev": true,
       "engines": {
         "node": ">=0.4.x"
       }
     },
     "node_modules/queue-microtask": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz",
-      "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -8297,40 +4578,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/raw-loader": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
@@ -8351,22 +4598,6 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/raw-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/raw-loader/node_modules/schema-utils": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
@@ -8385,73 +4616,25 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+    "node_modules/react-refresh": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",
+      "integrity": "sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ==",
       "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "pify": "^2.3.0"
       }
     },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg/node_modules/pify": {
+    "node_modules/read-cache/node_modules/pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
@@ -8480,7 +4663,6 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -8489,42 +4671,17 @@
       }
     },
     "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
+      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
       "dev": true,
       "dependencies": {
-        "resolve": "^1.1.6"
+        "resolve": "^1.9.0"
       },
       "engines": {
         "node": ">= 0.10"
       }
     },
-    "node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redent/node_modules/indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/reduce-css-calc": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
@@ -8572,25 +4729,6 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
-      "dev": true
-    },
     "node_modules/regexpu-core": {
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
@@ -8615,9 +4753,9 @@
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
-      "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "dev": true,
       "dependencies": {
         "jsesc": "~0.5.0"
@@ -8635,75 +4773,6 @@
         "jsesc": "bin/jsesc"
       }
     },
-    "node_modules/remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "dependencies": {
-        "is-finite": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -8713,12 +4782,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "node_modules/resolve": {
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
@@ -8733,67 +4796,24 @@
       }
     },
     "node_modules/resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
       "dependencies": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "^5.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-dir/node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-dir/node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/resolve-from": {
@@ -8805,122 +4825,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
-    "node_modules/resolve-url-loader": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
-      "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
-      "dev": true,
-      "dependencies": {
-        "adjust-sourcemap-loader": "3.0.0",
-        "camelcase": "5.3.1",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.7.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.21",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-      "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -8931,87 +4835,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      }
-    },
-    "node_modules/rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-      "dev": true
-    },
-    "node_modules/rework/node_modules/convert-source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-      "dev": true
-    },
-    "node_modules/rework/node_modules/css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/rework/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rework/node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -9035,80 +4858,35 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "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
     },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+    "node_modules/sass": {
+      "version": "1.32.8",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
+      "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
       "dev": true,
       "dependencies": {
-        "ret": "~0.1.10"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sass-graph": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^13.3.2"
+        "chokidar": ">=2.0.0 <4.0.0"
       },
       "bin": {
-        "sassgraph": "bin/sassgraph"
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=8.9.0"
       }
     },
     "node_modules/sass-loader": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-9.0.3.tgz",
-      "integrity": "sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-11.0.1.tgz",
+      "integrity": "sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw==",
       "dev": true,
       "dependencies": {
-        "klona": "^1.1.2",
-        "loader-utils": "^2.0.0",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^2.7.0",
-        "semver": "^7.3.2"
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -9119,9 +4897,9 @@
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0",
+        "node-sass": "^4.0.0 || ^5.0.0",
         "sass": "^1.3.0",
-        "webpack": "^4.36.0 || ^5.0.0"
+        "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
         "fibers": {
@@ -9135,21 +4913,6 @@
         }
       }
     },
-    "node_modules/sass-loader/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -9174,224 +4937,55 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "dev": true,
-      "dependencies": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      }
-    },
-    "node_modules/scss-tokenizer/node_modules/source-map": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
       "bin": {
-        "semver": "bin/semver.js"
+        "semver": "bin/semver"
       }
     },
-    "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-      "dev": true
-    },
     "node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "kind-of": "^6.0.2"
       },
       "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-      "dev": true
-    },
-    "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==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
+        "node": ">=8"
       }
     },
     "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      },
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/shorthash": {
@@ -9418,6 +5012,20 @@
         "plist": "^3.0.1"
       }
     },
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.9",
+        "mime": "^2.3.1",
+        "totalist": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -9427,207 +5035,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/snapdragon/node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -9670,227 +5077,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
-      "dev": true
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
     },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
+    "node_modules/stackframe": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz",
+      "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==",
+      "dev": true
     },
     "node_modules/stream-buffers": {
       "version": "2.2.0",
@@ -9900,35 +5096,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -9939,56 +5106,38 @@
       }
     },
     "node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dev": true,
       "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
     "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=",
+      "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": "^2.0.0"
+        "ansi-regex": "^5.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/strip-bom": {
+    "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1"
-      },
-      "bin": {
-        "strip-indent": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
     "node_modules/supports-color": {
@@ -10012,55 +5161,35 @@
         "node": ">=6"
       }
     },
-    "node_modules/tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
-      "dev": true,
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/terser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.0.0.tgz",
-      "integrity": "sha512-olH2DwGINoSuEpSGd+BsPuAQaA3OrHnHnFL/rDB2TVNc3srUbz/rq/j2BlF4zDXI+JqAvGr86bIm1R2cJgZ3FA==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
+      "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
       "dev": true,
       "dependencies": {
         "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
       },
       "bin": {
         "terser": "bin/terser"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10"
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.8.tgz",
-      "integrity": "sha512-ygwK8TYMRTYtSyLB2Mhnt90guQh989CIq/mL/2apwi6rA15Xys4ydNUiH4ah6EZCfQxSk26ZFQilZ4IQ6IZw6A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz",
+      "integrity": "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==",
       "dev": true,
       "dependencies": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.1.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^4.0.0",
+        "jest-worker": "^26.6.2",
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "source-map": "^0.6.1",
-        "terser": "^4.8.0",
-        "webpack-sources": "^1.4.3"
+        "terser": "^5.5.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -10070,7 +5199,25 @@
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.6",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/source-map": {
@@ -10082,96 +5229,42 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/terser/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
       "dev": true,
       "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "any-promise": "^1.0.0"
       }
     },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+    "node_modules/thenify-all": {
+      "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": {
-        "setimmediate": "^1.0.4"
+        "thenify": ">= 3.1.0 < 4"
       },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=0.8"
       }
     },
-    "node_modules/tns-core-modules": {
-      "version": "6.5.25",
-      "resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-6.5.25.tgz",
-      "integrity": "sha512-bqKtJvhWNNA1ZItmdyX/WlG8exsAcIDqiFOpzcR49Y+He8b3kHdcmOX+VSL9cTQaYPd9piIYLoS2NOh5rSZcgA==",
-      "peer": true,
-      "dependencies": {
-        "@nativescript/core": "6.5.25"
-      }
-    },
-    "node_modules/tns-core-modules-widgets": {
-      "version": "6.5.10",
-      "resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-6.5.10.tgz",
-      "integrity": "sha512-esZPbnm0wIn89AoFxdfhFuG0a/JE9A9k3ovBRpzs9O9d/JrChlgkTX4lSRQz6xBHLC1UVaqiTc/DNBGbdaeCyA==",
-      "peer": true
-    },
-    "node_modules/tns-core-modules/node_modules/@nativescript/core": {
-      "version": "6.5.25",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-6.5.25.tgz",
-      "integrity": "sha512-vD3M2SiJgZl3yZdFLAXvNvXwocD9eiyo6vQUisrHH0g10ObecxCo2eCECJR8vdbtfSyb5E0BvBx3Ietkgdzntg==",
-      "hasInstallScript": true,
-      "peer": true,
-      "dependencies": {
-        "css-tree": "^1.0.0-alpha.37",
-        "nativescript-hook": "0.2.5",
-        "reduce-css-calc": "^2.1.6",
-        "semver": "6.3.0",
-        "tns-core-modules-widgets": "latest",
-        "tslib": "1.10.0"
-      }
-    },
-    "node_modules/tns-core-modules/node_modules/tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-      "peer": true
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -10181,45 +5274,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -10232,56 +5286,28 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+    "node_modules/totalist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
       "dev": true,
       "engines": {
-        "node": ">=0.6"
+        "node": ">=6"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+    "node_modules/ts-dedent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.0.tgz",
+      "integrity": "sha512-HbmrG+lCgk5W8LQTALxBxQRBDeAhQKRzdqVhHLUkVd5nYT+b6zDzbRMjiA8wqrWDa33X09WdnW4zEsdwQArTaw==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.10"
       }
     },
-    "node_modules/true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.2"
-      }
-    },
-    "node_modules/tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-      "dev": true
-    },
     "node_modules/ts-loader": {
-      "version": "8.0.17",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.17.tgz",
-      "integrity": "sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.1.0.tgz",
+      "integrity": "sha512-YiQipGGAFj2zBfqLhp28yUvPP9jUGqHxRzrGYuc82Z2wM27YIHbElXiaZDc93c3x0mz4zvBmS6q/DgExpdj37A==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.0",
@@ -10356,10 +5382,22 @@
         "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",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -10383,6 +5421,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/ts-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/ts-node": {
       "version": "9.1.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz",
@@ -10413,68 +5457,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
       "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
     },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "node_modules/typescript": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz",
-      "integrity": "sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==",
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -10515,54 +5497,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
-    "node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "dependencies": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -10572,74 +5512,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -10649,128 +5521,18 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/v8-compile-cache": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
-      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/vue": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
-      "peer": true
-    },
     "node_modules/vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -10829,9 +5591,9 @@
       }
     },
     "node_modules/vue-style-loader": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
-      "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
       "dev": true,
       "dependencies": {
         "hash-sum": "^1.0.2",
@@ -10879,332 +5641,53 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      },
-      "optionalDependencies": {
-        "chokidar": "^3.4.1",
-        "watchpack-chokidar2": "^2.0.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "chokidar": "^2.1.8"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/anymatch/node_modules/normalize-path": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
+      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
       "dev": true,
-      "optional": true,
       "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/watchpack-chokidar2/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/webpack": {
-      "version": "4.44.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
-      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
+        "@types/eslint-scope": "^3.7.0",
+        "@types/estree": "^0.0.46",
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/wasm-edit": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "acorn": "^8.0.4",
+        "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.3.0",
-        "eslint-scope": "^4.0.3",
+        "enhanced-resolve": "^5.7.0",
+        "es-module-lexer": "^0.4.0",
+        "eslint-scope": "^5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.4",
         "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
-        "webpack-sources": "^1.4.1"
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.1",
+        "watchpack": "^2.0.0",
+        "webpack-sources": "^2.1.1"
       },
       "bin": {
         "webpack": "bin/webpack.js"
       },
       "engines": {
-        "node": ">=6.11.5"
+        "node": ">=10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -11213,162 +5696,202 @@
       "peerDependenciesMeta": {
         "webpack-cli": {
           "optional": true
-        },
-        "webpack-command": {
-          "optional": true
         }
       }
     },
     "node_modules/webpack-bundle-analyzer": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
-      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.0.tgz",
+      "integrity": "sha512-9DhNa+aXpqdHk8LkLPTBU/dMfl84Y+WE2+KnfI6rSpNRNVKa0VGLjPd2pjFubDeqnWmulFggxmWBxhfJXZnR0g==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "chalk": "^4.1.0",
+        "commander": "^6.2.0",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "opener": "^1.5.2",
+        "sirv": "^1.0.7",
+        "ws": "^7.3.1"
       },
       "bin": {
         "webpack-bundle-analyzer": "lib/bin/analyzer.js"
       },
       "engines": {
-        "node": ">= 6.14.4"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+    "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": {
-        "minimist": "^1.2.5"
+        "color-convert": "^2.0.1"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/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/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",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "engines": {
+        "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",
+      "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
+      "dev": true,
+      "dependencies": {
+        "deepmerge": "^1.5.2",
+        "javascript-stringify": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-chain/node_modules/deepmerge": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-cli": {
-      "version": "3.3.12",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
-      "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.6.0.tgz",
+      "integrity": "sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA==",
       "dev": true,
       "dependencies": {
-        "chalk": "^2.4.2",
-        "cross-spawn": "^6.0.5",
-        "enhanced-resolve": "^4.1.1",
-        "findup-sync": "^3.0.0",
-        "global-modules": "^2.0.0",
-        "import-local": "^2.0.0",
-        "interpret": "^1.4.0",
-        "loader-utils": "^1.4.0",
-        "supports-color": "^6.1.0",
-        "v8-compile-cache": "^2.1.1",
-        "yargs": "^13.3.2"
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^1.0.2",
+        "@webpack-cli/info": "^1.2.3",
+        "@webpack-cli/serve": "^1.3.1",
+        "colorette": "^1.2.1",
+        "commander": "^7.0.0",
+        "enquirer": "^2.3.6",
+        "execa": "^5.0.0",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^2.2.0",
+        "rechoir": "^0.7.0",
+        "v8-compile-cache": "^2.2.0",
+        "webpack-merge": "^5.7.3"
       },
       "bin": {
         "webpack-cli": "bin/cli.js"
       },
       "engines": {
-        "node": ">=6.11.5"
+        "node": ">=10.13.0"
       },
       "peerDependencies": {
-        "webpack": "4.x.x"
+        "webpack": "4.x.x || 5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "@webpack-cli/migrate": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
       }
     },
-    "node_modules/webpack-cli/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+    "node_modules/webpack-merge": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
       "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
       },
       "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
       "dev": true,
       "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
     "node_modules/webpack-sources/node_modules/source-map": {
@@ -11380,527 +5903,147 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/cacache": {
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.2.tgz",
+      "integrity": "sha512-OUsT1VZhArN8nY7g6mMlw91HWnXcNXsIQjsQ83WteF4ViZ6YXqF2sWKOTDIZ0H+PPiApQdszLdZIrD7NNlU0Yw==",
       "dev": true
     },
-    "node_modules/webpack/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
+      "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
       "dev": true,
       "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/webpack/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/webpack/node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "node_modules/webpack/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/webpack/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/webpack/node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
       "dev": true,
       "dependencies": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "@types/json-schema": "^7.0.6",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/webpack/node_modules/tapable": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/webpack/node_modules/ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "dependencies": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "node_modules/webpack/node_modules/terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/terser-webpack-plugin": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-      "dev": true,
-      "dependencies": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^4.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "engines": {
-        "node": ">= 6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
     "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
       "bin": {
-        "which": "bin/which"
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/which-module": {
+    "node_modules/wildcard": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
       "dev": true
     },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "dependencies": {
-        "errno": "~0.1.7"
-      }
-    },
     "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "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": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+    "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==",
       "dev": true,
       "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "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==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "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==",
+      "dev": true
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
       "dev": true,
-      "dependencies": {
-        "async-limiter": "~1.0.0"
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/xmlbuilder": {
@@ -11912,183 +6055,62 @@
       }
     },
     "node_modules/xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
       "engines": {
-        "node": ">=0.1"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
+        "node": ">=10.0.0"
       }
     },
     "node_modules/y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
-      "dev": true
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
-      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true,
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs-parser/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "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": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
     "node_modules/yn": {
@@ -12113,27 +6135,6 @@
     }
   },
   "dependencies": {
-    "@angular-devkit/core": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
-      "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
-      "dev": true,
-      "requires": {
-        "ajv": "6.12.3",
-        "fast-json-stable-stringify": "2.1.0",
-        "magic-string": "0.25.7",
-        "rxjs": "6.5.5",
-        "source-map": "0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
     "@babel/code-frame": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
@@ -12144,39 +6145,37 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
-      "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
+      "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz",
-      "integrity": "sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.1.6.tgz",
+      "integrity": "sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helpers": "^7.13.0",
-        "@babel/parser": "^7.13.4",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.1.6",
+        "@babel/helpers": "^7.1.5",
+        "@babel/parser": "^7.1.6",
+        "@babel/template": "^7.1.2",
+        "@babel/traverse": "^7.1.6",
+        "@babel/types": "^7.1.6",
+        "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "semver": "^6.3.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.10",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
         "source-map": "^0.5.0"
       }
     },
     "@babel/generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz",
-      "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==",
+      "version": "7.13.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
+      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.13.0",
@@ -12204,28 +6203,23 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
-      "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz",
+      "integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.13.8",
+        "@babel/compat-data": "^7.13.12",
         "@babel/helper-validator-option": "^7.12.17",
         "browserslist": "^4.14.5",
         "semver": "^6.3.0"
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz",
-      "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
@@ -12238,22 +6232,6 @@
         "regexpu-core": "^4.7.1"
       }
     },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.4.tgz",
-      "integrity": "sha512-K5V2GaQZ1gpB+FTXM4AFVG2p1zzhm67n9wrQCJYNzvuLzQybhJyftW7qeDd2uUxPDNdl5Rkon1rOAeUeNDZ28Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      }
-    },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
@@ -12294,38 +6272,37 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
-      "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.13.0"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+      "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
-      "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+      "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==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
+        "@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/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0",
-        "lodash": "^4.17.19"
+        "@babel/traverse": "^7.13.13",
+        "@babel/types": "^7.13.14"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -12355,24 +6332,24 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
-      "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+      "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==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
+        "@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.0"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
-      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
@@ -12418,9 +6395,9 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
-      "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
+      "integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.12.13",
@@ -12429,9 +6406,9 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
-      "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.12.11",
@@ -12440,9 +6417,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.13.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz",
-      "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
+      "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
@@ -12456,36 +6433,6 @@
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
-      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
-      "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
-      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
@@ -12496,36 +6443,6 @@
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
-      "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
-      "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
-      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
     "@babel/plugin-proposal-object-rest-spread": {
       "version": "7.13.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
@@ -12549,27 +6466,6 @@
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz",
-      "integrity": "sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
-      }
-    },
     "@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
@@ -12589,33 +6485,6 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -12625,33 +6494,6 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
     "@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
@@ -12670,24 +6512,6 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
-      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
     "@babel/plugin-transform-arrow-functions": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
@@ -12816,15 +6640,6 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
-      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
     "@babel/plugin-transform-modules-amd": {
       "version": "7.13.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz",
@@ -12871,15 +6686,6 @@
         "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
-      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
-      }
-    },
     "@babel/plugin-transform-new-target": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
@@ -12908,15 +6714,6 @@
         "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
-      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
     "@babel/plugin-transform-regenerator": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
@@ -12926,15 +6723,6 @@
         "regenerator-transform": "^0.14.2"
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
-      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
     "@babel/plugin-transform-shorthand-properties": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
@@ -12981,15 +6769,6 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
-      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
     "@babel/plugin-transform-unicode-regex": {
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
@@ -13001,98 +6780,58 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.8.tgz",
-      "integrity": "sha512-Sso1xOpV4S3ofnxW2DsWTE5ziRk62jEAKLGuQ+EJHC+YHTbFG38QUTixO3JVa1cYET9gkJhO1pMu+/+2dDhKvw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-option": "^7.12.17",
-        "@babel/plugin-proposal-async-generator-functions": "^7.13.8",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.13.8",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
-        "@babel/plugin-proposal-json-strings": "^7.13.8",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.13",
-        "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.8",
-        "@babel/plugin-proposal-private-methods": "^7.13.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.12.13",
-        "@babel/plugin-transform-arrow-functions": "^7.13.0",
-        "@babel/plugin-transform-async-to-generator": "^7.13.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
-        "@babel/plugin-transform-block-scoping": "^7.12.13",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-computed-properties": "^7.13.0",
-        "@babel/plugin-transform-destructuring": "^7.13.0",
-        "@babel/plugin-transform-dotall-regex": "^7.12.13",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
-        "@babel/plugin-transform-for-of": "^7.13.0",
-        "@babel/plugin-transform-function-name": "^7.12.13",
-        "@babel/plugin-transform-literals": "^7.12.13",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
-        "@babel/plugin-transform-modules-amd": "^7.13.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
-        "@babel/plugin-transform-modules-umd": "^7.13.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
-        "@babel/plugin-transform-new-target": "^7.12.13",
-        "@babel/plugin-transform-object-super": "^7.12.13",
-        "@babel/plugin-transform-parameters": "^7.13.0",
-        "@babel/plugin-transform-property-literals": "^7.12.13",
-        "@babel/plugin-transform-regenerator": "^7.12.13",
-        "@babel/plugin-transform-reserved-words": "^7.12.13",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
-        "@babel/plugin-transform-spread": "^7.13.0",
-        "@babel/plugin-transform-sticky-regex": "^7.12.13",
-        "@babel/plugin-transform-template-literals": "^7.13.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
-        "@babel/plugin-transform-unicode-regex": "^7.12.13",
-        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.13.0",
-        "babel-plugin-polyfill-corejs2": "^0.1.4",
-        "babel-plugin-polyfill-corejs3": "^0.1.3",
-        "babel-plugin-polyfill-regenerator": "^0.1.2",
-        "core-js-compat": "^3.9.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz",
+      "integrity": "sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw==",
       "dev": true,
       "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
+        "@babel/plugin-proposal-async-generator-functions": "^7.1.0",
+        "@babel/plugin-proposal-json-strings": "^7.0.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.0.0",
+        "@babel/plugin-syntax-async-generators": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-transform-arrow-functions": "^7.0.0",
+        "@babel/plugin-transform-async-to-generator": "^7.1.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.0.0",
+        "@babel/plugin-transform-block-scoping": "^7.1.5",
+        "@babel/plugin-transform-classes": "^7.1.0",
+        "@babel/plugin-transform-computed-properties": "^7.0.0",
+        "@babel/plugin-transform-destructuring": "^7.0.0",
+        "@babel/plugin-transform-dotall-regex": "^7.0.0",
+        "@babel/plugin-transform-duplicate-keys": "^7.0.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.1.0",
+        "@babel/plugin-transform-for-of": "^7.0.0",
+        "@babel/plugin-transform-function-name": "^7.1.0",
+        "@babel/plugin-transform-literals": "^7.0.0",
+        "@babel/plugin-transform-modules-amd": "^7.1.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.1.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.0.0",
+        "@babel/plugin-transform-modules-umd": "^7.1.0",
+        "@babel/plugin-transform-new-target": "^7.0.0",
+        "@babel/plugin-transform-object-super": "^7.1.0",
+        "@babel/plugin-transform-parameters": "^7.1.0",
+        "@babel/plugin-transform-regenerator": "^7.0.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+        "@babel/plugin-transform-spread": "^7.0.0",
+        "@babel/plugin-transform-sticky-regex": "^7.0.0",
+        "@babel/plugin-transform-template-literals": "^7.0.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.0.0",
+        "@babel/plugin-transform-unicode-regex": "^7.0.0",
+        "browserslist": "^4.1.0",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.3.0"
       }
     },
     "@babel/runtime": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz",
-      "integrity": "sha512-CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg==",
+      "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
+      "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
@@ -13110,26 +6849,25 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
-      "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
+      "version": "7.13.13",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz",
+      "integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.0",
+        "@babel/generator": "^7.13.9",
         "@babel/helper-function-name": "^7.12.13",
         "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.0",
-        "@babel/types": "^7.13.0",
+        "@babel/parser": "^7.13.13",
+        "@babel/types": "^7.13.13",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
+        "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+      "version": "7.13.14",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz",
+      "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.12.11",
@@ -13137,104 +6875,35 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@nativescript-community/gesturehandler": {
-      "version": "0.1.36",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/gesturehandler/-/gesturehandler-0.1.36.tgz",
-      "integrity": "sha512-UXhiLxL8EurFGcDcnFJghPCfGeDgKtuNqvf9Wpeu9JMNO3hUkuGnzrripgyx89RtY52T77Kaykqtc5Ojgwwlfg==",
-      "requires": {
-        "@nativescript-community/observable": "^2.0.8"
-      }
-    },
-    "@nativescript-community/observable": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/observable/-/observable-2.0.9.tgz",
-      "integrity": "sha512-JsNztvBEdUH7I3+ECnIOOJ39J2sEdeaBSFk4JIkrsFeVGOx1E21SSJNkkQNN9H2BUsF9JgDoQ6rGKl3hmJkXTw=="
+    "@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==",
+      "dev": true
     },
     "@nativescript-community/perms": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nativescript-community/perms/-/perms-2.1.5.tgz",
       "integrity": "sha512-YHYgzeOvYkb6Nj2JAgor8D5YLxYvj0sxr2JfnVrkb7c/Z41lTr0PaoHvhElvK6iERobbGQ1w3HmV9eCHrDgv9g=="
     },
-    "@nativescript-community/text": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/text/-/text-1.4.5.tgz",
-      "integrity": "sha512-fvEe8ThX8VZtJ6sUSpnyYxRBCUp8RRniZL/mySNJfSjQKgj2CoUs+l/8E2AVhHhDFki2NvAUQftH8wZc+fBK6g=="
-    },
     "@nativescript-community/ui-collectionview": {
-      "version": "4.0.24",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.24.tgz",
-      "integrity": "sha512-pCKohI/Vf1g8VoDrhhPr70ojbKontnm1S0aIp0PnfAOGpWchYYbBwKwgSqSQnwamBihGFFmGj5NvnlaSCqFxFw=="
-    },
-    "@nativescript-community/ui-drawer": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-drawer/-/ui-drawer-0.0.22.tgz",
-      "integrity": "sha512-7W8sMyR2N8PnqdFiUlC+6R5C6x8DqwPGZ3YTJGBpjp+5aO5JIqJPD8OmmCugpIzlWrt73vZ2Ap9mu5v/FoBGIg==",
-      "requires": {
-        "@nativescript-community/gesturehandler": "^0.1.35"
-      }
-    },
-    "@nativescript-community/ui-material-activityindicator": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-activityindicator/-/ui-material-activityindicator-5.2.8.tgz",
-      "integrity": "sha512-x4QZNxbktFDSH+CxbujRf+ZRVNftZAEOxG3HMRZ0ZOsEv6d1mGzq4nu72wSznm/SVfNMTSX5VlX0k5Yc1wFbUA==",
-      "requires": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "@nativescript-community/ui-material-button": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-button/-/ui-material-button-5.2.8.tgz",
-      "integrity": "sha512-nmfGMc9GZ24OhukCrzhek78r2T4GWELxL5KrlAuCRL+u5gKxfrpkKEHzoCeahHLSnsNV5gEskpaTAsOK5pMGPg==",
-      "requires": {
-        "@nativescript-community/text": "^1.3.10",
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "@nativescript-community/ui-material-core": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-core/-/ui-material-core-5.2.8.tgz",
-      "integrity": "sha512-HduzWFu7uFPoQObBiItAf2+erla41eHNug9CFhxvWSHzLg7reAx5Ndr3loP6OwreayMHQ9td1gnFix6HWsbG0Q==",
-      "requires": {
-        "@nativescript/hook": "~2.0.0"
-      }
-    },
-    "@nativescript-community/ui-material-floatingactionbutton": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-floatingactionbutton/-/ui-material-floatingactionbutton-5.2.8.tgz",
-      "integrity": "sha512-eq8XSdlbFAUBgCJFS+wYS6V4W/NA/dLQzJqAqWPNIaeFQSIVAZQrNxQsomCJvmB9qjxjekFkuHfpxOzSELwZyQ==",
-      "requires": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "@nativescript-community/ui-material-progress": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-progress/-/ui-material-progress-5.2.8.tgz",
-      "integrity": "sha512-owVzALRbyjsX43SPWr9ILuo1/YBPNOdd/Jm1ItvPEvsdDIC/5Y0LZa2fjtl8wok3MX3x+aQrzA4GlAOP52+C/Q==",
-      "requires": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
-    },
-    "@nativescript-community/ui-material-snackbar": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-snackbar/-/ui-material-snackbar-5.2.8.tgz",
-      "integrity": "sha512-Gj4zZVLotM0lzJeagvn73YLGAOuXe/8vi0QkLW0kNc4JPxEFGSVHWTsUafyGwE0V12ZHYtdkH2X2+ryVIuTDsg==",
-      "requires": {
-        "@nativescript-community/ui-material-core": "^5.2.8"
-      }
+      "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=="
     },
     "@nativescript/android": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-7.0.1.tgz",
-      "integrity": "sha512-VsZCJ5zfZo0+/lFwKz+S7iFb7MA2jgACB7y8dNje3/cnZl+moKPNjFqitoEP0DY4gLz9LJNbFIIaUt84tMdUSQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-8.0.0.tgz",
+      "integrity": "sha512-p7eGwmE2+EvkQ4vt4scIrWqVuXytKv+GiHofrVRME1zUaTNMLSdB9ZyQOukfIvCx09iIufD42wN2a0IkgcDBvw==",
       "dev": true
     },
     "@nativescript/core": {
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-7.0.13.tgz",
-      "integrity": "sha512-mB/MA4H7u0KuB0M4GLX2B0Yhii1r6u1WLhRrH6Yi8ixQNMMyXo8OFRxbXWTGj8TEOVPkljExRyOw24QMLc70AA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.0.tgz",
+      "integrity": "sha512-SgftvD0jE3cKLLB2PV/Pd/aKvJVQqb44502mKgLxg0QayKaQcNNxt6rpnRfck0FLfxmNCS6zKMVbRY8oNy/EQQ==",
       "requires": {
         "@nativescript/hook": "~2.0.0",
-        "css-tree": "^1.0.0-alpha.39",
+        "css-tree": "^1.1.2",
         "reduce-css-calc": "^2.1.7",
         "tslib": "~2.0.0"
       }
@@ -13264,151 +6933,243 @@
       "resolved": "https://registry.npmjs.org/@nativescript/social-share/-/social-share-2.0.4.tgz",
       "integrity": "sha512-fP/lK/wMmHDmWo4Uq8gG/mpsgUjT+/y7Qc+IdCgiqQkgWQtgXTM7H1ecemMYD9dCZo+gZ5UyOXE/E23ZN0DBAg=="
     },
-    "@nativescript/theme": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@nativescript/theme/-/theme-3.0.1.tgz",
-      "integrity": "sha512-5rduFdEjjGyUgK+jaJ/2EHxi+qAgTZuK9XgfxHw0KJAIIWP9HNL8JV8IVUBeIodRPHhSJZJVQT7t+8peH/4dVQ=="
-    },
     "@nativescript/webpack": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-3.0.9.tgz",
-      "integrity": "sha512-PK1aJCgW4niMl6pkDeadqRqx8nZmtfDhMnVmj5FGzY7pt99YcX+m1ixciidUjYXzcsxj9huPOq4moodX2m3JhQ==",
+      "version": "5.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-5.0.0-beta.0.tgz",
+      "integrity": "sha512-dmuCbsGThDe1NNSyInrvbBmeTm6C4qupvFGSZcEqGgwJ9xJBUG92GRZJpCtrMi5J+kWnmh7M2W8pRL20KYUORg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "~10.0.0",
-        "@nativescript/hook": "~2.0.0",
-        "clean-webpack-plugin": "~3.0.0",
-        "copy-webpack-plugin": "~6.0.2",
-        "css": "~3.0.0",
-        "css-loader": "~4.2.0",
-        "escape-string-regexp": "~4.0.0",
-        "fork-ts-checker-webpack-plugin": "~5.0.0",
-        "global-modules-path": "~2.3.0",
-        "loader-utils": "~2.0.0",
-        "minimatch": "~3.0.4",
-        "nativescript-worker-loader": "~0.12.0",
-        "properties-reader": "~2.0.0",
-        "proxy-lib": "0.4.0",
-        "raw-loader": "~4.0.0",
-        "resolve-url-loader": "~3.1.0",
-        "sass-loader": "~9.0.0",
-        "sax": "^1.2.4",
-        "schema-utils": "~2.7.0",
-        "semver": "^7.3.0",
-        "shelljs": "~0.8.4",
-        "tapable": "~1.1.3",
-        "terser": "~5.0.0",
-        "terser-webpack-plugin": "~3.0.6",
-        "ts-loader": "^8.0.2",
-        "webpack": "~4.44.1",
-        "webpack-bundle-analyzer": "~3.8.0",
-        "webpack-cli": "~3.3.12",
-        "webpack-sources": "~1.4.3"
+        "@babel/core": "7.13.14",
+        "@pmmmwh/react-refresh-webpack-plugin": "0.4.3",
+        "babel-loader": "8.2.2",
+        "chalk": "4.1.0",
+        "cli-highlight": "2.1.11",
+        "commander": "7.2.0",
+        "copy-webpack-plugin": "8.1.0",
+        "css": "3.0.0",
+        "css-loader": "5.2.0",
+        "dotenv-webpack": "7.0.2",
+        "fork-ts-checker-webpack-plugin": "6.2.0",
+        "loader-utils": "2.0.0",
+        "lodash.get": "4.4.2",
+        "micromatch": "4.0.2",
+        "postcss": "8.2.8",
+        "postcss-import": "14.0.0",
+        "postcss-loader": "5.2.0",
+        "raw-loader": "4.0.2",
+        "react-refresh": "0.10.0",
+        "sass": "1.32.8",
+        "sass-loader": "11.0.1",
+        "sax": "1.2.4",
+        "source-map": "0.7.3",
+        "terser-webpack-plugin": "5.1.1",
+        "ts-dedent": "2.1.0",
+        "ts-loader": "8.1.0",
+        "vue-loader": "15.9.6",
+        "webpack": "5.28.0",
+        "webpack-bundle-analyzer": "4.4.0",
+        "webpack-chain": "6.5.1",
+        "webpack-cli": "4.6.0",
+        "webpack-merge": "5.7.3",
+        "webpack-virtual-modules": "0.4.2"
       },
       "dependencies": {
-        "css-loader": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz",
-          "integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==",
+        "@babel/core": {
+          "version": "7.13.14",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz",
+          "integrity": "sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==",
           "dev": true,
           "requires": {
-            "camelcase": "^6.0.0",
-            "cssesc": "^3.0.0",
-            "icss-utils": "^4.1.1",
-            "loader-utils": "^2.0.0",
-            "postcss": "^7.0.32",
-            "postcss-modules-extract-imports": "^2.0.0",
-            "postcss-modules-local-by-default": "^3.0.3",
-            "postcss-modules-scope": "^2.2.0",
-            "postcss-modules-values": "^3.0.0",
-            "postcss-value-parser": "^4.1.0",
-            "schema-utils": "^2.7.0",
-            "semver": "^7.3.2"
+            "@babel/code-frame": "^7.12.13",
+            "@babel/generator": "^7.13.9",
+            "@babel/helper-compilation-targets": "^7.13.13",
+            "@babel/helper-module-transforms": "^7.13.14",
+            "@babel/helpers": "^7.13.10",
+            "@babel/parser": "^7.13.13",
+            "@babel/template": "^7.12.13",
+            "@babel/traverse": "^7.13.13",
+            "@babel/types": "^7.13.14",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.2",
+            "json5": "^2.1.2",
+            "semver": "^6.3.0",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
-        "icss-utils": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-          "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+        "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": {
-            "postcss": "^7.0.14"
+            "color-convert": "^2.0.1"
           }
         },
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+        "babel-loader": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+          "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "find-cache-dir": "^3.3.1",
+            "loader-utils": "^1.4.0",
+            "make-dir": "^3.1.0",
+            "schema-utils": "^2.6.5"
+          },
+          "dependencies": {
+            "json5": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+              "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.0"
+              }
+            },
+            "loader-utils": {
+              "version": "1.4.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+              "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+              "dev": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^1.0.1"
+              }
+            }
           }
         },
-        "postcss-modules-extract-imports": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-          "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+        "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": {
-            "postcss": "^7.0.5"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "postcss-modules-local-by-default": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
-          "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
+        "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": {
-            "icss-utils": "^4.1.1",
-            "postcss": "^7.0.32",
-            "postcss-selector-parser": "^6.0.2",
-            "postcss-value-parser": "^4.1.0"
+            "color-name": "~1.1.4"
           }
         },
-        "postcss-modules-scope": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
-          "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+        "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
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
-            "postcss": "^7.0.6",
-            "postcss-selector-parser": "^6.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
           }
         },
-        "postcss-modules-values": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-          "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
           "dev": true,
           "requires": {
-            "icss-utils": "^4.0.0",
-            "postcss": "^7.0.6"
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "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
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
           }
         },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         },
         "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         },
         "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "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"
           }
         }
       }
@@ -13444,120 +7205,17 @@
         "fastq": "^1.6.0"
       }
     },
-    "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+    "@pmmmwh/react-refresh-webpack-plugin": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz",
+      "integrity": "sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==",
       "dev": true,
       "requires": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "@nstudio/nativescript-checkbox": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nstudio/nativescript-checkbox/-/nativescript-checkbox-2.0.4.tgz",
-      "integrity": "sha512-ypIGAHxDE/2o3CzYohSdypdhiw4GjMcZ3H/qtF4z97HMcMqj+g5bYPDC9cRH97qgAez8jf/z3UX5OzOtnrNxug=="
-    },
-    "@types/anymatch": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
-      "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
-      "dev": true,
-      "requires": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
-      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
-      "dev": true
-    },
-    "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "14.14.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz",
-      "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==",
-      "dev": true
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "@types/tapable": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
-      "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==",
-      "dev": true
-    },
-    "@types/uglify-js": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.12.0.tgz",
-      "integrity": "sha512-sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@types/webpack": {
-      "version": "4.41.26",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz",
-      "integrity": "sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==",
-      "dev": true,
-      "requires": {
-        "@types/anymatch": "*",
-        "@types/node": "*",
-        "@types/tapable": "*",
-        "@types/uglify-js": "*",
-        "@types/webpack-sources": "*",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "@types/webpack-sources": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz",
-      "integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
+        "ansi-html": "^0.0.7",
+        "error-stack-parser": "^2.0.6",
+        "html-entities": "^1.2.1",
+        "native-url": "^0.2.6",
+        "schema-utils": "^2.6.5",
         "source-map": "^0.7.3"
       },
       "dependencies": {
@@ -13569,6 +7227,66 @@
         }
       }
     },
+    "@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==",
+      "dev": 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.2",
+      "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-couchbase/-/nativescript-couchbase-1.2.2.tgz",
+      "integrity": "sha512-ZnDVDFDR9oHu16KiQszjzFbEl3wWyFrKuTGoYmR7J5K2yIUsMD9UdvwXelZyXN45Hw7d595JrhgXJZNJpuvHXw=="
+    },
+    "@types/eslint": {
+      "version": "7.2.8",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.8.tgz",
+      "integrity": "sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "@types/eslint-scope": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
+      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "dev": true,
+      "requires": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "@types/estree": {
+      "version": "0.0.46",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz",
+      "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==",
+      "dev": true
+    },
+    "@types/json-schema": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "14.14.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
+      "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
+      "dev": true
+    },
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
     "@vue/component-compiler-utils": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz",
@@ -13586,16 +7304,6 @@
         "vue-template-es2015-compiler": "^1.9.0"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
         "postcss": {
           "version": "7.0.35",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -13621,190 +7329,176 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
         }
       }
     },
     "@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
+      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
+        "@webassemblyjs/helper-numbers": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
+      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
+      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
       "dev": true
     },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
+      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0"
+        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
+      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
+      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
+      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
+      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
+      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
+      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/helper-wasm-section": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-opt": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "@webassemblyjs/wast-printer": "1.11.0"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
+      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
+      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
+      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
+      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
+        "@webassemblyjs/ast": "1.11.0",
         "@xtuc/long": "4.2.2"
       }
     },
+    "@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
+    },
+    "@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==",
+      "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
+    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -13817,58 +7511,22 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
     "acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
+      "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
       "dev": true
     },
     "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.2.tgz",
+      "integrity": "sha512-+bpA9MJsHdZ4bgfDcpk0ozQyhhVct7rzOmO0s1IIr0AGGgKBljss8n2zp11rRP2wid5VGeh04CgeKzgat5/25A==",
       "dev": true
     },
-    "adjust-sourcemap-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz",
-      "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
-      }
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
     "ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -13877,30 +7535,28 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true,
-      "requires": {}
-    },
     "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
     },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
       "dev": true
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true
     },
     "ansi-styles": {
@@ -13912,185 +7568,33 @@
         "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
+    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
     "arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
-    "arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
-      "dev": true
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true,
-      "optional": true
-    },
-    "async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
     "at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -14103,28 +7607,16 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-      "dev": true
-    },
     "babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
       },
       "dependencies": {
         "json5": {
@@ -14146,6 +7638,15 @@
             "emojis-list": "^3.0.0",
             "json5": "^1.0.1"
           }
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         }
       }
     },
@@ -14158,93 +7659,16 @@
         "object.assign": "^4.1.0"
       }
     },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.8.tgz",
-      "integrity": "sha512-kB5/xNR9GYDuRmVlL9EGfdKBSUVI/9xAU7PCahA/1hbC2Jbmks9dlBBYjHF9IHMNY2jV/G2lIG7z0tJIW27Rog==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.0",
-        "@babel/helper-define-polyfill-provider": "^0.1.4",
-        "semver": "^6.1.1"
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.6.tgz",
-      "integrity": "sha512-IkYhCxPrjrUWigEmkMDXYzM5iblzKCdCD8cZrSAkQOyhhJm26DcG+Mxbx13QT//Olkpkg/AlRdT2L+Ww4Ciphw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.1.4",
-        "core-js-compat": "^3.8.1"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.5.tgz",
-      "integrity": "sha512-EyhBA6uN94W97lR7ecQVTvH9F5tIIdEw3ZqHuU4zekMlW82k5cXNXniiB7PRxQm06BqAjVr4sDT1mOy4RcphIA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.1.4"
-      }
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        }
-      }
-    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      }
-    },
     "big-integer": {
       "version": "1.6.48",
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
@@ -14260,27 +7684,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "optional": true
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.0"
-      }
+      "dev": true
     },
     "bluebird": {
       "version": "3.7.2",
@@ -14288,53 +7692,6 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
-    "bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
     "bplist-creator": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
@@ -14369,104 +7726,6 @@
         "fill-range": "^7.0.1"
       }
     },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
     "browserslist": {
       "version": "4.16.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
@@ -14480,82 +7739,11 @@
         "node-releases": "^1.1.70"
       }
     },
-    "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true
-    },
-    "cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
-      "dev": true,
-      "requires": {
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -14578,34 +7766,10 @@
       "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
       "dev": true
     },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true
-        }
-      }
-    },
     "caniuse-lite": {
-      "version": "1.0.30001192",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001192.tgz",
-      "integrity": "sha512-63OrUnwJj5T1rUmoyqYTdRWBqFFxZFlyZnRRjDR8NSUQFB6A+j/uBORU/SyJ5WzDLg4SPiZH40hQCBNdZ/jmAw==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "version": "1.0.30001205",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz",
+      "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==",
       "dev": true
     },
     "chalk": {
@@ -14617,28 +7781,13 @@
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
         "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
-    "check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
-      "dev": true
-    },
     "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,
-      "optional": true,
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -14650,12 +7799,6 @@
         "readdirp": "~3.5.0"
       }
     },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
-    },
     "chrome-trace-event": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
@@ -14673,171 +7816,91 @@
         }
       }
     },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+    "cli-highlight": {
+      "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": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "chalk": "^4.0.0",
+        "highlight.js": "^10.7.1",
+        "mz": "^2.4.0",
+        "parse5": "^5.1.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.0",
+        "yargs": "^16.0.0"
       },
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+        "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": {
-            "is-descriptor": "^0.1.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+        "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": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+        "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": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "color-name": "~1.1.4"
           }
         },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+        "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
+        },
+        "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"
+          }
         }
       }
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "clean-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
-      "dev": true,
-      "requires": {
-        "@types/webpack": "^4.4.31",
-        "del": "^4.1.1"
-      }
-    },
     "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "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": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+    "clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       }
     },
     "color-convert": {
@@ -14861,19 +7924,10 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
     "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true
     },
     "commondir": {
@@ -14882,50 +7936,11 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "dev": true,
-      "requires": {
-        "arity-n": "^1.0.4"
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
-    },
     "consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
@@ -14935,27 +7950,6 @@
         "bluebird": "^3.1.1"
       }
     },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
     "convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
@@ -14965,92 +7959,31 @@
         "safe-buffer": "~5.1.1"
       }
     },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
     "copy-webpack-plugin": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz",
-      "integrity": "sha512-zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.1.0.tgz",
+      "integrity": "sha512-Soiq8kXI2AZkpw3dSp18u6oU2JonC7UKv3UdXsKOmT1A5QT46ku9+6c0Qy29JDbSavQJNN1/eKGpd3QNw+cZWg==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
-        "fast-glob": "^3.2.4",
-        "find-cache-dir": "^3.3.1",
+        "fast-glob": "^3.2.5",
         "glob-parent": "^5.1.1",
-        "globby": "^11.0.1",
-        "loader-utils": "^2.0.0",
+        "globby": "^11.0.3",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^2.7.0",
-        "serialize-javascript": "^4.0.0",
-        "webpack-sources": "^1.4.3"
-      }
-    },
-    "core-js-compat": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.0.tgz",
-      "integrity": "sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.16.3",
-        "semver": "7.0.0"
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
         }
       }
     },
@@ -15073,101 +8006,20 @@
         "yaml": "^1.7.2"
       }
     },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
     "cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        }
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
     "css": {
@@ -15190,17 +8042,16 @@
       }
     },
     "css-loader": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.1.0.tgz",
-      "integrity": "sha512-mFs3Xe2UrzRzL0+ML6e7Q2e/Ozp/WpDcam0l1X+rXgkuFjjsNSrjiyimG6malUOZGVuEjzKp1NqEqN3exG7ZqQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.0.tgz",
+      "integrity": "sha512-MfRo2MjEeLXMlUkeUwN71Vx5oc6EJnx5UQ4Yi9iUtYQvrPtwLUucYptz0hc6n++kdNcyF5olYBS4vPjJDAcLkw==",
       "dev": true,
-      "peer": true,
       "requires": {
         "camelcase": "^6.2.0",
         "cssesc": "^3.0.0",
         "icss-utils": "^5.1.0",
         "loader-utils": "^2.0.0",
-        "postcss": "^8.2.6",
+        "postcss": "^8.2.8",
         "postcss-modules-extract-imports": "^3.0.0",
         "postcss-modules-local-by-default": "^4.0.0",
         "postcss-modules-scope": "^3.0.0",
@@ -15210,17 +8061,13 @@
         "semver": "^7.3.4"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "yallist": "^4.0.0"
           }
         },
         "schema-utils": {
@@ -15228,7 +8075,6 @@
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
           "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
           "dev": true,
-          "peer": true,
           "requires": {
             "@types/json-schema": "^7.0.6",
             "ajv": "^6.12.5",
@@ -15236,21 +8082,26 @@
           }
         },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
-          "peer": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
     "css-tree": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
-      "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "requires": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -15274,40 +8125,6 @@
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
-    "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -15323,12 +8140,6 @@
         "ms": "2.1.2"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -15350,142 +8161,11 @@
         "object-keys": "^1.0.12"
       }
     },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      }
-    },
-    "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "dependencies": {
-        "array-union": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-          "dev": true,
-          "requires": {
-            "array-uniq": "^1.0.1"
-          }
-        },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
-            }
-          }
-        },
-        "p-map": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
     "diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
     },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -15495,85 +8175,46 @@
         "path-type": "^4.0.0"
       }
     },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
       "dev": true
     },
+    "dotenv-defaults": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.1.tgz",
+      "integrity": "sha512-ugFCyBF7ILuwpmznduHPQZBMucHHJ8T4OBManTEVjemxCm2+nqifSuW2lD2SNKdiKSH1E324kZSdJ8M04b4I/A==",
+      "dev": true,
+      "requires": {
+        "dotenv": "^8.2.0"
+      }
+    },
+    "dotenv-webpack": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-7.0.2.tgz",
+      "integrity": "sha512-RY+/5uM/XY4bGtih9f9ic8hlrUDxVcZZBPWlnX/aHhaKxcVVX9SH/5VH7CSmvVo9GL6PKvQOA0X1bc552rnatQ==",
+      "dev": true,
+      "requires": {
+        "dotenv-defaults": "^2.0.1"
+      }
+    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true
-    },
     "electron-to-chromium": {
-      "version": "1.3.675",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.675.tgz",
-      "integrity": "sha512-GEQw+6dNWjueXGkGfjgm7dAMtXfEqrfDG3uWcZdeaD4cZ3dKYdPRQVruVXQRXtPLtOr5GNVVlNLRMChOZ611pQ==",
+      "version": "1.3.704",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.704.tgz",
+      "integrity": "sha512-6cz0jvawlUe4h5AbfQWxPzb+8LzVyswGAWiGc32EJEmfj39HTQyNPkLXirc7+L4x5I6RgRkzua8Ryu5QZqc8cA==",
       "dev": true
     },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "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
     },
     "emojis-list": {
@@ -15582,21 +8223,6 @@
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
     "enhanced-resolve": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
@@ -15608,6 +8234,21 @@
         "tapable": "^1.0.0"
       }
     },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "envinfo": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.4.tgz",
+      "integrity": "sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -15626,37 +8267,20 @@
         "is-arrayish": "^0.2.1"
       }
     },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+    "error-stack-parser": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
+      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
+        "stackframe": "^1.1.1"
       }
     },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
+    "es-module-lexer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
+      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+      "dev": true
     },
     "escalade": {
       "version": "3.1.1",
@@ -15664,25 +8288,19 @@
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
     "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "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
     },
     "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       }
     },
@@ -15709,298 +8327,29 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
     "events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+    "execa": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
+      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       }
     },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.3.0.tgz",
-          "integrity": "sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -16027,6 +8376,12 @@
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
     "fastq": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -16036,25 +8391,6 @@
         "reusify": "^1.0.4"
       }
     },
-    "figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-      "dev": true
-    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -16064,213 +8400,36 @@
         "to-regex-range": "^5.0.1"
       }
     },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
     "find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
       }
     },
     "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "findup-sync": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "locate-path": "^3.0.0"
       }
     },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
     "fork-ts-checker-webpack-plugin": {
-      "version": "5.0.14",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.14.tgz",
-      "integrity": "sha512-iwRdjgZx1Ll0DAMhmtOF4ffoICpiUxOqOHLrbIHmeCtZiwCrL/qscm+EXOJyzj3a9X8hLRLDEHy9FOyD6Gm42g==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.0.tgz",
+      "integrity": "sha512-DTNbOhq6lRdjYprukX54JMeYJgQ0zMow+R5BMLwWxEX2NAXthIkwnV8DBmsWjwNLSUItKZM4TCCJbtgrtKBu2Q==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
         "@types/json-schema": "^7.0.5",
         "chalk": "^4.1.0",
+        "chokidar": "^3.4.2",
         "cosmiconfig": "^6.0.0",
         "deepmerge": "^4.2.2",
         "fs-extra": "^9.0.0",
@@ -16321,6 +8480,15 @@
           "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",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "schema-utils": {
           "version": "2.7.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
@@ -16333,9 +8501,9 @@
           }
         },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -16349,51 +8517,15 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
     "fs-extra": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -16406,33 +8538,12 @@
         "universalify": "^2.0.0"
       }
     },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "fs-monkey": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.1.tgz",
       "integrity": "sha512-fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA==",
       "dev": true
     },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -16445,69 +8556,12 @@
       "dev": true,
       "optional": true
     },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "requires": {
-        "globule": "^1.0.0"
-      }
-    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -16531,27 +8585,12 @@
         "has-symbols": "^1.0.1"
       }
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+    "get-stream": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
+      "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
       "dev": true
     },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -16566,40 +8605,20 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
     },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^3.0.0"
-      }
-    },
-    "global-modules-path": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.1.tgz",
-      "integrity": "sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==",
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "requires": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      }
-    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -16607,9 +8626,9 @@
       "dev": true
     },
     "globby": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
-      "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
+      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
       "dev": true,
       "requires": {
         "array-union": "^2.1.0",
@@ -16620,17 +8639,6 @@
         "slash": "^3.0.0"
       }
     },
-    "globule": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-      "dev": true,
-      "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
-      }
-    },
     "graceful-fs": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -16638,29 +8646,12 @@
       "dev": true
     },
     "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
       "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
+        "duplexer": "^0.1.2"
       }
     },
     "has": {
@@ -16672,15 +8663,6 @@
         "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=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -16693,213 +8675,40 @@
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "hash-sum": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
       "dev": true
     },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+    "highlight.js": {
+      "version": "10.7.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.1.tgz",
+      "integrity": "sha512-S6G97tHGqJ/U8DsXcEdnACbirtbx58Bx9CzIVeYli8OuswCfYI/LsXH2EiGcoGio1KAC3x4mmUwulOllJ2ZyRA==",
       "dev": true
     },
-    "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+    "html-entities": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
       "dev": true
     },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+    "human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true
     },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
     "icss-utils": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "peer": true,
-      "requires": {}
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
       "dev": true
     },
     "ignore": {
@@ -16919,32 +8728,32 @@
       }
     },
     "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
       },
       "dependencies": {
         "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
           }
         },
         "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "^4.1.0"
           }
         },
         "p-limit": {
@@ -16957,61 +8766,37 @@
           }
         },
         "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "^2.2.0"
           }
         },
         "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
         "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "^4.0.0"
           }
         }
       }
     },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "in-publish": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
-      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
     "indexes-of": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
       "dev": true
     },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -17026,31 +8811,19 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
     "interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
       "dev": true
     },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.0"
+        "loose-envify": "^1.0.0"
       }
     },
     "is-arrayish": {
@@ -17064,17 +8837,10 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
     },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
     "is-core-module": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
@@ -17084,55 +8850,17 @@
         "has": "^1.0.3"
       }
     },
-    "is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-      }
-    },
-    "is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      }
-    },
-    "is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4"
-      }
-    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true
-    },
     "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "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
     },
     "is-glob": {
       "version": "4.0.1",
@@ -17149,30 +8877,6 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^2.1.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.2"
-      }
-    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -17182,28 +8886,10 @@
         "isobject": "^3.0.1"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+    "is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
       "dev": true
     },
     "isarray": {
@@ -17224,10 +8910,10 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+    "javascript-stringify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz",
+      "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==",
       "dev": true
     },
     "jest-worker": {
@@ -17258,10 +8944,10 @@
         }
       }
     },
-    "js-base64": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
-      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
+    "js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
       "dev": true
     },
     "js-tokens": {
@@ -17270,12 +8956,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -17294,24 +8974,12 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "json5": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
@@ -17331,18 +8999,6 @@
         "universalify": "^2.0.0"
       }
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -17350,9 +9006,9 @@
       "dev": true
     },
     "klona": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-1.1.2.tgz",
-      "integrity": "sha512-xf88rTeHiXk+XE2Vhi6yj8Wm3gMZrygGdKjJqN8HkV+PwF/t50/LdAKHoHpPcxFAlmQszTZ1CugrK25S7qDRLA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
       "dev": true
     },
     "lines-and-columns": {
@@ -17361,40 +9017,10 @@
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
       "dev": true
     },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
     "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
       "dev": true
     },
     "loader-utils": {
@@ -17409,12 +9035,13 @@
       }
     },
     "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dev": true,
       "requires": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       }
     },
     "lodash": {
@@ -17423,47 +9050,39 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
       "dev": true
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "magic-string": {
-      "version": "0.25.7",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-      "dev": true,
-      "requires": {
-        "sourcemap-codec": "^1.4.4"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "requires": {
-        "semver": "^6.0.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       }
     },
     "make-error": {
@@ -17471,53 +9090,15 @@
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
     "memfs": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.0.tgz",
-      "integrity": "sha512-f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.1.tgz",
+      "integrity": "sha512-Y5vcpQzWTime4fBTr/fEnxXUxEYUgKbDlty1WX0gaa4ae14I6KmvK1S8HtXOX0elKAE6ENZJctkGtbTFYcRIUw==",
       "dev": true,
       "requires": {
         "fs-monkey": "1.0.1"
@@ -17533,30 +9114,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
     "merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
@@ -17586,12 +9143,6 @@
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
     "micromatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -17602,28 +9153,10 @@
         "picomatch": "^2.0.5"
       }
     },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
       "dev": true
     },
     "mime-db": {
@@ -17641,16 +9174,10 @@
         "mime-db": "1.46.0"
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
     "minimatch": {
@@ -17664,207 +9191,44 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      }
-    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      }
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "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
     },
-    "nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "dev": true
-    },
-    "nanoid": {
-      "version": "3.1.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
-      "dev": true,
-      "peer": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "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": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
       }
     },
-    "nativescript-accelerometer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-accelerometer/-/nativescript-accelerometer-3.0.0.tgz",
-      "integrity": "sha512-2sEfxTzzeXae6sDvW2dymgsNb8Z6qgNQOCUKJz+G8GI00w807R+EK9+zOwQcaW6jne741D0laAwzTW+ofg9HqA==",
-      "requires": {}
+    "nanoid": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
+      "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
+      "dev": true
     },
-    "nativescript-couchbase-plugin": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/nativescript-couchbase-plugin/-/nativescript-couchbase-plugin-0.9.6.tgz",
-      "integrity": "sha512-kMA9KHQX82TFaGnGUhY94KLOLss4pb5QmghgoEdu1sLwd94I/f1MQ+kHWbuBOdFmdQJw5oCK+Sey+A22Nd5jgA=="
-    },
-    "nativescript-feedback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-feedback/-/nativescript-feedback-2.0.0.tgz",
-      "integrity": "sha512-6ZE/g+s1xxez3pMRJa/r0f144VuyapgDjbo8D37nMC4F0WDQLKk8dC0405czhQxD2djVq3GEMfM/n0cuMbY53A=="
-    },
-    "nativescript-hook": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/nativescript-hook/-/nativescript-hook-0.2.5.tgz",
-      "integrity": "sha512-ciGJtNbtMB2lGv8jAkUripkRjd3g8atX9VYPSt6e8PI6YPiOKeoma3xjcXoW66pFMYpHnfrbp6Mq9U/QtiQrVg==",
-      "peer": true,
+    "native-url": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz",
+      "integrity": "sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==",
+      "dev": true,
       "requires": {
-        "glob": "^6.0.1",
-        "mkdirp": "^0.5.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "6.0.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "peer": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "peer": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
+        "querystring": "^0.2.0"
       }
     },
     "nativescript-imagecropper": {
@@ -17880,396 +9244,60 @@
       "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-4.0.2.tgz",
       "integrity": "sha512-a8VGIFhLYCMtdTuZpiE2d9NcxLkkHGYt2EeG37aRTG4TjlMrUhV0IxfoTzj9zDGk1p1xAPSIo6yGPb2Z9hay2A=="
     },
-    "nativescript-permissions": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/nativescript-permissions/-/nativescript-permissions-1.3.11.tgz",
-      "integrity": "sha512-4ox9WpVJPLfepPauqECvPfbxVE1hVPVVBLZxOs3d9+2Yrr0mSkJO7D7BQ4OUS90hHfRdPhf70aJKWxzJoqi63g=="
-    },
-    "nativescript-plugin-filepicker": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-plugin-filepicker/-/nativescript-plugin-filepicker-1.0.0.tgz",
-      "integrity": "sha512-BOf7ycOQJGcg7ayzfbyFooMjngQgBAg6HAaws4fKQBRnI39aw7VVqXruuHSCDPqLW681/7GuECwWxknmAalOnQ==",
-      "requires": {
-        "nativescript-permissions": "~1.3.0"
-      }
-    },
-    "nativescript-toast": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-toast/-/nativescript-toast-2.0.0.tgz",
-      "integrity": "sha512-xqyNfFS894oGfrEVO7CjpioAQLiLNNcd77Euq9XIUTf1U3W0PsIgAJbLP7+kkVGIJxdLtlBkbcQ4wDmf2DCi1w==",
-      "requires": {}
-    },
-    "nativescript-vibrate": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/nativescript-vibrate/-/nativescript-vibrate-4.0.1.tgz",
-      "integrity": "sha512-T9VspAu+pgYM/AWLradA4HPv/tdfx8jrhIOD02PZs09KhJyjQE3BoubnHcmg0neeQAhgxHiuXGdit8QOAyKaBA=="
-    },
     "nativescript-vue": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.8.3.tgz",
-      "integrity": "sha512-2F3Jv0Y1gzATjcVnFn7RaJm9QDAINOJNtQ4Wh0B3lGiC5qsmQy91IjF2wxVOzGk5QNA2v4shSG+Emco53n0+6w=="
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.8.4.tgz",
+      "integrity": "sha512-AA8Au1TUPtZX5L5JVH64QCzo7eeePViUzKHMTKwba4IYZX1Lm8Sspm4CN9wYzio8UAFylydqxhnOCdnwlxh8Ow=="
     },
     "nativescript-vue-template-compiler": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.8.3.tgz",
-      "integrity": "sha512-xePEXKdQ1nLJbj4LF3VEyluz6SOL0dSonNb3gKGJ7nfGEgBywm8nUZdwmwGcy2/1JL4CWtRs9f9wz431McXBTg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.8.4.tgz",
+      "integrity": "sha512-WAYmVMYyHj4WBkcb3wjR9EjiQHz7zzcVTQJnyOcKJIm7yR1Tiskx+G2OxBd+7Id5zYxqC5Et+GojfO1CbRLUxA==",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"
       }
     },
-    "nativescript-worker-loader": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/nativescript-worker-loader/-/nativescript-worker-loader-0.12.1.tgz",
-      "integrity": "sha512-phzXAmeqcPBHTlRTFKkbjVjpnisdXQM2VqIl4y/gfMHKG2y78bJNLQPTzsPSENK9V075FIS8nSs1WcrDav8yag==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.7.0"
-      }
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true
-    },
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "dev": true,
-      "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
-        },
-        "tar": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-          "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-          "dev": true,
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.12",
-            "inherits": "2"
-          }
-        }
-      }
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "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==",
       "dev": true
     },
-    "node-sass": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
-      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
-      "dev": true,
-      "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash": "^4.17.15",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "2.2.5",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": 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"
-          }
-        },
-        "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
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "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
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+    "npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "path-key": "^3.0.0"
       }
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
     "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
     },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
     "object.assign": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
@@ -18282,24 +9310,6 @@
         "object-keys": "^1.1.1"
       }
     },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -18308,40 +9318,21 @@
         "wrappy": "1"
       }
     },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
     "opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
       "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true
     },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -18352,12 +9343,12 @@
       }
     },
     "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
       "requires": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^2.0.0"
       },
       "dependencies": {
         "p-limit": {
@@ -18371,38 +9362,12 @@
         }
       }
     },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "requires": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -18412,19 +9377,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -18437,41 +9389,33 @@
         "lines-and-columns": "^1.1.6"
       }
     },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+    "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
     },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+    "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,
-      "optional": true
+      "requires": {
+        "parse5": "^6.0.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
+        }
+      }
     },
     "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true
     },
     "path-is-absolute": {
@@ -18479,16 +9423,10 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
     "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true
     },
     "path-parse": {
@@ -18497,37 +9435,12 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
-    "pbkdf2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -18540,54 +9453,32 @@
       "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
     "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "requires": {
-        "find-up": "^4.0.0"
+        "find-up": "^3.0.0"
       }
     },
     "plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
       "requires": {
-        "base64-js": "^1.2.3",
+        "base64-js": "^1.5.1",
         "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "xmldom": "^0.5.0"
       }
     },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
     "postcss": {
-      "version": "8.2.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.6.tgz",
-      "integrity": "sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg==",
+      "version": "8.2.8",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz",
+      "integrity": "sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "colorette": "^1.2.1",
+        "colorette": "^1.2.2",
         "nanoid": "^3.1.20",
         "source-map": "^0.6.1"
       },
@@ -18596,8 +9487,68 @@
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-import": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
+      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      }
+    },
+    "postcss-loader": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.2.0.tgz",
+      "integrity": "sha512-uSuCkENFeUaOYsKrXm0eNNgVIxc71z8RcckLMbVw473rGojFnrUeqEz6zBgXsH2q1EIzXnO/4pEz9RhALjlITA==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "semver": "^7.3.4"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
           "dev": true,
-          "peer": true
+          "requires": {
+            "@types/parse-json": "^4.0.0",
+            "import-fresh": "^3.2.1",
+            "parse-json": "^5.0.0",
+            "path-type": "^4.0.0",
+            "yaml": "^1.10.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
@@ -18605,16 +9556,13 @@
       "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,
-      "peer": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
       "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "icss-utils": "^5.0.0",
         "postcss-selector-parser": "^6.0.2",
@@ -18626,7 +9574,6 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
       "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "postcss-selector-parser": "^6.0.4"
       }
@@ -18636,7 +9583,6 @@
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "icss-utils": "^5.0.0"
       }
@@ -18666,75 +9612,12 @@
       "dev": true,
       "optional": true
     },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "properties-reader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/properties-reader/-/properties-reader-2.0.0.tgz",
-      "integrity": "sha512-wEvznelF2vGq52VA51j8ZNoUZOeCJQd2kh5CGHLOhdLKKN176ZAdYv+WH6s6tj7IOBLFRkWhMPQjq8uzyFe37Q==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "~0.5.1"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-      "dev": true,
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "proxy-lib": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/proxy-lib/-/proxy-lib-0.4.0.tgz",
-      "integrity": "sha512-oUDDpf0NTtKPyXjBNUcKzwZhA9GjEdu8Z47GsxGv5rZvKyCqsSrHurJtlL1yp7uVzA2NOmxd4aX7qmB1ZOdCwQ==",
-      "dev": true,
-      "requires": {
-        "osenv": "0.1.4"
-      },
-      "dependencies": {
-        "osenv": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-          "dev": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        }
-      }
-    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -18747,95 +9630,22 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
       "dev": true
     },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
     "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
       "dev": true
     },
     "queue-microtask": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz",
-      "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "randombytes": {
@@ -18847,34 +9657,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
     "raw-loader": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
@@ -18885,18 +9667,6 @@
         "schema-utils": "^3.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "schema-utils": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
@@ -18910,28 +9680,21 @@
         }
       }
     },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+    "react-refresh": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",
+      "integrity": "sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ==",
+      "dev": true
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "pify": "^2.3.0"
       },
       "dependencies": {
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -18940,37 +9703,6 @@
         }
       }
     },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        }
-      }
-    },
     "readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -18991,39 +9723,17 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
-      "optional": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
     },
     "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
+      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "dependencies": {
-        "indent-string": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-          "dev": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        }
+        "resolve": "^1.9.0"
       }
     },
     "reduce-css-calc": {
@@ -19072,22 +9782,6 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
-      "dev": true
-    },
     "regexpu-core": {
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
@@ -19109,9 +9803,9 @@
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
-      "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -19125,74 +9819,12 @@
         }
       }
     },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true,
-      "optional": true
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      }
-    },
     "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
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "resolve": {
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
@@ -19204,234 +9836,34 @@
       }
     },
     "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "^5.0.0"
       },
       "dependencies": {
         "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
           "dev": true
         }
       }
     },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "dependencies": {
-        "global-modules": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-          "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-          "dev": true,
-          "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
-          }
-        },
-        "global-prefix": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-          "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-          "dev": true,
-          "requires": {
-            "expand-tilde": "^2.0.2",
-            "homedir-polyfill": "^1.0.1",
-            "ini": "^1.3.4",
-            "is-windows": "^1.0.1",
-            "which": "^1.2.14"
-          }
-        }
-      }
-    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "resolve-url-loader": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
-      "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
-      "dev": true,
-      "requires": {
-        "adjust-sourcemap-loader": "3.0.0",
-        "camelcase": "5.3.1",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.7.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
-        "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "postcss": {
-          "version": "7.0.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-          "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true
     },
-    "rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-          "dev": true
-        },
-        "css": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-          "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "source-map": "^0.6.1",
-            "source-map-resolve": "^0.5.2",
-            "urix": "^0.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-resolve": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0",
-            "resolve-url": "^0.2.1",
-            "source-map-url": "^0.4.0",
-            "urix": "^0.1.0"
-          }
-        }
-      }
-    },
-    "rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
     "run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -19441,87 +9873,29 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
     "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
     },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+    "sass": {
+      "version": "1.32.8",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
+      "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
       "dev": true,
       "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sass-graph": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
-      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^13.3.2"
+        "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-loader": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-9.0.3.tgz",
-      "integrity": "sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-11.0.1.tgz",
+      "integrity": "sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw==",
       "dev": true,
       "requires": {
-        "klona": "^1.1.2",
-        "loader-utils": "^2.0.0",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^2.7.0",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
       }
     },
     "sax": {
@@ -19539,198 +9913,47 @@
         "@types/json-schema": "^7.0.5",
         "ajv": "^6.12.4",
         "ajv-keywords": "^3.5.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        }
-      }
-    },
-    "scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "dev": true,
-      "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
       }
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-    },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            }
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
-      }
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
     },
     "serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
       }
     },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "kind-of": "^6.0.2"
       }
     },
     "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       }
     },
     "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      }
-    },
     "shorthash": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/shorthash/-/shorthash-0.0.2.tgz",
@@ -19752,181 +9975,23 @@
         "plist": "^3.0.1"
       }
     },
+    "sirv": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
+      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
+      "dev": true,
+      "requires": {
+        "@polka/url": "^1.0.0-next.9",
+        "mime": "^2.3.1",
+        "totalist": "^1.0.0"
+      }
+    },
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "source-map-resolve": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-          "dev": true,
-          "requires": {
-            "atob": "^2.1.2",
-            "decode-uri-component": "^0.2.0",
-            "resolve-url": "^0.2.1",
-            "source-map-url": "^0.4.0",
-            "urix": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -19965,227 +10030,22 @@
         }
       }
     },
-    "source-map-url": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
-      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
-      "dev": true
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
-      "dev": true
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
     "sprintf-js": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.1.1"
-      }
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+    "stackframe": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz",
+      "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==",
       "dev": true
     },
-    "stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
     "stream-buffers": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
       "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ="
     },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -20196,42 +10056,30 @@
       }
     },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.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=",
+      "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": "^2.0.0"
+        "ansi-regex": "^5.0.0"
       }
     },
-    "strip-bom": {
+    "strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
     },
     "supports-color": {
       "version": "5.5.0",
@@ -20248,175 +10096,88 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
-    "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
-      "dev": true,
-      "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      }
-    },
     "terser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.0.0.tgz",
-      "integrity": "sha512-olH2DwGINoSuEpSGd+BsPuAQaA3OrHnHnFL/rDB2TVNc3srUbz/rq/j2BlF4zDXI+JqAvGr86bIm1R2cJgZ3FA==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
+      "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        },
         "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.8.tgz",
-      "integrity": "sha512-ygwK8TYMRTYtSyLB2Mhnt90guQh989CIq/mL/2apwi6rA15Xys4ydNUiH4ah6EZCfQxSk26ZFQilZ4IQ6IZw6A==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz",
+      "integrity": "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.1.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^2.6.6",
-        "serialize-javascript": "^4.0.0",
+        "jest-worker": "^26.6.2",
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
         "source-map": "^0.6.1",
-        "terser": "^4.8.0",
-        "webpack-sources": "^1.4.3"
+        "terser": "^5.5.1"
       },
       "dependencies": {
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "terser": {
-          "version": "4.8.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          }
         }
       }
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
       "dev": true,
       "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "any-promise": "^1.0.0"
       }
     },
-    "timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+    "thenify-all": {
+      "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": {
-        "setimmediate": "^1.0.4"
+        "thenify": ">= 3.1.0 < 4"
       }
     },
-    "tns-core-modules": {
-      "version": "6.5.25",
-      "resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-6.5.25.tgz",
-      "integrity": "sha512-bqKtJvhWNNA1ZItmdyX/WlG8exsAcIDqiFOpzcR49Y+He8b3kHdcmOX+VSL9cTQaYPd9piIYLoS2NOh5rSZcgA==",
-      "peer": true,
-      "requires": {
-        "@nativescript/core": "6.5.25"
-      },
-      "dependencies": {
-        "@nativescript/core": {
-          "version": "6.5.25",
-          "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-6.5.25.tgz",
-          "integrity": "sha512-vD3M2SiJgZl3yZdFLAXvNvXwocD9eiyo6vQUisrHH0g10ObecxCo2eCECJR8vdbtfSyb5E0BvBx3Ietkgdzntg==",
-          "peer": true,
-          "requires": {
-            "css-tree": "^1.0.0-alpha.37",
-            "nativescript-hook": "0.2.5",
-            "reduce-css-calc": "^2.1.6",
-            "semver": "6.3.0",
-            "tns-core-modules-widgets": "latest",
-            "tslib": "1.10.0"
-          }
-        },
-        "tslib": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-          "peer": true
-        }
-      }
-    },
-    "tns-core-modules-widgets": {
-      "version": "6.5.10",
-      "resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-6.5.10.tgz",
-      "integrity": "sha512-esZPbnm0wIn89AoFxdfhFuG0a/JE9A9k3ovBRpzs9O9d/JrChlgkTX4lSRQz6xBHLC1UVaqiTc/DNBGbdaeCyA==",
-      "peer": true
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "dev": true
     },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -20426,47 +10187,22 @@
         "is-number": "^7.0.0"
       }
     },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+    "totalist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
       "dev": true
     },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
-    },
-    "true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.2"
-      }
-    },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+    "ts-dedent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.1.0.tgz",
+      "integrity": "sha512-HbmrG+lCgk5W8LQTALxBxQRBDeAhQKRzdqVhHLUkVd5nYT+b6zDzbRMjiA8wqrWDa33X09WdnW4zEsdwQArTaw==",
       "dev": true
     },
     "ts-loader": {
-      "version": "8.0.17",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.17.tgz",
-      "integrity": "sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.1.0.tgz",
+      "integrity": "sha512-YiQipGGAFj2zBfqLhp28yUvPP9jUGqHxRzrGYuc82Z2wM27YIHbElXiaZDc93c3x0mz4zvBmS6q/DgExpdj37A==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
@@ -20516,10 +10252,19 @@
           "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",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -20533,6 +10278,12 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
@@ -20554,55 +10305,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
       "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
     },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "typescript": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz",
-      "integrity": "sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==",
-      "peer": true
-    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -20631,109 +10333,18 @@
       "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
       "dev": true
     },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        }
-      }
-    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "optional": true
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -20743,116 +10354,18 @@
         "punycode": "^2.1.0"
       }
     },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
     "v8-compile-cache": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
-      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "vue": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
-      "peer": true
-    },
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -20895,9 +10408,9 @@
       }
     },
     "vue-style-loader": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
-      "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
       "dev": true,
       "requires": {
         "hash-sum": "^1.0.2",
@@ -20935,740 +10448,210 @@
     "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": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
+      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
       "dev": true,
       "requires": {
-        "chokidar": "^3.4.1",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.1"
-      }
-    },
-    "watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chokidar": "^2.1.8"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true,
-          "optional": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true,
-          "optional": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
       }
     },
     "webpack": {
-      "version": "4.44.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
-      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
+        "@types/eslint-scope": "^3.7.0",
+        "@types/estree": "^0.0.46",
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/wasm-edit": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "acorn": "^8.0.4",
+        "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.3.0",
-        "eslint-scope": "^4.0.3",
+        "enhanced-resolve": "^5.7.0",
+        "es-module-lexer": "^0.4.0",
+        "eslint-scope": "^5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.4",
         "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
-        "webpack-sources": "^1.4.1"
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.1",
+        "watchpack": "^2.0.0",
+        "webpack-sources": "^2.1.1"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "enhanced-resolve": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
+          "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "cacache": {
-          "version": "12.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.5",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
-            "infer-owner": "^1.0.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "memory-fs": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
+            "graceful-fs": "^4.2.4",
+            "tapable": "^2.2.0"
           }
         },
         "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "terser": {
-          "version": "4.8.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          }
-        },
-        "terser-webpack-plugin": {
-          "version": "1.4.5",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-          "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-          "dev": true,
-          "requires": {
-            "cacache": "^12.0.2",
-            "find-cache-dir": "^2.1.0",
-            "is-wsl": "^1.1.0",
-            "schema-utils": "^1.0.0",
-            "serialize-javascript": "^4.0.0",
-            "source-map": "^0.6.1",
-            "terser": "^4.1.2",
-            "webpack-sources": "^1.4.0",
-            "worker-farm": "^1.7.0"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+        "tapable": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+          "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
           "dev": true
         }
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
-      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.0.tgz",
+      "integrity": "sha512-9DhNa+aXpqdHk8LkLPTBU/dMfl84Y+WE2+KnfI6rSpNRNVKa0VGLjPd2pjFubDeqnWmulFggxmWBxhfJXZnR0g==",
       "dev": true,
       "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "chalk": "^4.1.0",
+        "commander": "^6.2.0",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "opener": "^1.5.2",
+        "sirv": "^1.0.7",
+        "ws": "^7.3.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+        "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": {
-            "minimist": "^1.2.5"
+            "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
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "webpack-chain": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
+      "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==",
+      "dev": true,
+      "requires": {
+        "deepmerge": "^1.5.2",
+        "javascript-stringify": "^2.0.1"
+      },
+      "dependencies": {
+        "deepmerge": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+          "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
+          "dev": true
         }
       }
     },
     "webpack-cli": {
-      "version": "3.3.12",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
-      "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.6.0.tgz",
+      "integrity": "sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
-        "cross-spawn": "^6.0.5",
-        "enhanced-resolve": "^4.1.1",
-        "findup-sync": "^3.0.0",
-        "global-modules": "^2.0.0",
-        "import-local": "^2.0.0",
-        "interpret": "^1.4.0",
-        "loader-utils": "^1.4.0",
-        "supports-color": "^6.1.0",
-        "v8-compile-cache": "^2.1.1",
-        "yargs": "^13.3.2"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^1.0.2",
+        "@webpack-cli/info": "^1.2.3",
+        "@webpack-cli/serve": "^1.3.1",
+        "colorette": "^1.2.1",
+        "commander": "^7.0.0",
+        "enquirer": "^2.3.6",
+        "execa": "^5.0.0",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^2.2.0",
+        "rechoir": "^0.7.0",
+        "v8-compile-cache": "^2.2.0",
+        "webpack-merge": "^5.7.3"
+      }
+    },
+    "webpack-merge": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
       }
     },
     "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -21679,81 +10662,61 @@
         }
       }
     },
+    "webpack-virtual-modules": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.2.tgz",
+      "integrity": "sha512-OUsT1VZhArN8nY7g6mMlw91HWnXcNXsIQjsQ83WteF4ViZ6YXqF2sWKOTDIZ0H+PPiApQdszLdZIrD7NNlU0Yw==",
+      "dev": true
+    },
     "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
+    "wildcard": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
       "dev": true
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
     "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "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": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+        "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": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "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": {
-            "ansi-regex": "^4.1.0"
+            "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
         }
       }
     },
@@ -21763,13 +10726,10 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+      "dev": true
     },
     "xmlbuilder": {
       "version": "9.0.7",
@@ -21777,146 +10737,48 @@
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
     },
     "xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
-      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
     },
     "y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
       "dev": true
     },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
     "yaml": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
-      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
     "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
       }
     },
     "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
-      }
+      "version": "20.2.7",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true
     },
     "yn": {
       "version": "3.1.1",
diff --git a/package.json b/package.json
index 26868aa0..0912a6ae 100644
--- a/package.json
+++ b/package.json
@@ -1,54 +1,43 @@
 {
   "name": "enrecipes",
+  "main": "./app/main.js",
   "version": "1.0.0",
   "description": "A native application built with NativeScript-Vue",
-  "author": "Vishnu Raghav <apps@vishnuraghav.com>",
-  "license": "GPL",
-  "dependencies": {
-    "@nativescript-community/gesturehandler": "^0.1.36",
-    "@nativescript-community/perms": "^2.1.4",
-    "@nativescript-community/ui-collectionview": "^4.0.24",
-    "@nativescript-community/ui-drawer": "0.0.22",
-    "@nativescript-community/ui-material-activityindicator": "^5.1.16",
-    "@nativescript-community/ui-material-button": "^5.1.16",
-    "@nativescript-community/ui-material-floatingactionbutton": "^5.1.16",
-    "@nativescript-community/ui-material-progress": "^5.1.16",
-    "@nativescript-community/ui-material-snackbar": "^5.1.16",
-    "@nativescript/core": "~7.0.0",
-    "@nativescript/localize": "^5.0.2",
-    "@nativescript/social-share": "^2.0.1",
-    "@nativescript/theme": "^3.0.1",
-    "@nativescript/zip": "^5.0.0",
-    "@nstudio/nativescript-checkbox": "^2.0.4",
-    "nativescript-accelerometer": "^3.0.0",
-    "nativescript-couchbase-plugin": "^0.9.6",
-    "nativescript-feedback": "^2.0.0",
-    "nativescript-imagecropper": "^4.0.1",
-    "nativescript-intl": "^4.0.2",
-    "nativescript-plugin-filepicker": "^1.0.0",
-    "nativescript-toast": "^2.0.0",
-    "nativescript-vibrate": "^4.0.1",
-    "nativescript-vue": "^2.8.3",
-    "vuex": "^3.6.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "@nativescript/android": "7.0.1",
-    "@nativescript/webpack": "^3.0.8",
-    "@types/node": "^14.14.20",
-    "babel-loader": "^8.2.2",
-    "nativescript-vue-template-compiler": "^2.8.3",
-    "node-sass": "^4.14.1",
-    "vue-loader": "^15.9.6"
+  "homepage": "https://enrecipes.vercel.app/",
+  "bugs": {
+    "url": "https://github.com/vishnuraghavb/EnRecipes/issues"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vishnuraghavb/EnRecipes.git"
   },
-  "bugs": {
-    "url": "https://github.com/vishnuraghavb/EnRecipes/issues"
+  "license": "GPL",
+  "author": "Vishnu Raghav <apps@vishnuraghav.com>",
+  "publishConfig": {
+    "access": "public"
   },
-  "homepage": "https://enrecipes.vercel.app/",
-  "main": "main"
+  "private": "true",
+  "dependencies": {
+    "@nativescript-community/perms": "^2.1.5",
+    "@nativescript-community/ui-collectionview": "^4.0.29",
+    "@nativescript/core": "~8.0.0",
+    "@nativescript/localize": "^5.0.4",
+    "@nativescript/social-share": "^2.0.4",
+    "@nativescript/zip": "^5.0.0",
+    "@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.8.4",
+    "vuex": "^3.6.2"
+  },
+  "devDependencies": {
+    "@babel/core": "~7.1.0",
+    "@babel/preset-env": "~7.1.0",
+    "@nativescript/android": "8.0.0",
+    "@nativescript/webpack": "5.0.0-beta.0",
+    "babel-loader": "~8.0.0",
+    "nativescript-vue-template-compiler": "^2.8.4",
+    "sass": "^1.32.8"
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index c9f603c2..00000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Basic Options */
-    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    // "lib": [],                             /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                       /* Allow javascript files to be compiled. */
-    // "checkJs": true,                       /* Report errors in .js files. */
-    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    // "outDir": "./",                        /* Redirect output structure to the directory. */
-    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                     /* Enable project compilation */
-    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-    // "removeComments": true,                /* Do not emit comments to output. */
-    // "noEmit": true,                        /* Do not emit outputs. */
-    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,              /* Enable strict null checks. */
-    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                /* Report errors on unused locals. */
-    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-
-    /* Module Resolution Options */
-    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
-  }
-}
diff --git a/webpack.config.js b/webpack.config.js
index e61f2036..07275b43 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,369 +1,11 @@
-const { join, relative, resolve, sep } = require("path");
+const webpack = require("@nativescript/webpack");
 
-const webpack = require("webpack");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
-const TerserPlugin = require("terser-webpack-plugin");
+module.exports = (env) => {
+	webpack.init(env);
 
-const VueLoaderPlugin = require('vue-loader/lib/plugin');
-const NsVueTemplateCompiler = require("nativescript-vue-template-compiler");
+	// todo: comments for common usage
 
-const nsWebpack = require("@nativescript/webpack");
-const nativescriptTarget = require("@nativescript/webpack/nativescript-target");
-const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
-const hashSalt = Date.now().toString();
-
-module.exports = env => {
-    // Add your custom Activities, Services and other android app components here.
-    const appComponents = env.appComponents || [];
-    appComponents.push(...[
-        "@nativescript/core/ui/frame",
-        "@nativescript/core/ui/frame/activity",
-    ]);
-
-    const platform = env && (env.android && "android" || env.ios && "ios" || env.platform);
-    if (!platform) {
-        throw new Error("You need to provide a target platform!");
-    }
-
-    const platforms = ["ios", "android"];
-    const projectRoot = __dirname;
-
-    if (env.platform) {
-        platforms.push(env.platform);
-    }
-
-    // Default destination inside platforms/<platform>/...
-    const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
-
-    const {
-        // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file.
-        appPath = "app",
-        appResourcesPath = "app/App_Resources",
-
-        // You can provide the following flags when running 'tns run android|ios'
-        snapshot, // --env.snapshot
-        production, // --env.production
-        report, // --env.report
-        hmr, // --env.hmr
-        sourceMap, // --env.sourceMap
-        hiddenSourceMap, // --env.hiddenSourceMap
-        unitTesting, // --env.unitTesting
-        testing, // --env.testing
-        verbose, // --env.verbose
-        snapshotInDocker, // --env.snapshotInDocker
-        skipSnapshotTools, // --env.skipSnapshotTools
-        compileSnapshot // --env.compileSnapshot
-    } = env;
-
-    const useLibs = compileSnapshot;
-    const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
-    const externals = nsWebpack.getConvertedExternals(env.externals);
-
-    const mode = production ? "production" : "development"
-
-    const appFullPath = resolve(projectRoot, appPath);
-    const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
-    let coreModulesPackageName = "tns-core-modules";
-    const alias = env.alias || {};
-    alias['~/package.json'] = resolve(projectRoot, 'package.json');
-    alias['~'] = appFullPath;
-    alias['@'] = appFullPath;
-    alias['vue'] = 'nativescript-vue';
-
-    if (hasRootLevelScopedModules) {
-        coreModulesPackageName = "@nativescript/core";
-        alias["tns-core-modules"] = coreModulesPackageName;
-    }
-
-    const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
-
-    const copyIgnore = { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] };
-
-    const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
-    const entryPath = `.${sep}${entryModule}`;
-    const entries = env.entries || {};
-    entries.bundle = entryPath;
-
-    const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("@nativescript") > -1);
-    if (platform === "ios" && !areCoreModulesExternal && !testing) {
-        entries["tns_modules/@nativescript/core/inspector_modules"] = "inspector_modules";
-    };
-    console.log(`Bundling application for entryPath ${entryPath}...`);
-
-    let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
-
-    const itemsToClean = [`${dist}/**/*`];
-    if (platform === "android") {
-        itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "src", "main", "assets", "snapshots")}`);
-        itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
-    }
-
-    nsWebpack.processAppComponents(appComponents, platform);
-    const config = {
-        mode: mode,
-        context: appFullPath,
-        externals,
-        watchOptions: {
-            ignored: [
-                appResourcesFullPath,
-                // Don't watch hidden files
-                "**/.*",
-            ],
-        },
-        target: nativescriptTarget,
-        // target: nativeScriptVueTarget,
-        entry: entries,
-        output: {
-            pathinfo: false,
-            path: dist,
-            sourceMapFilename,
-            libraryTarget: "commonjs2",
-            filename: "[name].js",
-            globalObject: "global",
-            hashSalt
-        },
-        resolve: {
-            extensions: [".vue", ".ts", ".js", ".scss", ".css"],
-            // Resolve {N} system modules from @nativescript/core
-            modules: [
-                resolve(__dirname, `node_modules/${coreModulesPackageName}`),
-                resolve(__dirname, "node_modules"),
-                `node_modules/${coreModulesPackageName}`,
-                "node_modules",
-            ],
-            alias,
-            // resolve symlinks to symlinked modules
-            symlinks: true,
-        },
-        resolveLoader: {
-            // don't resolve symlinks to symlinked loaders
-            symlinks: false,
-        },
-        node: {
-            // Disable node shims that conflict with NativeScript
-            "http": false,
-            "timers": false,
-            "setImmediate": false,
-            "fs": "empty",
-            "__dirname": false,
-        },
-        devtool: hiddenSourceMap ? "hidden-source-map" : (sourceMap ? "inline-source-map" : "none"),
-        optimization: {
-            runtimeChunk: "single",
-            noEmitOnErrors: true,
-            splitChunks: {
-                cacheGroups: {
-                    vendor: {
-                        name: "vendor",
-                        chunks: "all",
-                        test: (module) => {
-                            const moduleName = module.nameForCondition ? module.nameForCondition() : '';
-                            return /[\\/]node_modules[\\/]/.test(moduleName) ||
-                                appComponents.some(comp => comp === moduleName);
-
-                        },
-                        enforce: true,
-                    },
-                },
-            },
-            minimize: Boolean(production),
-            minimizer: [
-                new TerserPlugin({
-                    parallel: true,
-                    cache: true,
-                    sourceMap: isAnySourceMapEnabled,
-                    terserOptions: {
-                        output: {
-                            comments: false,
-                            semicolons: !isAnySourceMapEnabled
-                        },
-                        compress: {
-                            // The Android SBG has problems parsing the output
-                            // when these options are enabled
-                            'collapse_vars': platform !== "android",
-                            sequences: platform !== "android",
-                        },
-                        keep_fnames: true,
-                    },
-                }),
-            ],
-        },
-        module: {
-            rules: [{
-                include: [join(appFullPath, entryPath + ".js"), join(appFullPath, entryPath + ".ts")],
-                use: [
-                    // Require all Android app components
-                    platform === "android" && {
-                        loader: "@nativescript/webpack/helpers/android-app-components-loader",
-                        options: { modules: appComponents },
-                    },
-
-                    {
-                        loader: "@nativescript/webpack/bundle-config-loader",
-                        options: {
-                            registerPages: true, // applicable only for non-angular apps
-                            loadCss: !snapshot, // load the application css if in debug mode
-                            unitTesting,
-                            appFullPath,
-                            projectRoot,
-                            ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
-                        },
-                    },
-                ].filter(loader => Boolean(loader)),
-            },
-            {
-                test: /[\/|\\]app\.css$/,
-                use: [
-                    '@nativescript/webpack/helpers/style-hot-loader',
-                    {
-                        loader: "@nativescript/webpack/helpers/css2json-loader",
-                        options: { useForImports: true }
-                    },
-                ],
-            },
-            {
-                test: /[\/|\\]app\.scss$/,
-                use: [
-                    '@nativescript/webpack/helpers/style-hot-loader',
-                    {
-                        loader: "@nativescript/webpack/helpers/css2json-loader",
-                        options: { useForImports: true }
-                    },
-                    'sass-loader',
-                ],
-            },
-            {
-                test: /\.css$/,
-                exclude: /[\/|\\]app\.css$/,
-                use: [
-                    '@nativescript/webpack/helpers/style-hot-loader',
-                    '@nativescript/webpack/helpers/apply-css-loader.js',
-                    { loader: "css-loader", options: { url: false } },
-                ],
-            },
-            {
-                test: /\.scss$/,
-                exclude: /[\/|\\]app\.scss$/,
-                use: [
-                    '@nativescript/webpack/helpers/style-hot-loader',
-                    '@nativescript/webpack/helpers/apply-css-loader.js',
-                    { loader: "css-loader", options: { url: false } },
-                    'sass-loader',
-                ],
-            },
-            {
-                test: /\.js$/,
-                loader: 'babel-loader',
-            },
-            {
-                test: /\.ts$/,
-                loader: 'ts-loader',
-                options: {
-                    appendTsSuffixTo: [/\.vue$/],
-                    allowTsInNodeModules: true,
-                    compilerOptions: {
-                        declaration: false
-                    },
-                    getCustomTransformers: (program) => ({
-                        before: [
-                            require("@nativescript/webpack/transformers/ns-transform-native-classes").default
-                        ]
-                    })
-                },
-            },
-            {
-                test: /\.vue$/,
-                loader: "vue-loader",
-                options: {
-                    compiler: NsVueTemplateCompiler,
-                },
-            },
-            ],
-        },
-        plugins: [
-            // ... Vue Loader plugin omitted
-            // make sure to include the plugin!
-            new VueLoaderPlugin(),
-            // Define useful constants like TNS_WEBPACK
-            new webpack.DefinePlugin({
-                "global.TNS_WEBPACK": "true",
-                "global.isAndroid": platform === 'android',
-                "global.isIOS": platform === 'ios',
-                "TNS_ENV": JSON.stringify(mode),
-                "process": "global.process"
-            }),
-            // Remove all files from the out dir.
-            new CleanWebpackPlugin({ 
-              cleanOnceBeforeBuildPatterns: itemsToClean,
-              verbose: !!verbose
-            }),
-            // Copy assets
-            new CopyWebpackPlugin({
-              patterns: [
-                { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
-                { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } },
-                { from: '**/*.+(jpg|png)', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }
-              ],
-            }),
-            new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"),
-            // For instructions on how to set up workers with webpack
-            // check out https://github.com/nativescript/worker-loader
-            new NativeScriptWorkerPlugin(),
-            new nsWebpack.PlatformFSPlugin({
-                platform,
-                platforms,
-            }),
-            // Does IPC communication with the {N} CLI to notify events when running in watch mode.
-            new nsWebpack.WatchStateLoggerPlugin()
-        ],
-    };
-
-    if (unitTesting) {
-        config.module.rules.push(
-            {
-                test: /-page\.js$/,
-                use: "@nativescript/webpack/helpers/script-hot-loader"
-            },
-            {
-                test: /\.(html|xml)$/,
-                use: "@nativescript/webpack/helpers/markup-hot-loader"
-            },
-
-            { test: /\.(html|xml)$/, use: "@nativescript/webpack/helpers/xml-namespace-loader" }
-        );
-    }
-
-    if (report) {
-        // Generate report files for bundles content
-        config.plugins.push(new BundleAnalyzerPlugin({
-            analyzerMode: "static",
-            openAnalyzer: false,
-            generateStatsFile: true,
-            reportFilename: resolve(projectRoot, "report", `report.html`),
-            statsFilename: resolve(projectRoot, "report", `stats.json`),
-        }));
-    }
-
-    if (snapshot) {
-        config.plugins.push(new nsWebpack.NativeScriptSnapshotPlugin({
-            chunk: "vendor",
-            requireModules: [
-                "@nativescript/core/bundle-entry-points",
-            ],
-            projectRoot,
-            webpackConfig: config,
-            snapshotInDocker,
-            skipSnapshotTools,
-            useLibs
-        }));
-    }
-
-    if (hmr) {
-        config.plugins.push(new webpack.HotModuleReplacementPlugin());
-    }
-
-    return config;
+	return webpack.resolveConfig();
 };
+
+