From ba22c18cd9c59f3bd53785378fcec4cba899aefd Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 26 Jul 2022 16:59:53 -0400
Subject: [PATCH 01/36] separating group plan creation modal out from
 groupPlan.vue

---
 .../groups/groupPlanCreationModal.vue         | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 website/client/src/components/groups/groupPlanCreationModal.vue

diff --git a/website/client/src/components/groups/groupPlanCreationModal.vue b/website/client/src/components/groups/groupPlanCreationModal.vue
new file mode 100644
index 0000000000..2a71afd919
--- /dev/null
+++ b/website/client/src/components/groups/groupPlanCreationModal.vue
@@ -0,0 +1,230 @@
+<template>
+  <div>
+    <b-modal
+      id="group-plan-modal"
+      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+      size="md"
+      hide-footer="hide-footer"
+    >
+      <div
+        v-if="activePage === PAGES.CREATE_GROUP"
+        class="col-12"
+      >
+        <div class="form-group">
+          <label
+            class="control-label"
+            for="new-group-name"
+          >Name</label>
+          <input
+            id="new-group-name"
+            v-model="newGroup.name"
+            class="form-control input-medium option-content"
+            required="required"
+            type="text"
+            placeholder="Name"
+          >
+        </div>
+        <div class="form-group">
+          <label for="new-group-description">{{ $t('description') }}</label>
+          <textarea
+            id="new-group-description"
+            v-model="newGroup.description"
+            class="form-control option-content"
+            cols="3"
+            :placeholder="$t('description')"
+          ></textarea>
+        </div>
+        <div
+          v-if="type === 'guild'"
+          class="form-group"
+        >
+          <div class="custom-control custom-radio">
+            <input
+              v-model="newGroup.privacy"
+              class="custom-control-input"
+              type="radio"
+              name="new-group-privacy"
+              value="private"
+            >
+            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <input
+              id="create-group-leaderOnlyChallenges-checkbox"
+              v-model="newGroup.leaderOnly.challenges"
+              class="custom-control-input"
+              type="checkbox"
+            >
+            <label
+              class="custom-control-label"
+              for="create-group-leaderOnlyChallenges-checkbox"
+            >{{ $t('leaderOnlyChallenges') }}</label>
+          </div>
+        </div>
+        <div
+          v-if="type === 'party'"
+          class="form-group"
+        >
+          <button
+            class="btn btn-secondary form-control"
+            :value="$t('create')"
+            @click="createGroup()"
+          ></button>
+        </div>
+        <div class="form-group">
+          <button
+            class="btn btn-primary btn-lg btn-block"
+            :disabled="!newGroupIsReady"
+            @click="createGroup()"
+          >
+            {{ $t('create') }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-if="activePage === PAGES.PAY"
+        class="col-12"
+      >
+        <div class="text-center">
+          <payments-buttons
+            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+            :amazon-data="pay(PAYMENTS.AMAZON)"
+          />
+        </div>
+      </div>
+    </b-modal>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .payment-options {
+    margin-bottom: 4em;
+
+    .purple-box {
+      background-color: #4f2a93;
+      color: #fff;
+      padding: .5em;
+      border-radius: 8px;
+      width: 200px;
+      height: 215px;
+
+      .dollar {
+      }
+
+      .number {
+        font-size: 60px;
+      }
+
+      .name {
+        width: 100px;
+        margin-left: .3em;
+      }
+
+      .plus {
+        width: 100%;
+        text-align: center;
+      }
+
+      div {
+        display: inline-block;
+      }
+    }
+
+    .box, .purple-box {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+</style>
+
+<script>
+import paymentsMixin from '../../mixins/payments';
+import { mapState } from '@/libs/store';
+import positiveIcon from '@/assets/svg/positive.svg';
+import paymentsButtons from '@/components/payments/buttons/list';
+
+export default {
+  components: {
+    paymentsButtons,
+  },
+  mixins: [paymentsMixin],
+  data () {
+    return {
+      amazonPayments: {},
+      icons: Object.freeze({
+        positiveIcon,
+      }),
+      PAGES: {
+        CREATE_GROUP: 'create-group',
+        UPGRADE_GROUP: 'upgrade-group',
+        PAY: 'pay',
+      },
+      PAYMENTS: {
+        AMAZON: 'amazon',
+        STRIPE: 'stripe',
+      },
+      paymentMethod: '',
+      newGroup: {
+        type: 'guild',
+        privacy: 'private',
+        name: '',
+        leaderOnly: {
+          challenges: false,
+        },
+      },
+      activePage: '',
+      type: 'guild', // Guild or Party @TODO enum this
+    };
+  },
+  computed: {
+    newGroupIsReady () {
+      return Boolean(this.newGroup.name);
+    },
+    upgradingGroup () {
+      return this.$store.state.upgradingGroup;
+    },
+    // @TODO: can we move this to payment mixin?
+    ...mapState({ user: 'user.data' }),
+  },
+  mounted () {
+    this.activePage = this.PAGES.BENEFITS;
+    this.$store.dispatch('common:setTitle', {
+      section: this.$t('groupPlans'),
+    });
+  },
+  methods: {
+    createGroup () {
+      this.changePage(this.PAGES.PAY);
+    },
+    pay (paymentMethod) {
+      const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      const paymentData = {
+        subscription: subscriptionKey,
+        coupon: null,
+      };
+
+      if (this.upgradingGroup && this.upgradingGroup._id) {
+        paymentData.groupId = this.upgradingGroup._id;
+        paymentData.group = this.upgradingGroup;
+      } else {
+        paymentData.groupToCreate = this.newGroup;
+      }
+
+      this.paymentMethod = paymentMethod;
+
+      if (this.paymentMethod === this.PAYMENTS.AMAZON) {
+        paymentData.type = 'subscription';
+        return paymentData;
+      }
+
+      if (this.paymentMethod === this.PAYMENTS.STRIPE) {
+        this.redirectToStripe(paymentData);
+      }
+
+      return null;
+    },
+  },
+};
+</script>

From 8ecd152b411e9126b1c24b9da941e07d3b8508ba Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 27 Jul 2022 18:25:56 -0400
Subject: [PATCH 02/36] moved modal file from /groups into /group-plans

---
 .../group-plans/groupPlanCreationModal.vue    | 230 ++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 website/client/src/components/group-plans/groupPlanCreationModal.vue

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
new file mode 100644
index 0000000000..2a71afd919
--- /dev/null
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -0,0 +1,230 @@
+<template>
+  <div>
+    <b-modal
+      id="group-plan-modal"
+      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+      size="md"
+      hide-footer="hide-footer"
+    >
+      <div
+        v-if="activePage === PAGES.CREATE_GROUP"
+        class="col-12"
+      >
+        <div class="form-group">
+          <label
+            class="control-label"
+            for="new-group-name"
+          >Name</label>
+          <input
+            id="new-group-name"
+            v-model="newGroup.name"
+            class="form-control input-medium option-content"
+            required="required"
+            type="text"
+            placeholder="Name"
+          >
+        </div>
+        <div class="form-group">
+          <label for="new-group-description">{{ $t('description') }}</label>
+          <textarea
+            id="new-group-description"
+            v-model="newGroup.description"
+            class="form-control option-content"
+            cols="3"
+            :placeholder="$t('description')"
+          ></textarea>
+        </div>
+        <div
+          v-if="type === 'guild'"
+          class="form-group"
+        >
+          <div class="custom-control custom-radio">
+            <input
+              v-model="newGroup.privacy"
+              class="custom-control-input"
+              type="radio"
+              name="new-group-privacy"
+              value="private"
+            >
+            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <input
+              id="create-group-leaderOnlyChallenges-checkbox"
+              v-model="newGroup.leaderOnly.challenges"
+              class="custom-control-input"
+              type="checkbox"
+            >
+            <label
+              class="custom-control-label"
+              for="create-group-leaderOnlyChallenges-checkbox"
+            >{{ $t('leaderOnlyChallenges') }}</label>
+          </div>
+        </div>
+        <div
+          v-if="type === 'party'"
+          class="form-group"
+        >
+          <button
+            class="btn btn-secondary form-control"
+            :value="$t('create')"
+            @click="createGroup()"
+          ></button>
+        </div>
+        <div class="form-group">
+          <button
+            class="btn btn-primary btn-lg btn-block"
+            :disabled="!newGroupIsReady"
+            @click="createGroup()"
+          >
+            {{ $t('create') }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-if="activePage === PAGES.PAY"
+        class="col-12"
+      >
+        <div class="text-center">
+          <payments-buttons
+            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+            :amazon-data="pay(PAYMENTS.AMAZON)"
+          />
+        </div>
+      </div>
+    </b-modal>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .payment-options {
+    margin-bottom: 4em;
+
+    .purple-box {
+      background-color: #4f2a93;
+      color: #fff;
+      padding: .5em;
+      border-radius: 8px;
+      width: 200px;
+      height: 215px;
+
+      .dollar {
+      }
+
+      .number {
+        font-size: 60px;
+      }
+
+      .name {
+        width: 100px;
+        margin-left: .3em;
+      }
+
+      .plus {
+        width: 100%;
+        text-align: center;
+      }
+
+      div {
+        display: inline-block;
+      }
+    }
+
+    .box, .purple-box {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+  }
+</style>
+
+<script>
+import paymentsMixin from '../../mixins/payments';
+import { mapState } from '@/libs/store';
+import positiveIcon from '@/assets/svg/positive.svg';
+import paymentsButtons from '@/components/payments/buttons/list';
+
+export default {
+  components: {
+    paymentsButtons,
+  },
+  mixins: [paymentsMixin],
+  data () {
+    return {
+      amazonPayments: {},
+      icons: Object.freeze({
+        positiveIcon,
+      }),
+      PAGES: {
+        CREATE_GROUP: 'create-group',
+        UPGRADE_GROUP: 'upgrade-group',
+        PAY: 'pay',
+      },
+      PAYMENTS: {
+        AMAZON: 'amazon',
+        STRIPE: 'stripe',
+      },
+      paymentMethod: '',
+      newGroup: {
+        type: 'guild',
+        privacy: 'private',
+        name: '',
+        leaderOnly: {
+          challenges: false,
+        },
+      },
+      activePage: '',
+      type: 'guild', // Guild or Party @TODO enum this
+    };
+  },
+  computed: {
+    newGroupIsReady () {
+      return Boolean(this.newGroup.name);
+    },
+    upgradingGroup () {
+      return this.$store.state.upgradingGroup;
+    },
+    // @TODO: can we move this to payment mixin?
+    ...mapState({ user: 'user.data' }),
+  },
+  mounted () {
+    this.activePage = this.PAGES.BENEFITS;
+    this.$store.dispatch('common:setTitle', {
+      section: this.$t('groupPlans'),
+    });
+  },
+  methods: {
+    createGroup () {
+      this.changePage(this.PAGES.PAY);
+    },
+    pay (paymentMethod) {
+      const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      const paymentData = {
+        subscription: subscriptionKey,
+        coupon: null,
+      };
+
+      if (this.upgradingGroup && this.upgradingGroup._id) {
+        paymentData.groupId = this.upgradingGroup._id;
+        paymentData.group = this.upgradingGroup;
+      } else {
+        paymentData.groupToCreate = this.newGroup;
+      }
+
+      this.paymentMethod = paymentMethod;
+
+      if (this.paymentMethod === this.PAYMENTS.AMAZON) {
+        paymentData.type = 'subscription';
+        return paymentData;
+      }
+
+      if (this.paymentMethod === this.PAYMENTS.STRIPE) {
+        this.redirectToStripe(paymentData);
+      }
+
+      return null;
+    },
+  },
+};
+</script>

From 9bee9d0a069f456609a641ef301a654a9b816501 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 1 Aug 2022 17:11:15 -0400
Subject: [PATCH 03/36] working on editing code so the modal emits from
 group-plans instead of from within the file

---
 website/client/src/components/groups/groupPlan.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 6fc137a31f..4c54990d6b 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -495,6 +495,13 @@ export default {
       this.changePage(this.PAGES.CREATE_GROUP);
       this.$root.$emit('bv::show::modal', 'group-plan-modal');
     },
+    // launchModal () {
+    //   this.$root.$on('group-plan-modal') {
+    //     console.log('hello i am a modal');
+    //     this.activePage = page;
+    //     this.$root.$emit('bv::show::modal', 'group-plan-modal');
+    //   };
+    // },
     changePage (page) {
       this.activePage = page;
       window.scrollTo(0, 0);

From 999071a15c91dcf0c953c4380f9161c5c56f3303 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 2 Aug 2022 16:05:41 -0400
Subject: [PATCH 04/36] still trying to get modal to work

---
 .../group-plans/groupPlanCreationModal.vue    | 192 +++++++++---------
 .../src/components/groups/groupPlan.vue       | 111 +---------
 2 files changed, 97 insertions(+), 206 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 2a71afd919..c4694bcd2c 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -1,101 +1,100 @@
 <template>
-  <div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
+  <b-modal
+    id="group-plan-creation-modal"
+    :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+    :hide-footer="true"
+    size="md"
+    @hide="onHide()"
+  >
+    <div
+      v-if="activePage === PAGES.CREATE_GROUP"
+      class="col-12"
     >
+      <div class="form-group">
+        <label
+          class="control-label"
+          for="new-group-name"
+        >Name</label>
+        <input
+          id="new-group-name"
+          v-model="newGroup.name"
+          class="form-control input-medium option-content"
+          required="required"
+          type="text"
+          placeholder="Name"
+        >
+      </div>
+      <div class="form-group">
+        <label for="new-group-description">{{ $t('description') }}</label>
+        <textarea
+          id="new-group-description"
+          v-model="newGroup.description"
+          class="form-control option-content"
+          cols="3"
+          :placeholder="$t('description')"
+        ></textarea>
+      </div>
       <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
+        v-if="type === 'guild'"
+        class="form-group"
       >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
+        <div class="custom-control custom-radio">
           <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
+            v-model="newGroup.privacy"
+            class="custom-control-input"
+            type="radio"
+            name="new-group-privacy"
+            value="private"
           >
+          <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
         </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
+      </div>
+      <div class="form-group">
+        <div class="custom-control custom-checkbox">
+          <input
+            id="create-group-leaderOnlyChallenges-checkbox"
+            v-model="newGroup.leaderOnly.challenges"
+            class="custom-control-input"
+            type="checkbox"
           >
-            {{ $t('create') }}
-          </button>
+          <label
+            class="custom-control-label"
+            for="create-group-leaderOnlyChallenges-checkbox"
+          >{{ $t('leaderOnlyChallenges') }}</label>
         </div>
       </div>
       <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
+        v-if="type === 'party'"
+        class="form-group"
       >
-        <div class="text-center">
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
+        <button
+          class="btn btn-secondary form-control"
+          :value="$t('create')"
+          @click="createGroup()"
+        ></button>
       </div>
-    </b-modal>
-  </div>
+      <div class="form-group">
+        <button
+          class="btn btn-primary btn-lg btn-block"
+          :disabled="!newGroupIsReady"
+          @click="createGroup()"
+        >
+          {{ $t('create') }}
+        </button>
+      </div>
+    </div>
+    <div
+      v-if="activePage === PAGES.PAY"
+      class="col-12"
+    >
+      <div class="text-center">
+        <payments-buttons
+          :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+          :amazon-data="pay(PAYMENTS.AMAZON)"
+        />
+      </div>
+    </div>
+  </b-modal>
 </template>
 
 <style lang="scss" scoped>
@@ -122,11 +121,6 @@
         margin-left: .3em;
       }
 
-      .plus {
-        width: 100%;
-        text-align: center;
-      }
-
       div {
         display: inline-block;
       }
@@ -142,7 +136,6 @@
 <script>
 import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
-import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
 
 export default {
@@ -154,7 +147,7 @@ export default {
     return {
       amazonPayments: {},
       icons: Object.freeze({
-        positiveIcon,
+        // positiveIcon,
       }),
       PAGES: {
         CREATE_GROUP: 'create-group',
@@ -179,22 +172,19 @@ export default {
     };
   },
   computed: {
+    ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
       return Boolean(this.newGroup.name);
     },
-    upgradingGroup () {
-      return this.$store.state.upgradingGroup;
-    },
-    // @TODO: can we move this to payment mixin?
-    ...mapState({ user: 'user.data' }),
   },
   mounted () {
-    this.activePage = this.PAGES.BENEFITS;
-    this.$store.dispatch('common:setTitle', {
-      section: this.$t('groupPlans'),
-    });
+    console.log('i am mounted');
   },
   methods: {
+    changePage (page) {
+      this.activePage = page;
+      window.scrollTo(0, 0);
+    },
     createGroup () {
       this.changePage(this.PAGES.PAY);
     },
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 4c54990d6b..83f4a5adf1 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,6 +1,7 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
+    <group-plan-creation=modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -114,7 +115,7 @@
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('create')"
+              @click="launchModal('group-plan-creation-modal')"
             >
               Create Your New Group
             </button>
@@ -153,102 +154,6 @@
         </div>
       </div>
     </div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
-    >
-      <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
-      >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
-          <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
-          >
-        </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
-          >
-            {{ $t('create') }}
-          </button>
-        </div>
-      </div>
-      <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
-      >
-        <div class="text-center">
-          <h3>Choose your payment method</h3>
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
-      </div>
-    </b-modal>
   </div>
 </template>
 
@@ -440,10 +345,12 @@ import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
+import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
 
 export default {
   components: {
     paymentsButtons,
+    groupPlanCreationModal,
   },
   mixins: [paymentsMixin],
   data () {
@@ -492,16 +399,10 @@ export default {
   },
   methods: {
     launchModal () {
+      console.log('hello world');
       this.changePage(this.PAGES.CREATE_GROUP);
-      this.$root.$emit('bv::show::modal', 'group-plan-modal');
+      this.$root.$emit('bv::show::modal', 'group-plan-creation-modal');
     },
-    // launchModal () {
-    //   this.$root.$on('group-plan-modal') {
-    //     console.log('hello i am a modal');
-    //     this.activePage = page;
-    //     this.$root.$emit('bv::show::modal', 'group-plan-modal');
-    //   };
-    // },
     changePage (page) {
       this.activePage = page;
       window.scrollTo(0, 0);

From bd28a282dfca1f7ad8cba9013e40ead867afabeb Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 2 Aug 2022 18:34:09 -0400
Subject: [PATCH 05/36] updates: add demographic strings & drop-down and
 translated array code

---
 .../group-plans/createGroupModalPages.vue     |  1 +
 .../group-plans/groupPlanCreationModal.vue    | 90 +++++++++++++++++--
 .../selectGroupTranslatedArray.vue            | 86 ++++++++++++++++++
 .../src/components/groups/groupPlan.vue       | 18 ++--
 website/common/locales/en/groups.json         |  9 ++
 5 files changed, 189 insertions(+), 15 deletions(-)
 create mode 100644 website/client/src/components/group-plans/selectGroupTranslatedArray.vue

diff --git a/website/client/src/components/group-plans/createGroupModalPages.vue b/website/client/src/components/group-plans/createGroupModalPages.vue
index b354f6ac63..cc1470837a 100644
--- a/website/client/src/components/group-plans/createGroupModalPages.vue
+++ b/website/client/src/components/group-plans/createGroupModalPages.vue
@@ -1,3 +1,4 @@
+ <!-- THIS IS A VERY OLD FILE DO NOT USE -->
 <template>
   <div class="create-group-modal-pages">
     <div
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index c4694bcd2c..6be98bffe8 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -1,8 +1,9 @@
 <template>
   <b-modal
-    id="group-plan-creation-modal"
+    id="create-group"
     :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
     :hide-footer="true"
+    :hide-header="true"
     size="md"
     @hide="onHide()"
   >
@@ -10,6 +11,17 @@
       v-if="activePage === PAGES.CREATE_GROUP"
       class="col-12"
     >
+      <div
+        class="modal-close"
+        @click="close()"
+      >
+        <div
+          class="icon-close"
+          v-html="icons.closeIcon"
+        >
+        </div>
+      </div>
+      <h2>{{ $t('createGroup') }}</h2>
       <div class="form-group">
         <label
           class="control-label"
@@ -62,6 +74,24 @@
             for="create-group-leaderOnlyChallenges-checkbox"
           >{{ $t('leaderOnlyChallenges') }}</label>
         </div>
+        <div class="form-group">
+          <lockable-label
+            :text="$t('groupUse')"
+          />
+          <select-group-translated-array
+            :items="[
+              'groupUseDefault',
+              'groupParentChildren',
+              'groupCouple',
+              'groupFriends',
+              'groupCoworkers',
+              'groupManager',
+              'groupTeacher'
+            ]"
+            :value="groupUseDefault"
+            @select="groupUseDefault"
+          />
+        </div>
       </div>
       <div
         v-if="type === 'party'"
@@ -132,23 +162,62 @@
     }
   }
 </style>
+<style lang="scss">
+  @import '~@/assets/scss/mixins.scss';
+  #create-group {
+    .modal-dialog {
+      max-width: 448px;
+    }
+
+    .modal-content {
+      width: 448px;
+      border-radius: 8px;
+      box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
+    }
+    .modal-body{
+      padding: 0px;
+    }
+
+    .modal-close {
+      position: absolute;
+      right: 16px;
+      top: 16px;
+      cursor: pointer;
+
+      .icon-close {
+        width: 18px;
+        height: 18px;
+        vertical-align: middle;
+
+        & ::v-deep svg path {
+          fill: #878190;
+        }
+         & :hover {
+          fill: #686274;
+        }
+      }
+    }
+  }
+</style>
 
 <script>
 import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
+import selectGroupTranslatedArray from '@/components/group-plans/selectGroupTranslatedArray';
+import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+import closeIcon from '@/assets/svg/close.svg';
 
 export default {
   components: {
     paymentsButtons,
+    selectGroupTranslatedArray,
+    lockableLabel,
   },
   mixins: [paymentsMixin],
   data () {
     return {
       amazonPayments: {},
-      icons: Object.freeze({
-        // positiveIcon,
-      }),
       PAGES: {
         CREATE_GROUP: 'create-group',
         UPGRADE_GROUP: 'upgrade-group',
@@ -167,8 +236,11 @@ export default {
           challenges: false,
         },
       },
-      activePage: '',
+      activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
+      icons: Object.freeze({
+        closeIcon,
+      }),
     };
   },
   computed: {
@@ -181,11 +253,14 @@ export default {
     console.log('i am mounted');
   },
   methods: {
+    close () {
+      this.$root.$emit('bv::hide::modal', 'create-group');
+    },
     changePage (page) {
       this.activePage = page;
-      window.scrollTo(0, 0);
     },
     createGroup () {
+      console.log('i am giving habitica money now');
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
@@ -215,6 +290,9 @@ export default {
 
       return null;
     },
+    onHide () {
+      this.sendingInProgress = false;
+    },
   },
 };
 </script>
diff --git a/website/client/src/components/group-plans/selectGroupTranslatedArray.vue b/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
new file mode 100644
index 0000000000..0b201f3d11
--- /dev/null
+++ b/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
@@ -0,0 +1,86 @@
+<template>
+  <div>
+    <select-list
+      :items="items"
+      :value="selected"
+      class="array-select"
+      :class="{disabled: disabled}"
+      :disabled="disabled"
+      :right="right"
+      :hide-icon="false"
+      :inline-dropdown="inlineDropdown"
+      @select="selectItem($event)"
+    >
+      <template v-slot:item="{ item }">
+        <span class="label">{{ $t(item) }}</span>
+      </template>
+    </select-list>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+</style>
+
+<style lang="scss">
+  @import '~@/assets/scss/colors.scss';
+
+  .array-select.disabled {
+    .btn-secondary:disabled, .btn-secondary.disabled, .dropdown >
+    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .dropdown >
+    .btn-secondary.dropdown-toggle:not(.btn-success).disabled, .show >
+    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .show >
+    .btn-secondary.dropdown-toggle:not(.btn-success).disabled {
+      background: $gray-700;
+    }
+
+    .dropdown-toggle::after {
+      color: $gray-300;
+      border-top-color: $gray-300;
+    }
+
+    .label {
+      color: $gray-200;
+    }
+  }
+
+  .array-select .disabled, .array-select .disabled:hover {
+    box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+  }
+</style>
+
+<script>
+import selectList from '@/components/ui/selectList';
+
+export default {
+  components: {
+    selectList,
+  },
+  props: {
+    items: {
+      type: Array,
+    },
+    disabled: {
+      type: Boolean,
+    },
+    value: [String, Number, Object],
+    right: {
+      type: Boolean,
+    },
+    inlineDropdown: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data () {
+    return {
+      selected: this.items.find(i => i === this.value),
+    };
+  },
+  methods: {
+    selectItem (item) {
+      this.selected = item;
+      this.$emit('select', item);
+    },
+  },
+};
+</script>
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 83f4a5adf1..4bc9bb2209 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
-    <group-plan-creation=modal />
+    <group-plan-creation-modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -115,7 +115,7 @@
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('group-plan-creation-modal')"
+              @click="launchModal('create-page')"
             >
               Create Your New Group
             </button>
@@ -399,14 +399,14 @@ export default {
   },
   methods: {
     launchModal () {
-      console.log('hello world');
-      this.changePage(this.PAGES.CREATE_GROUP);
-      this.$root.$emit('bv::show::modal', 'group-plan-creation-modal');
-    },
-    changePage (page) {
-      this.activePage = page;
-      window.scrollTo(0, 0);
+      console.log('i am creating a group');
+      // this.changePage(this.PAGES.CREATE_GROUP);
+      this.$root.$emit('bv::show::modal', 'create-group');
     },
+    // changePage (page) {
+    //   this.activePage = 'page';
+    //   window.scrollTo(0, 0);
+    // },
     createGroup () {
       this.changePage(this.PAGES.PAY);
     },
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index e6c0f943cc..034b5fae2a 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -341,6 +341,15 @@
   "exampleGroupName": "Example: Avengers Academy",
   "exampleGroupDesc": "For those selected to join the training academy for The Avengers Superhero Initiative",
   "thisGroupInviteOnly": "This group is invitation only.",
+  "createGroup": "Create a Group",
+  "groupUse": "Which best describes the use of your Group?*",
+  "groupUseDefault": "Choose an answer",
+  "groupParentChildren": "Parent(s) setting up tasks for children",
+  "groupCouple": "Couple sharing tasks",
+  "groupFriends": "Friends sharing tasks",
+  "groupCoworkers": "Coworkers sharing tasks",
+  "groupManager": "Manager setting up tasks for employees",
+  "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",

From edcb3f42891b6e73df9fa1984d08a23734557ccc Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 3 Aug 2022 12:07:30 -0400
Subject: [PATCH 06/36] update: making dropdown go with PROPS

---
 .../group-plans/groupPlanCreationModal.vue    | 73 +++++++++++-----
 .../selectGroupTranslatedArray.vue            | 86 -------------------
 website/common/locales/en/groups.json         |  2 +
 3 files changed, 54 insertions(+), 107 deletions(-)
 delete mode 100644 website/client/src/components/group-plans/selectGroupTranslatedArray.vue

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 6be98bffe8..1044693d81 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -13,13 +13,20 @@
     >
       <div
         class="modal-close"
-        @click="close()"
       >
         <div
-          class="icon-close"
-          v-html="icons.closeIcon"
+          class="cancel-text"
+          @click="close()"
         >
+          {{ $t('cancel') }}
         </div>
+        <button
+          class="btn btn-primary"
+          :value="$t('next')"
+          @click="close()"
+        >
+          {{ $t('next') }}
+        </button>
       </div>
       <h2>{{ $t('createGroup') }}</h2>
       <div class="form-group">
@@ -78,7 +85,7 @@
           <lockable-label
             :text="$t('groupUse')"
           />
-          <select-group-translated-array
+          <select-translated-array
             :items="[
               'groupUseDefault',
               'groupParentChildren',
@@ -128,6 +135,8 @@
 </template>
 
 <style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -168,7 +177,6 @@
     .modal-dialog {
       max-width: 448px;
     }
-
     .modal-content {
       width: 448px;
       border-radius: 8px;
@@ -177,24 +185,19 @@
     .modal-body{
       padding: 0px;
     }
-
     .modal-close {
       position: absolute;
       right: 16px;
       top: 16px;
       cursor: pointer;
 
-      .icon-close {
-        width: 18px;
-        height: 18px;
-        vertical-align: middle;
-
-        & ::v-deep svg path {
-          fill: #878190;
-        }
-         & :hover {
-          fill: #686274;
-        }
+      .cancel-text {
+        color: #2995cd;
+        font-size: 0.875rem;
+        min-height: 24px;
+        margin: 16px 0 0;
+        text-align: center;
+        cursor: pointer;
       }
     }
   }
@@ -204,17 +207,46 @@
 import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
-import selectGroupTranslatedArray from '@/components/group-plans/selectGroupTranslatedArray';
+import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
-import closeIcon from '@/assets/svg/close.svg';
 
 export default {
   components: {
     paymentsButtons,
-    selectGroupTranslatedArray,
+    selectTranslatedArray,
     lockableLabel,
   },
   mixins: [paymentsMixin],
+  props: {
+    groupUseDefault: {
+      type: String,
+      default: 'groupUseDefault',
+    },
+    groupParentChildren: {
+      type: String,
+      default: 'groupParentChildren',
+    },
+    groupCouple: {
+      type: String,
+      default: 'groupCouple',
+    },
+    groupFriends: {
+      type: String,
+      default: 'groupFriends',
+    },
+    groupCoworkers: {
+      type: String,
+      default: 'groupCoworkers',
+    },
+    groupManager: {
+      type: String,
+      default: 'groupManager',
+    },
+    groupTeacher: {
+      type: String,
+      default: 'groupTeacher',
+    },
+  },
   data () {
     return {
       amazonPayments: {},
@@ -239,7 +271,6 @@ export default {
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
       icons: Object.freeze({
-        closeIcon,
       }),
     };
   },
diff --git a/website/client/src/components/group-plans/selectGroupTranslatedArray.vue b/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
deleted file mode 100644
index 0b201f3d11..0000000000
--- a/website/client/src/components/group-plans/selectGroupTranslatedArray.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <div>
-    <select-list
-      :items="items"
-      :value="selected"
-      class="array-select"
-      :class="{disabled: disabled}"
-      :disabled="disabled"
-      :right="right"
-      :hide-icon="false"
-      :inline-dropdown="inlineDropdown"
-      @select="selectItem($event)"
-    >
-      <template v-slot:item="{ item }">
-        <span class="label">{{ $t(item) }}</span>
-      </template>
-    </select-list>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-</style>
-
-<style lang="scss">
-  @import '~@/assets/scss/colors.scss';
-
-  .array-select.disabled {
-    .btn-secondary:disabled, .btn-secondary.disabled, .dropdown >
-    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .dropdown >
-    .btn-secondary.dropdown-toggle:not(.btn-success).disabled, .show >
-    .btn-secondary.dropdown-toggle:not(.btn-success):disabled, .show >
-    .btn-secondary.dropdown-toggle:not(.btn-success).disabled {
-      background: $gray-700;
-    }
-
-    .dropdown-toggle::after {
-      color: $gray-300;
-      border-top-color: $gray-300;
-    }
-
-    .label {
-      color: $gray-200;
-    }
-  }
-
-  .array-select .disabled, .array-select .disabled:hover {
-    box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
-  }
-</style>
-
-<script>
-import selectList from '@/components/ui/selectList';
-
-export default {
-  components: {
-    selectList,
-  },
-  props: {
-    items: {
-      type: Array,
-    },
-    disabled: {
-      type: Boolean,
-    },
-    value: [String, Number, Object],
-    right: {
-      type: Boolean,
-    },
-    inlineDropdown: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data () {
-    return {
-      selected: this.items.find(i => i === this.value),
-    };
-  },
-  methods: {
-    selectItem (item) {
-      this.selected = item;
-      this.$emit('select', item);
-    },
-  },
-};
-</script>
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 034b5fae2a..dcc92184f6 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -351,6 +351,8 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
+  "next": "Next",
+  "cancel": "Cancel",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",
   "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",

From cff6c5674f231c4500a1e8f151289da19530c923 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 4 Aug 2022 17:26:04 -0400
Subject: [PATCH 07/36] update: add styling

---
 habitica-images                               |  2 +-
 .../group-plans/groupPlanCreationModal.vue    | 68 +++++++++++++------
 website/common/locales/en/groups.json         |  4 ++
 3 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/habitica-images b/habitica-images
index 58b8905b08..6e9d17b8a4 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 58b8905b0825159b6ba4eb5a37459b97bca79947
+Subproject commit 6e9d17b8a4af295ba2d9dc9870b2904035d6fba7
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 1044693d81..01e559ea1a 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -11,17 +11,18 @@
       v-if="activePage === PAGES.CREATE_GROUP"
       class="col-12"
     >
+      <!-- HEADER -->
       <div
         class="modal-close"
       >
-        <div
+        <span
           class="cancel-text"
           @click="close()"
         >
           {{ $t('cancel') }}
-        </div>
+        </span>
         <button
-          class="btn btn-primary"
+          class="btn btn-primary next-button"
           :value="$t('next')"
           @click="close()"
         >
@@ -29,31 +30,35 @@
         </button>
       </div>
       <h2>{{ $t('createGroup') }}</h2>
+
+      <!-- FORM -->
       <div class="form-group">
-        <label
-          class="control-label"
-          for="new-group-name"
-        >Name</label>
+        <lockable-label
+          :text="$t('nameStar')"
+        />
         <input
           id="new-group-name"
           v-model="newGroup.name"
           class="form-control input-medium option-content"
           required="required"
           type="text"
-          placeholder="Name"
+          :placeholder="$t('nameStarText')"
         >
       </div>
       <div class="form-group">
-        <label for="new-group-description">{{ $t('description') }}</label>
+        <lockable-label
+          for="new-group-description"
+          :text="$t('descriptionOptional')"
+        />
         <textarea
           id="new-group-description"
           v-model="newGroup.description"
           class="form-control option-content"
           cols="3"
-          :placeholder="$t('description')"
+          :placeholder="$t('descriptionOptionalText')"
         ></textarea>
       </div>
-      <div
+<!--       <div
         v-if="type === 'guild'"
         class="form-group"
       >
@@ -67,7 +72,7 @@
           >
           <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
         </div>
-      </div>
+      </div> -->
       <div class="form-group">
         <div class="custom-control custom-checkbox">
           <input
@@ -137,6 +142,31 @@
 <style lang="scss" scoped>
   @import '~@/assets/scss/colors.scss';
 
+  h2 {
+    color: $purple-300;
+    font-size: 1.25rem;
+    height: 28px;
+    width: 120px;
+    margin-top: 24px;
+    align-self: center;
+  }
+
+  .cancel-text {
+    color: $blue-10;
+    font-size: 0.875rem;
+    margin-right: 16px;
+    text-align: center;
+    cursor: pointer;
+  }
+  .next-button {
+    align-self: center;
+  }
+
+  .form-control::placeholder {
+    color: $gray-50;
+    height: 32px;
+  }
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -170,6 +200,7 @@
       vertical-align: bottom;
     }
   }
+
 </style>
 <style lang="scss">
   @import '~@/assets/scss/mixins.scss';
@@ -184,21 +215,14 @@
     }
     .modal-body{
       padding: 0px;
+      margin-left: 12px;
+      margin-right: 12px;
     }
     .modal-close {
       position: absolute;
       right: 16px;
-      top: 16px;
       cursor: pointer;
-
-      .cancel-text {
-        color: #2995cd;
-        font-size: 0.875rem;
-        min-height: 24px;
-        margin: 16px 0 0;
-        text-align: center;
-        cursor: pointer;
-      }
+      top: 0px;
     }
   }
 </style>
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index dcc92184f6..dee4012171 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -353,6 +353,10 @@
   "gettingStarted": "Getting Started",
   "next": "Next",
   "cancel": "Cancel",
+  "nameStar": "Name*",
+  "nameStarText": "Add a title",
+  "descriptionOptional": "Description",
+  "descriptionOptionalText": "Add a description",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",
   "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",

From 5d81c6389745a1a06f744e33dd099280b2624906 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 8 Aug 2022 16:36:14 -0400
Subject: [PATCH 08/36] update: upgrade groups sign up page (slightly)

---
 .../src/components/groups/groupPlan.vue       | 91 +++++++++----------
 1 file changed, 45 insertions(+), 46 deletions(-)

diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 4bc9bb2209..a96766c402 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -108,7 +108,7 @@
       >
         <div class="row">
           <h1 class="col-12 text-center purple-header">
-            Create your Group today!
+            Create Your Group Today!
           </h1>
         </div>
         <div class="row">
@@ -117,39 +117,33 @@
               class="btn btn-primary create-group"
               @click="launchModal('create-page')"
             >
-              Create Your New Group
+              Create Your New Group!
             </button>
           </div>
         </div>
-        <div class="row pricing">
-          <div class="col-5">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              9
-            </div>
-            <div class="name">
-              <div>Group Owner</div>
-              <div>Subscription</div>
-            </div>
+        <div class="row pricing justify-content-center align-items-center">
+          <div class="dollar">
+            $
           </div>
-          <div class="col-1">
-            <div class="plus">
-              +
-            </div>
+          <div class="number">
+            9
           </div>
-          <div class="col-6">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              3
-            </div>
-            <div class="name">
-              <div>Each Additional</div>
-              <div>Member</div>
-            </div>
+          <div class="name">
+            <div>Group Owner</div>
+            <div>Subscription</div>
+          </div>
+          <div class="plus">
+            +
+          </div>
+          <div class="dollar">
+            $
+          </div>
+          <div class="number">
+            3
+          </div>
+          <div class="name">
+            <div>Each Additional</div>
+            <div>Member</div>
           </div>
         </div>
       </div>
@@ -165,8 +159,8 @@
 
     .dollar {
       position: absolute;
-      left: -1em;
-      top: 1em;
+      left: -16px;
+      top: 16px;
     }
 
     .purple-box {
@@ -191,9 +185,9 @@
     background: #432874;
     background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
     color: #fff;
-    padding: 2em;
+    padding: 32px;
     height: 340px;
-    margin-bottom: 2em;
+    margin-bottom: 32px;
     margin-left: -12px;
     margin-right: -12px;
 
@@ -217,6 +211,7 @@
 
     .box {
       height: 416px;
+      border-radius: 8px;
     }
 
     h2 {
@@ -259,17 +254,19 @@
   button.create-group {
     width: 330px;
     height: 96px;
+    border-radius: 8px;
+    font-size: 1.5rem;
   }
 
   .purple-header {
     color: #6133b4;
     font-size: 48px;
-    margin-top: 1em;
+    margin-top: 16px;
   }
 
   .pricing {
-    margin-top: 2em;
-    margin-bottom: 4em;
+    margin-top: 32px;
+    margin-bottom: 64px;
 
     .dollar, .number, .name {
       display: inline-block;
@@ -278,35 +275,37 @@
     }
 
     .plus {
-      font-size: 34px;
+      font-size: 2.125rem;
       color: #a5a1ac;
+      margin-left: 16px;
+      margin-right: 16px;
     }
 
     .dollar {
-      margin-bottom: 1.5em;
-      font-size: 32px;
+      margin-bottom: 24px;
+      font-size: 2rem;
       font-weight: bold;
     }
 
     .name {
-      font-size: 24px;
-      margin-bottom: .8em;
-      margin-left: .5em;
+      font-size: 1.5rem;
+      margin-left: 8px;
+      margin-right: 8px;
     }
 
     .number {
-      font-size: 72px;
+      font-size: 4.5rem;
       font-weight: bolder;
     }
   }
 
   .payment-options {
-    margin-bottom: 4em;
+    margin-bottom: 64px;
 
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
-      padding: .5em;
+      padding: 8px;
       border-radius: 8px;
       width: 200px;
       height: 215px;
@@ -320,7 +319,7 @@
 
       .name {
         width: 100px;
-        margin-left: .3em;
+        margin-left: 4.8px;
       }
 
       .plus {

From cfd601e7bfd4d86051760b0943dd04815c1bc6e0 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 8 Aug 2022 17:16:41 -0400
Subject: [PATCH 09/36] update: styling and some function work

---
 .../group-plans/groupPlanCreationModal.vue    | 68 ++++++++++++-------
 website/common/locales/en/groups.json         |  1 +
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 01e559ea1a..d9a81ef7dc 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -24,6 +24,7 @@
         <button
           class="btn btn-primary next-button"
           :value="$t('next')"
+          :disabled="!newGroupIsReady"
           @click="close()"
         >
           {{ $t('next') }}
@@ -39,7 +40,7 @@
         <input
           id="new-group-name"
           v-model="newGroup.name"
-          class="form-control input-medium option-content"
+          class="form-control input-medium option-content name-input"
           required="required"
           type="text"
           :placeholder="$t('nameStarText')"
@@ -53,7 +54,7 @@
         <textarea
           id="new-group-description"
           v-model="newGroup.description"
-          class="form-control option-content"
+          class="form-control option-content description-input"
           cols="3"
           :placeholder="$t('descriptionOptionalText')"
         ></textarea>
@@ -86,24 +87,28 @@
             for="create-group-leaderOnlyChallenges-checkbox"
           >{{ $t('leaderOnlyChallenges') }}</label>
         </div>
-        <div class="form-group">
-          <lockable-label
-            :text="$t('groupUse')"
-          />
-          <select-translated-array
-            :items="[
-              'groupUseDefault',
-              'groupParentChildren',
-              'groupCouple',
-              'groupFriends',
-              'groupCoworkers',
-              'groupManager',
-              'groupTeacher'
-            ]"
-            :value="groupUseDefault"
-            @select="groupUseDefault"
-          />
-        </div>
+      </div>
+      <div class="form-group">
+        <lockable-label
+          :text="$t('groupUse')"
+        />
+        <select-translated-array
+          v-model="newGroup.demographics"
+          :items="[
+            'groupUseDefault',
+            'groupParentChildren',
+            'groupCouple',
+            'groupFriends',
+            'groupCoworkers',
+            'groupManager',
+            'groupTeacher'
+          ]"
+          :value="groupUseDefault"
+          class="group-input"
+          @select="groupUseDefault"
+        />
+        <!-- need to figure out what goes in @select
+          there's an error being thrown in the component, perhaps I can't reuse it?   -->
       </div>
       <div
         v-if="type === 'party'"
@@ -117,11 +122,11 @@
       </div>
       <div class="form-group">
         <button
-          class="btn btn-primary btn-lg btn-block"
+          class="btn btn-primary btn-lg btn-block btn-payment"
           :disabled="!newGroupIsReady"
           @click="createGroup()"
         >
-          {{ $t('create') }}
+          {{ $t('nextPaymentMethod') }}
         </button>
       </div>
     </div>
@@ -167,6 +172,22 @@
     height: 32px;
   }
 
+  .name-input, .description-input, .group-input {
+    margin-top: -4px;
+  }
+
+  .description-input {
+    height: 56px;
+  }
+
+  .spacer {
+    margin-bottom: 16px !important;
+  }
+
+  .btn-payment {
+    margin-top: 1.5rem;
+  }
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -291,6 +312,7 @@ export default {
         leaderOnly: {
           challenges: false,
         },
+        demographics: '',
       },
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
@@ -301,7 +323,7 @@ export default {
   computed: {
     ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
-      return Boolean(this.newGroup.name);
+      return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
     },
   },
   mounted () {
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index dee4012171..1f824f7448 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -357,6 +357,7 @@
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",
   "descriptionOptionalText": "Add a description",
+  "nextPaymentMethod": "Next: Payment Method",
   "congratsOnGroupPlan": "Congratulations on creating your new Group! Here are a few answers to some of the more commonly asked questions.",
   "whatsIncludedGroup": "What's included in the subscription",
   "whatsIncludedGroupDesc": "All members of the Group receive full subscription benefits, including the monthly subscriber items, the ability to buy Gems with Gold, and the Royal Purple Jackalope mount, which is exclusive to users with a Group Plan membership.",

From 8d1f7e77edfd049018f6959faa06383a14475ba5 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 10 Aug 2022 14:00:46 -0400
Subject: [PATCH 10/36] update: styling and dropdown

---
 .../group-plans/groupPlanCreationModal.vue    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index d9a81ef7dc..4d87ca5969 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -95,7 +95,6 @@
         <select-translated-array
           v-model="newGroup.demographics"
           :items="[
-            'groupUseDefault',
             'groupParentChildren',
             'groupCouple',
             'groupFriends',
@@ -103,12 +102,11 @@
             'groupManager',
             'groupTeacher'
           ]"
-          :value="groupUseDefault"
+          :placeholder="$t('groupUseDefault')"
           class="group-input"
-          @select="groupUseDefault"
+          :value="newGroup.demographics"
+          @select="newGroup.demographics = $event"
         />
-        <!-- need to figure out what goes in @select
-          there's an error being thrown in the component, perhaps I can't reuse it?   -->
       </div>
       <div
         v-if="type === 'party'"
@@ -185,7 +183,8 @@
   }
 
   .btn-payment {
-    margin-top: 1.5rem;
+    margin: 24px 112px 24px 112px;
+    width: 177px;
   }
 
   .payment-options {
@@ -263,10 +262,10 @@ export default {
   },
   mixins: [paymentsMixin],
   props: {
-    groupUseDefault: {
-      type: String,
-      default: 'groupUseDefault',
-    },
+    // groupUseDefault: {
+    //   type: String,
+    //   default: 'groupUseDefault',
+    // },
     groupParentChildren: {
       type: String,
       default: 'groupParentChildren',
@@ -312,7 +311,7 @@ export default {
         leaderOnly: {
           challenges: false,
         },
-        demographics: '',
+        demographics: null,
       },
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this

From e3c552dd5419088afe2c7d2889cf30405549b7d8 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 10 Aug 2022 14:59:19 -0500
Subject: [PATCH 11/36] WIP(dropdown): add placeholder text

---
 .../group-plans/groupPlanCreationModal.vue    | 33 +------------------
 .../modal-controls/selectTranslatedArray.vue  |  4 +++
 .../client/src/components/ui/selectList.vue   |  5 ++-
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 4d87ca5969..2c95562fcb 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -93,7 +93,6 @@
           :text="$t('groupUse')"
         />
         <select-translated-array
-          v-model="newGroup.demographics"
           :items="[
             'groupParentChildren',
             'groupCouple',
@@ -102,8 +101,8 @@
             'groupManager',
             'groupTeacher'
           ]"
-          :placeholder="$t('groupUseDefault')"
           class="group-input"
+          :placeholder="'groupUseDefault'"
           :value="newGroup.demographics"
           @select="newGroup.demographics = $event"
         />
@@ -261,36 +260,6 @@ export default {
     lockableLabel,
   },
   mixins: [paymentsMixin],
-  props: {
-    // groupUseDefault: {
-    //   type: String,
-    //   default: 'groupUseDefault',
-    // },
-    groupParentChildren: {
-      type: String,
-      default: 'groupParentChildren',
-    },
-    groupCouple: {
-      type: String,
-      default: 'groupCouple',
-    },
-    groupFriends: {
-      type: String,
-      default: 'groupFriends',
-    },
-    groupCoworkers: {
-      type: String,
-      default: 'groupCoworkers',
-    },
-    groupManager: {
-      type: String,
-      default: 'groupManager',
-    },
-    groupTeacher: {
-      type: String,
-      default: 'groupTeacher',
-    },
-  },
   data () {
     return {
       amazonPayments: {},
diff --git a/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue b/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue
index 0b201f3d11..21e0cad24f 100644
--- a/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue
+++ b/website/client/src/components/tasks/modal-controls/selectTranslatedArray.vue
@@ -9,6 +9,7 @@
       :right="right"
       :hide-icon="false"
       :inline-dropdown="inlineDropdown"
+      :placeholder="placeholder"
       @select="selectItem($event)"
     >
       <template v-slot:item="{ item }">
@@ -70,6 +71,9 @@ export default {
       type: Boolean,
       default: true,
     },
+    placeholder: {
+      type: String,
+    },
   },
   data () {
     return {
diff --git a/website/client/src/components/ui/selectList.vue b/website/client/src/components/ui/selectList.vue
index c5607b1e60..1d8c93cca2 100644
--- a/website/client/src/components/ui/selectList.vue
+++ b/website/client/src/components/ui/selectList.vue
@@ -12,7 +12,7 @@
       <template v-slot:button-content>
         <slot
           name="item"
-          :item="selected"
+          :item="selected || placeholder"
           :button="true"
         >
           <!-- Fallback content -->
@@ -114,6 +114,9 @@ export default {
       type: Boolean,
       default: true,
     },
+    placeholder: {
+      type: String,
+    },
   },
   data () {
     return {

From a07c2e6268997b17a100b78a349cbf4c16bb8dc5 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 10 Aug 2022 16:48:09 -0400
Subject: [PATCH 12/36] update: dropdown and delete duplicated file

---
 .../group-plans/groupPlanCreationModal.vue    |  40 +--
 .../groups/groupPlanCreationModal.vue         | 230 ------------------
 2 files changed, 9 insertions(+), 261 deletions(-)
 delete mode 100644 website/client/src/components/groups/groupPlanCreationModal.vue

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 2c95562fcb..fde0ec2d9f 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -25,7 +25,7 @@
           class="btn btn-primary next-button"
           :value="$t('next')"
           :disabled="!newGroupIsReady"
-          @click="close()"
+          @click="createGroup()"
         >
           {{ $t('next') }}
         </button>
@@ -59,21 +59,6 @@
           :placeholder="$t('descriptionOptionalText')"
         ></textarea>
       </div>
-<!--       <div
-        v-if="type === 'guild'"
-        class="form-group"
-      >
-        <div class="custom-control custom-radio">
-          <input
-            v-model="newGroup.privacy"
-            class="custom-control-input"
-            type="radio"
-            name="new-group-privacy"
-            value="private"
-          >
-          <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-        </div>
-      </div> -->
       <div class="form-group">
         <div class="custom-control custom-checkbox">
           <input
@@ -104,19 +89,8 @@
           class="group-input"
           :placeholder="'groupUseDefault'"
           :value="newGroup.demographics"
-          @select="newGroup.demographics = $event"
         />
       </div>
-      <div
-        v-if="type === 'party'"
-        class="form-group"
-      >
-        <button
-          class="btn btn-secondary form-control"
-          :value="$t('create')"
-          @click="createGroup()"
-        ></button>
-      </div>
       <div class="form-group">
         <button
           class="btn btn-primary btn-lg btn-block btn-payment"
@@ -127,9 +101,10 @@
         </button>
       </div>
     </div>
+    <!-- PAYMENT -->
     <div
       v-if="activePage === PAGES.PAY"
-      class="col-12"
+      class="col-12 payments"
     >
       <div class="text-center">
         <payments-buttons
@@ -186,6 +161,10 @@
     width: 177px;
   }
 
+  .payments {
+    padding: 24px;
+  }
+
   .payment-options {
     margin-bottom: 4em;
 
@@ -284,14 +263,12 @@ export default {
       },
       activePage: 'create-group',
       type: 'guild', // Guild or Party @TODO enum this
-      icons: Object.freeze({
-      }),
     };
   },
   computed: {
     ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
-      return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
+      return Boolean(this.newGroup.name);
     },
   },
   mounted () {
@@ -307,6 +284,7 @@ export default {
     createGroup () {
       console.log('i am giving habitica money now');
       this.changePage(this.PAGES.PAY);
+      console.log(this.newGroup);
     },
     pay (paymentMethod) {
       const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
diff --git a/website/client/src/components/groups/groupPlanCreationModal.vue b/website/client/src/components/groups/groupPlanCreationModal.vue
deleted file mode 100644
index 2a71afd919..0000000000
--- a/website/client/src/components/groups/groupPlanCreationModal.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
-    >
-      <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
-      >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
-          <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
-          >
-        </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
-          >
-            {{ $t('create') }}
-          </button>
-        </div>
-      </div>
-      <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
-      >
-        <div class="text-center">
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
-      </div>
-    </b-modal>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-  .payment-options {
-    margin-bottom: 4em;
-
-    .purple-box {
-      background-color: #4f2a93;
-      color: #fff;
-      padding: .5em;
-      border-radius: 8px;
-      width: 200px;
-      height: 215px;
-
-      .dollar {
-      }
-
-      .number {
-        font-size: 60px;
-      }
-
-      .name {
-        width: 100px;
-        margin-left: .3em;
-      }
-
-      .plus {
-        width: 100%;
-        text-align: center;
-      }
-
-      div {
-        display: inline-block;
-      }
-    }
-
-    .box, .purple-box {
-      display: inline-block;
-      vertical-align: bottom;
-    }
-  }
-</style>
-
-<script>
-import paymentsMixin from '../../mixins/payments';
-import { mapState } from '@/libs/store';
-import positiveIcon from '@/assets/svg/positive.svg';
-import paymentsButtons from '@/components/payments/buttons/list';
-
-export default {
-  components: {
-    paymentsButtons,
-  },
-  mixins: [paymentsMixin],
-  data () {
-    return {
-      amazonPayments: {},
-      icons: Object.freeze({
-        positiveIcon,
-      }),
-      PAGES: {
-        CREATE_GROUP: 'create-group',
-        UPGRADE_GROUP: 'upgrade-group',
-        PAY: 'pay',
-      },
-      PAYMENTS: {
-        AMAZON: 'amazon',
-        STRIPE: 'stripe',
-      },
-      paymentMethod: '',
-      newGroup: {
-        type: 'guild',
-        privacy: 'private',
-        name: '',
-        leaderOnly: {
-          challenges: false,
-        },
-      },
-      activePage: '',
-      type: 'guild', // Guild or Party @TODO enum this
-    };
-  },
-  computed: {
-    newGroupIsReady () {
-      return Boolean(this.newGroup.name);
-    },
-    upgradingGroup () {
-      return this.$store.state.upgradingGroup;
-    },
-    // @TODO: can we move this to payment mixin?
-    ...mapState({ user: 'user.data' }),
-  },
-  mounted () {
-    this.activePage = this.PAGES.BENEFITS;
-    this.$store.dispatch('common:setTitle', {
-      section: this.$t('groupPlans'),
-    });
-  },
-  methods: {
-    createGroup () {
-      this.changePage(this.PAGES.PAY);
-    },
-    pay (paymentMethod) {
-      const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
-      const paymentData = {
-        subscription: subscriptionKey,
-        coupon: null,
-      };
-
-      if (this.upgradingGroup && this.upgradingGroup._id) {
-        paymentData.groupId = this.upgradingGroup._id;
-        paymentData.group = this.upgradingGroup;
-      } else {
-        paymentData.groupToCreate = this.newGroup;
-      }
-
-      this.paymentMethod = paymentMethod;
-
-      if (this.paymentMethod === this.PAYMENTS.AMAZON) {
-        paymentData.type = 'subscription';
-        return paymentData;
-      }
-
-      if (this.paymentMethod === this.PAYMENTS.STRIPE) {
-        this.redirectToStripe(paymentData);
-      }
-
-      return null;
-    },
-  },
-};
-</script>

From 0435e3537a2fd6902823742f4a01b13c3b0449c8 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 11 Aug 2022 16:39:49 -0400
Subject: [PATCH 13/36] update: add temp button & function for triggering
 success modal; add comments

---
 habitica-images                               |  2 +-
 .../group-plans/groupPlanCreationModal.vue    | 33 ++++++++++++++-----
 .../src/components/groups/groupPlan.vue       |  2 ++
 .../src/components/payments/successModal.vue  |  6 ++--
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/habitica-images b/habitica-images
index 6e9d17b8a4..6610fcd017 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 6e9d17b8a4af295ba2d9dc9870b2904035d6fba7
+Subproject commit 6610fcd01761149ce5391cbe85a249fd80d7983c
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index fde0ec2d9f..cf837b13e5 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -89,6 +89,7 @@
           class="group-input"
           :placeholder="'groupUseDefault'"
           :value="newGroup.demographics"
+          @select="newGroup.demographics = $event"
         />
       </div>
       <div class="form-group">
@@ -102,6 +103,7 @@
       </div>
     </div>
     <!-- PAYMENT -->
+    <!-- @TODO: Separate payment into a separate modal -->
     <div
       v-if="activePage === PAGES.PAY"
       class="col-12 payments"
@@ -112,6 +114,13 @@
           :amazon-data="pay(PAYMENTS.AMAZON)"
         />
       </div>
+      <!-- TEMPORARY BUTTON FOR TESTING -->
+      <button
+        class="btn btn-primary btn-payment"
+        @click="success()"
+      >
+        Clicky click click!
+      </button>
     </div>
   </b-modal>
 </template>
@@ -244,7 +253,7 @@ export default {
       amazonPayments: {},
       PAGES: {
         CREATE_GROUP: 'create-group',
-        UPGRADE_GROUP: 'upgrade-group',
+        // UPGRADE_GROUP: 'upgrade-group',
         PAY: 'pay',
       },
       PAYMENTS: {
@@ -262,18 +271,15 @@ export default {
         demographics: null,
       },
       activePage: 'create-group',
-      type: 'guild', // Guild or Party @TODO enum this
+      type: 'guild',
     };
   },
   computed: {
     ...mapState({ user: 'user.data' }),
     newGroupIsReady () {
-      return Boolean(this.newGroup.name);
+      return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
     },
   },
-  mounted () {
-    console.log('i am mounted');
-  },
   methods: {
     close () {
       this.$root.$emit('bv::hide::modal', 'create-group');
@@ -282,9 +288,8 @@ export default {
       this.activePage = page;
     },
     createGroup () {
-      console.log('i am giving habitica money now');
-      this.changePage(this.PAGES.PAY);
       console.log(this.newGroup);
+      this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
       const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
@@ -313,9 +318,21 @@ export default {
 
       return null;
     },
+    // need to figure out where/how to create the event in amplitude
+    // right now being sent to console in success()
+    sendAnalytics () {
+      return this.newGroup.demographics;
+    },
     onHide () {
       this.sendingInProgress = false;
     },
+    // temporary function to go with temporary button
+    success () {
+      console.log(this.sendAnalytics());
+      this.sendAnalytics();
+      this.$root.$emit('bv::hide::modal', 'create-group');
+      this.$root.$emit('bv::show::modal', 'payments-success-modal');
+    },
   },
 };
 </script>
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index a96766c402..a4667cc7a2 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -52,6 +52,7 @@
           </div>
         </div>
       </div>
+      <!-- Upgrading an existing group -->
       <div
         v-if="upgradingGroup._id"
         id="upgrading-group"
@@ -102,6 +103,7 @@
           </div>
         </div>
       </div>
+      <!-- Create a new group -->
       <div
         v-if="!upgradingGroup._id"
         class="container col-6 offset-3 create-option"
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index c816a3300d..2e0af41cdb 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -124,14 +124,14 @@
   border-bottom: none;
 
   h2 {
-    color: white;
+    color: $green-1;
   }
 
   .check-container {
     width: 64px;
     height: 64px;
     border-radius: 50%;
-    background: #1CA372;
+    background: $green-1;
     margin: 0 auto;
     margin-bottom: 16px;
   }
@@ -139,7 +139,7 @@
   .check {
     width: 35.1px;
     height: 28px;
-    color: white;
+    color: $white;
   }
 }
 

From e08d0f4016582cbd13150ef0f67b1a8c701ae3a7 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 12 Aug 2022 16:44:58 -0400
Subject: [PATCH 14/36] update: style changes, add upgraded group demographics
 to success modal, add description counter

---
 website/client/src/assets/scss/form.scss      | 20 +++++----
 .../group-plans/groupPlanCreationModal.vue    | 23 ++++++++++
 .../src/components/payments/successModal.vue  | 45 +++++++++++++++++++
 website/common/locales/en/groups.json         |  2 +-
 4 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/website/client/src/assets/scss/form.scss b/website/client/src/assets/scss/form.scss
index 8e21bc06a4..b161472271 100644
--- a/website/client/src/assets/scss/form.scss
+++ b/website/client/src/assets/scss/form.scss
@@ -180,8 +180,8 @@ input, textarea, input.form-control, textarea.form-control {
 }
 
 // used in checkboxes and radios
-$bg-focused-active-control: #4f2993;
-$bg-disabled-control: #34303a;
+$bg-focused-active-control: $purple-200;
+$bg-disabled-control: $gray-10;
 
 // custom control
 .custom-control {
@@ -231,17 +231,21 @@ $bg-disabled-control: #34303a;
       background-color: inherit;
     }
 
-    &:focus:not(:checked):not(:disabled)~.custom-control-label::before, &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
-      box-shadow: 0 0 0 6px rgba($bg-focused-active-control, 0.1);
+    &:focus:not(:checked):not(:disabled)~.custom-control-label::before, 
+    &:active:not(:checked):not(:disabled)~.custom-control-label::before  {
+      border: 2px solid $gray-300;
+      box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5);
     }
 
-    &:focus:checked:not(:disabled)~.custom-control-label::before, &:active:checked:not(:disabled)~.custom-control-label::before  {
-      box-shadow: 0 0 0 6px rgba($bg-focused-active-control, 0.1);
-      border-color: $purple-400;
+    &:focus:checked:not(:disabled)~.custom-control-label::before, 
+    &:active:checked:not(:disabled)~.custom-control-label::before  {
+      box-shadow: 0 0 0 2px rgba(146, 92, 243, 0.5);
+      border-color: 2 px solid $purple-400;
       background-color: $purple-400;
     }
 
-    &:focus:disabled~.custom-control-label::before, &:active:disabled~.custom-control-label::before  {
+    &:focus:disabled~.custom-control-label::before, 
+    &:active:disabled~.custom-control-label::before  {
       box-shadow: 0 0 0 6px rgba($bg-disabled-control, 0.1);
     }
 
diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index cf837b13e5..5c2158e579 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -50,13 +50,18 @@
         <lockable-label
           for="new-group-description"
           :text="$t('descriptionOptional')"
+          class="description-label"
         />
+        <div class="characters-remaining">
+          {{ $t('charactersRemaining', {characters: charactersRemaining}) }}
+        </div>
         <textarea
           id="new-group-description"
           v-model="newGroup.description"
           class="form-control option-content description-input"
           cols="3"
           :placeholder="$t('descriptionOptionalText')"
+          maxlength="250"
         ></textarea>
       </div>
       <div class="form-group">
@@ -153,10 +158,22 @@
     height: 32px;
   }
 
+  .description-label {
+    margin-bottom: -24px;
+  }
+
   .name-input, .description-input, .group-input {
     margin-top: -4px;
   }
 
+ .characters-remaining {
+  color: $gray-100;
+  font-size: 0.75rem;
+  line-height: 1.33;
+  text-align: right;
+  margin-bottom: 12px;
+ }
+
   .description-input {
     height: 56px;
   }
@@ -217,6 +234,7 @@
     }
     .modal-content {
       width: 448px;
+      height: 436px;
       border-radius: 8px;
       box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
     }
@@ -265,6 +283,7 @@ export default {
         type: 'guild',
         privacy: 'private',
         name: '',
+        description: '',
         leaderOnly: {
           challenges: false,
         },
@@ -279,6 +298,10 @@ export default {
     newGroupIsReady () {
       return Boolean(this.newGroup.name) && Boolean(this.newGroup.demographics);
     },
+    charactersRemaining () {
+      const currentLength = this.newGroup.description ? this.newGroup.description.length : 0;
+      return 250 - currentLength;
+    },
   },
   methods: {
     close () {
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 2e0af41cdb..bc96b35f03 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -85,6 +85,38 @@
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
+          <div
+            v-if="paymentData.paymentType === 'groupPlan'
+              && paymentData.newGroup === 'groupPlanUpgraded'"
+            class="form-group"
+          >
+            <lockable-label
+              :text="$t('groupUse')"
+              class="justify-content-center"
+            />
+            <select-translated-array
+              :items="[
+                'groupParentChildren',
+                'groupCouple',
+                'groupFriends',
+                'groupCoworkers',
+                'groupManager',
+                'groupTeacher'
+              ]"
+              class="group-input"
+              :placeholder="'groupUseDefault'"
+              :value="newGroup.demographics"
+              @select="newGroup.demographics = $event"
+            />
+          </div>
+          <div class="form-group">
+            <button
+              class="btn btn-primary btn-lg btn-block btn-payment"
+              @click="closeGroup()"
+            >
+              {{ $t('submit') }}
+            </button>
+          </div>
         </template>
         <button
           v-once
@@ -200,6 +232,9 @@
   .small-text {
     font-style: normal;
   }
+  .group-input {
+    margin-top: -4px;
+  }
 }
 </style>
 
@@ -207,10 +242,16 @@
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
+import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
+import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
 
 export default {
   data () {
     return {
+      components: {
+        selectTranslatedArray,
+        lockableLabel,
+      },
       icons: Object.freeze({
         check: checkIcon,
         gem: gemIcon,
@@ -246,6 +287,10 @@ export default {
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
+    closeGroup () {
+      this.close();
+      return this.groupName.analytics; // this needs to go to Amplitude somehow
+    },
   },
 };
 </script>
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 1f824f7448..2907b58c07 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -214,7 +214,7 @@
   "userIsClamingTask": "`<%= username %> has claimed:` <%= task %>",
   "approvalRequested": "Approval Requested",
   "cantDeleteAssignedGroupTasks": "Can't delete group tasks that are assigned to you.",
-  "groupPlanUpgraded": "<strong><%- groupName %></strong> was upgraded to a Group Plan!",
+  "groupPlanUpgraded": "<strong><%- groupName %></strong> was successfully upgraded to a Group Plan!",
   "groupPlanCreated": "<strong><%- groupName %></strong> was created!",
   "onlyGroupLeaderCanInviteToGroupPlan": "Only the group leader can invite users to a group with a subscription.",
   "paymentDetails": "Payment Details",

From d70dd2e6dd8d6f0e041e9000fcd3d3b741181ddb Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 15 Aug 2022 17:13:51 -0400
Subject: [PATCH 15/36] update: add analytics event upon group creation/upgrade
 (temp code & console.logs commented out)

---
 .../group-plans/groupPlanCreationModal.vue    | 27 ++++++++++++-------
 .../src/components/payments/successModal.vue  | 11 +++++---
 website/client/src/mixins/payments.js         |  5 ++++
 website/server/libs/payments/subscriptions.js |  7 +++++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 5c2158e579..cf85712ba6 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -120,12 +120,12 @@
         />
       </div>
       <!-- TEMPORARY BUTTON FOR TESTING -->
-      <button
+<!--       <button
         class="btn btn-primary btn-payment"
         @click="success()"
       >
         Clicky click click!
-      </button>
+      </button> -->
     </div>
   </b-modal>
 </template>
@@ -234,7 +234,7 @@
     }
     .modal-content {
       width: 448px;
-      height: 436px;
+      max-height: 436px;
       border-radius: 8px;
       box-shadow: 0 14px 28px 0 rgba(26, 24, 29, 0.24), 0 10px 10px 0 rgba(26, 24, 29, 0.28);
     }
@@ -277,6 +277,7 @@ export default {
       PAYMENTS: {
         AMAZON: 'amazon',
         STRIPE: 'stripe',
+        // OTHER: 'tempcode', // TEMP CODE
       },
       paymentMethod: '',
       newGroup: {
@@ -316,9 +317,11 @@ export default {
     },
     pay (paymentMethod) {
       const subscriptionKey = 'group_monthly'; // @TODO: Get from content API?
+      const demographicsKey = this.newGroup.demographics;
       const paymentData = {
         subscription: subscriptionKey,
         coupon: null,
+        demographics: demographicsKey,
       };
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
@@ -339,6 +342,11 @@ export default {
         this.redirectToStripe(paymentData);
       }
 
+      // TEMP CODE
+      if (this.paymentMethod === this.PAYMENTS.OTHER) {
+        console.log(paymentData);
+      }
+
       return null;
     },
     // need to figure out where/how to create the event in amplitude
@@ -350,12 +358,13 @@ export default {
       this.sendingInProgress = false;
     },
     // temporary function to go with temporary button
-    success () {
-      console.log(this.sendAnalytics());
-      this.sendAnalytics();
-      this.$root.$emit('bv::hide::modal', 'create-group');
-      this.$root.$emit('bv::show::modal', 'payments-success-modal');
-    },
+    // success () {
+    //   this.pay(this.PAYMENTS.OTHER);
+    //   console.log(this.sendAnalytics());
+    //   this.sendAnalytics();
+    //   this.$root.$emit('bv::hide::modal', 'create-group');
+    //   this.$root.$emit('bv::show::modal', 'payments-success-modal');
+    // },
   },
 };
 </script>
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index bc96b35f03..805013db51 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -105,8 +105,8 @@
               ]"
               class="group-input"
               :placeholder="'groupUseDefault'"
-              :value="newGroup.demographics"
-              @select="newGroup.demographics = $event"
+              :value="upgradedGroup.demographics"
+              @select="upgradedGroup.demographics = $event"
             />
           </div>
           <div class="form-group">
@@ -119,7 +119,7 @@
           </div>
         </template>
         <button
-          v-once
+          v-else
           class="btn btn-primary"
           @click="close()"
         >
@@ -257,6 +257,9 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
+      upgradedGroup: {
+        demographics: null,
+      },
     };
   },
   computed: {
@@ -288,8 +291,8 @@ export default {
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
     closeGroup () {
+      console.log(this.updatedGroup.demographics);
       this.close();
-      return this.groupName.analytics; // this needs to go to Amplitude somehow
     },
   },
 };
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
index bce95ff76d..5b8a1439a5 100644
--- a/website/client/src/mixins/payments.js
+++ b/website/client/src/mixins/payments.js
@@ -140,6 +140,7 @@ export default {
       if (data.subscription) postData.sub = sub.key;
       if (data.coupon) postData.coupon = data.coupon;
       if (data.groupId) postData.groupId = data.groupId;
+      if (data.demographics) postData.demographics = data.demographics;
 
       const response = await axios.post(url, postData);
 
@@ -267,6 +268,10 @@ export default {
         this.amazonPayments.groupToCreate = data.groupToCreate;
       }
 
+      if (data.demographics) { // sending demographics
+        this.amazonPayments.demographics = data.demographics;
+      }
+
       this.amazonPayments.gift = data.gift;
       this.amazonPayments.type = data.type;
     },
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index eaee4d9803..2052dc4c9a 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -86,6 +86,13 @@ async function createSubscription (data) {
       user: data.user, groupId: data.groupId, populateLeader: false, groupFields,
     });
 
+    if (group) {
+      analytics.track(
+        this.groupID,
+        data.demographics,
+      );
+    }
+
     if (!group) {
       throw new NotFound(shared.i18n.t('groupNotFound'));
     }

From 40f433b0996325070b9d7b579e0affac0e531705 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 25 Aug 2022 15:47:24 -0400
Subject: [PATCH 16/36] update: work on success modal

---
 .../src/components/payments/successModal.vue  | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 805013db51..a5945d96ee 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -65,10 +65,13 @@
             ></span>
           </div>
         </template>
-        <template v-if="paymentData.paymentType === 'groupPlan'">
+        <!-- not sure this is right -->
+        <template
+          v-if="paymentData.paymentType === 'groupPlan'
+            && paymentData.paymentType === 'newGroup'"
+        >
           <span
-            v-html="$t(paymentData.newGroup
-              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
+            v-html="$t('groupPlanCreated', {groupName: paymentData.group.name})"
           ></span>
           <div class="details-block">
             <span
@@ -77,6 +80,7 @@
             ></span>
           </div>
         </template>
+
         <template
           v-if="paymentData.paymentType === 'groupPlan'
             || paymentData.paymentType === 'subscription'"
@@ -85,11 +89,26 @@
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
+        </template>
+        <!-- not sure this is right -->
+        <template
+          v-if="paymentData.newGroup === 'groupPlanUpgraded'
+            && paymentData.paymentType === 'upgradedGroup'"
+        >
+          <span
+            v-html="$t('groupPlanUpdated', {groupName: paymentData.group.name})"
+          ></span>
+          <div class="details-block">
+            <span
+              v-html="$t('paymentSubBilling', {
+                amount: groupPlanCost, months: paymentData.subscription.months})"
+            ></span>
+          </div>
           <div
-            v-if="paymentData.paymentType === 'groupPlan'
-              && paymentData.newGroup === 'groupPlanUpgraded'"
             class="form-group"
           >
+            <span>{{ $t('groupUse') }}</span>
+            <p>this is text</p>
             <lockable-label
               :text="$t('groupUse')"
               class="justify-content-center"
@@ -108,11 +127,9 @@
               :value="upgradedGroup.demographics"
               @select="upgradedGroup.demographics = $event"
             />
-          </div>
-          <div class="form-group">
             <button
               class="btn btn-primary btn-lg btn-block btn-payment"
-              @click="closeGroup()"
+              @click="close()"
             >
               {{ $t('submit') }}
             </button>
@@ -257,7 +274,11 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
+      newGroup: {
+        name: '',
+      },
       upgradedGroup: {
+        name: '',
         demographics: null,
       },
     };
@@ -287,13 +308,10 @@ export default {
   },
   methods: {
     close () {
+      console.log(this.upgradedGroup.demographics);
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
-    closeGroup () {
-      console.log(this.updatedGroup.demographics);
-      this.close();
-    },
   },
 };
 </script>

From 8a809c382877aa4addc4d46bfedf07629092d3b3 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 26 Aug 2022 17:58:51 -0400
Subject: [PATCH 17/36] update: work on success modal, update to payment mixin
 to calculate monthly billing date

---
 .../group-plans/groupPlanCreationModal.vue    |   6 +-
 .../src/components/payments/successModal.vue  | 115 ++++++++----------
 website/client/src/mixins/payments.js         |   7 ++
 3 files changed, 58 insertions(+), 70 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index cf85712ba6..5b63bafb93 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -343,9 +343,9 @@ export default {
       }
 
       // TEMP CODE
-      if (this.paymentMethod === this.PAYMENTS.OTHER) {
-        console.log(paymentData);
-      }
+      // if (this.paymentMethod === this.PAYMENTS.OTHER) {
+      //   console.log(paymentData);
+      // }
 
       return null;
     },
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index a5945d96ee..3044313222 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -65,53 +65,28 @@
             ></span>
           </div>
         </template>
-        <!-- not sure this is right -->
-        <template
-          v-if="paymentData.paymentType === 'groupPlan'
-            && paymentData.paymentType === 'newGroup'"
-        >
+        <template v-if="paymentData.paymentType === 'groupPlan'">
           <span
-            v-html="$t('groupPlanCreated', {groupName: paymentData.group.name})"
+            v-html="$t(paymentData.newGroup
+              ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
           ></span>
-          <div class="details-block">
+<!--           <div class="details-block">
             <span
               v-html="$t('paymentSubBilling', {
                 amount: groupPlanCost, months: paymentData.subscription.months})"
             ></span>
-          </div>
-        </template>
-
-        <template
-          v-if="paymentData.paymentType === 'groupPlan'
-            || paymentData.paymentType === 'subscription'"
-        >
-          <span
-            v-once
-            class="small-text auto-renew"
-          >{{ $t('paymentAutoRenew') }}</span>
-        </template>
-        <!-- not sure this is right -->
-        <template
-          v-if="paymentData.newGroup === 'groupPlanUpgraded'
-            && paymentData.paymentType === 'upgradedGroup'"
-        >
-          <span
-            v-html="$t('groupPlanUpdated', {groupName: paymentData.group.name})"
-          ></span>
-          <div class="details-block">
-            <span
-              v-html="$t('paymentSubBilling', {
-                amount: groupPlanCost, months: paymentData.subscription.months})"
-            ></span>
-          </div>
+          </div> -->
           <div
+            v-if="!paymentData.newGroup"
             class="form-group"
           >
-            <span>{{ $t('groupUse') }}</span>
-            <p>this is text</p>
+            <div class="details-block">
+              <span>
+                Your next billing date is <strong>{{ dateRenewal }}</strong>.
+              </span>
+            </div>
             <lockable-label
               :text="$t('groupUse')"
-              class="justify-content-center"
             />
             <select-translated-array
               :items="[
@@ -124,24 +99,36 @@
               ]"
               class="group-input"
               :placeholder="'groupUseDefault'"
-              :value="upgradedGroup.demographics"
-              @select="upgradedGroup.demographics = $event"
+              :value="groupPlanUpgraded.demographics"
+              @select="groupPlanUpgraded.demographics = $event"
             />
-            <button
-              class="btn btn-primary btn-lg btn-block btn-payment"
-              @click="close()"
-            >
-              {{ $t('submit') }}
-            </button>
           </div>
         </template>
-        <button
-          v-else
-          class="btn btn-primary"
-          @click="close()"
+        <template
+          v-if="paymentData.paymentType === 'groupPlan'
+            || paymentData.paymentType === 'subscription'"
         >
-          {{ $t('onwards') }}
-        </button>
+          <span
+            v-once
+            class="small-text auto-renew"
+          >{{ $t('paymentAutoRenew') }}</span>
+        </template>
+        <div>
+          <button
+            v-if="!paymentData.newGroup"
+            class="btn btn-primary"
+            @click="close()"
+          >
+            {{ $t('submit') }}
+          </button>
+          <button
+            v-else
+            class="btn btn-primary"
+            @click="close()"
+          >
+            {{ $t('onwards') }}
+          </button>
+        </div>
       </div>
     </div>
   </b-modal>
@@ -151,7 +138,7 @@
 @import '~@/assets/scss/colors.scss';
 
 #payments-success-modal .modal-md {
-  max-width: 20.5rem;
+  max-width: 448px;
 }
 
 #payments-success-modal .modal-content {
@@ -193,9 +180,8 @@
 }
 
 #payments-success-modal .modal-body {
-  padding-top: 16px;
-  padding-bottom: 24px;
-  background: white;
+  padding: 16px 32px 24px 32px;
+  background: $white;
 
   .modal-body-col {
     display: flex;
@@ -249,9 +235,6 @@
   .small-text {
     font-style: normal;
   }
-  .group-input {
-    margin-top: -4px;
-  }
 }
 </style>
 
@@ -261,24 +244,22 @@ import gemIcon from '@/assets/svg/gem.svg';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+import paymentsMixin from '@/mixins/payments';
 
 export default {
+  components: {
+    selectTranslatedArray,
+    lockableLabel,
+  },
+  mixins: [paymentsMixin],
   data () {
     return {
-      components: {
-        selectTranslatedArray,
-        lockableLabel,
-      },
       icons: Object.freeze({
         check: checkIcon,
         gem: gemIcon,
       }),
       paymentData: {},
-      newGroup: {
-        name: '',
-      },
-      upgradedGroup: {
-        name: '',
+      groupPlanUpgraded: {
         demographics: null,
       },
     };
@@ -287,6 +268,7 @@ export default {
     groupPlanCost () {
       const sub = this.paymentData.subscription;
       const memberCount = this.paymentData.group.memberCount || 1;
+      console.log(this.paymentData);
       return sub.price + 3 * (memberCount - 1);
     },
     isFromBalance () {
@@ -308,7 +290,6 @@ export default {
   },
   methods: {
     close () {
-      console.log(this.upgradedGroup.demographics);
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
index 5b8a1439a5..17cf1aea88 100644
--- a/website/client/src/mixins/payments.js
+++ b/website/client/src/mixins/payments.js
@@ -39,6 +39,13 @@ export default {
       return moment(this.user.purchased.plan.dateTerminated)
         .format(this.user.preferences.dateFormat.toUpperCase());
     },
+    dateRenewal () {
+      if (!this.user.preferences || !this.user.preferences.dateFormat) {
+        return this.user.purchased.plan.dateRenewal;
+      }
+      return moment(this.user.purchased.plan.dateRenewal).add(1, 'months')
+        .format(this.user.preferences.dateFormat.toUpperCase());
+    },
   },
   methods: {
     encodeGift (uuid, gift) {

From a3e6aff33072da6440e71de4dadaa0b425d77989 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 29 Aug 2022 16:12:53 -0400
Subject: [PATCH 18/36] update: more work on success modal

---
 .../src/components/payments/successModal.vue  | 87 ++++++++++++-------
 website/common/locales/en/npc.json            |  2 +
 2 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 3044313222..8b160422c6 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -70,7 +70,7 @@
             v-html="$t(paymentData.newGroup
               ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
           ></span>
-<!--           <div class="details-block">
+          <!--<div class="details-block">
             <span
               v-html="$t('paymentSubBilling', {
                 amount: groupPlanCost, months: paymentData.subscription.months})"
@@ -80,33 +80,47 @@
             v-if="!paymentData.newGroup"
             class="form-group"
           >
-            <div class="details-block">
+            <div class="details-block group-billing-date">
               <span>
-                Your next billing date is <strong>{{ dateRenewal }}</strong>.
+                {{ $t('groupPaymentSubBilling') }}
               </span>
             </div>
-            <lockable-label
-              :text="$t('groupUse')"
-            />
-            <select-translated-array
-              :items="[
-                'groupParentChildren',
-                'groupCouple',
-                'groupFriends',
-                'groupCoworkers',
-                'groupManager',
-                'groupTeacher'
-              ]"
-              class="group-input"
-              :placeholder="'groupUseDefault'"
-              :value="groupPlanUpgraded.demographics"
-              @select="groupPlanUpgraded.demographics = $event"
-            />
+            <div class="small-text group-auto-renew">
+              <span
+                v-once
+              >{{ $t('groupsPaymentAutoRenew') }}
+              </span>
+            </div>
+            <div class="demographics">
+              <lockable-label
+                :text="$t('groupUse')"
+              />
+              <select-translated-array
+                :items="[
+                  'groupParentChildren',
+                  'groupCouple',
+                  'groupFriends',
+                  'groupCoworkers',
+                  'groupManager',
+                  'groupTeacher'
+                ]"
+                class="group-input"
+                :placeholder="'groupUseDefault'"
+                :value="groupPlanUpgraded.demographics"
+                @select="groupPlanUpgraded.demographics = $event"
+              />
+            </div>
           </div>
+          <button
+            v-oncee="!paymentData.newGroup"
+            class="btn btn-primary"
+            @click="close()"
+          >
+            {{ $t('submit') }}
+          </button>
         </template>
         <template
-          v-if="paymentData.paymentType === 'groupPlan'
-            || paymentData.paymentType === 'subscription'"
+          v-if="paymentData.paymentType === 'subscription'"
         >
           <span
             v-once
@@ -115,14 +129,7 @@
         </template>
         <div>
           <button
-            v-if="!paymentData.newGroup"
-            class="btn btn-primary"
-            @click="close()"
-          >
-            {{ $t('submit') }}
-          </button>
-          <button
-            v-else
+            v-if="paymentData.paymentType === 'subscription'"
             class="btn btn-primary"
             @click="close()"
           >
@@ -223,6 +230,26 @@
     color: $orange-10;
     font-style: normal;
   }
+  .group-auto-renew {
+    margin-top: 16px;
+    margin-bottom: 16px;
+    color: $yellow-5;
+    font-style: normal;
+  }
+
+  .group-billing-date {
+    width: 269px;
+    text-align: center;
+    margin-left: 57px;
+  }
+  .form-group {
+    // padding-top: 32px;
+  }
+
+  .demographics {
+    background-color: $gray-700;
+    width: 100%;
+  }
 }
 
 #payments-success-modal .modal-footer {
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 7c173cae02..f967e41b3f 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -93,8 +93,10 @@
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
+  "groupPaymentSubBilling": "Your subscription will auto-renew on <strong><%= dateRenewal %></strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",
   "paymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel this subscription, you can do so from your settings.",
+  "groupsPaymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel, you can do so from the Group Billing tab.",
   "paymentCanceledDisputes": "We’ve sent a cancelation confirmation to your email. If you don’t see the email, please contact us to prevent future billing disputes.",
   "success": "Success!",
   "classGear": "Class Gear",

From e2bb7fda60bcd0c3eff568d520b0aa2db218cd9d Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 30 Aug 2022 17:43:36 -0400
Subject: [PATCH 19/36] update: success modal

---
 .../src/components/payments/successModal.vue  | 38 +++++++++----------
 website/common/locales/en/npc.json            |  2 +-
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 8b160422c6..197e691400 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -78,11 +78,11 @@
           </div> -->
           <div
             v-if="!paymentData.newGroup"
-            class="form-group"
+            class=""
           >
             <div class="details-block group-billing-date">
               <span>
-                {{ $t('groupPaymentSubBilling') }}
+                {{ $t('groupsPaymentSubBilling') }}
               </span>
             </div>
             <div class="small-text group-auto-renew">
@@ -109,15 +109,15 @@
                 :value="groupPlanUpgraded.demographics"
                 @select="groupPlanUpgraded.demographics = $event"
               />
+              <button
+                v-if="!paymentData.newGroup"
+                class="btn btn-primary"
+                @click="close()"
+              >
+                {{ $t('submit') }}
+              </button>
             </div>
           </div>
-          <button
-            v-oncee="!paymentData.newGroup"
-            class="btn btn-primary"
-            @click="close()"
-          >
-            {{ $t('submit') }}
-          </button>
         </template>
         <template
           v-if="paymentData.paymentType === 'subscription'"
@@ -157,6 +157,7 @@
   border-bottom-left-radius: 8px;
 }
 
+
 #payments-success-modal .modal-header {
   justify-content: center;
   padding-top: 24px;
@@ -206,7 +207,7 @@
     border-radius: 4px;
     padding: 8px 24px;
     margin-top: 16px;
-    display: flex;
+    display: inline-flex;
     flex-direction: row;
     text-align: center;
 
@@ -236,22 +237,17 @@
     color: $yellow-5;
     font-style: normal;
   }
-
-  .group-billing-date {
-    width: 269px;
-    text-align: center;
-    margin-left: 57px;
-  }
-  .form-group {
-    // padding-top: 32px;
-  }
-
   .demographics {
     background-color: $gray-700;
     width: 100%;
+    padding: 0 12px;
+    width: 100%;
+    padding: 16px 32px 32px 32px;
+  }
+  .group-billing-date {
+    width: 269px;
   }
 }
-
 #payments-success-modal .modal-footer {
   background: $gray-700;
   border-bottom-right-radius: 8px;
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index f967e41b3f..76b34fb15b 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -93,7 +93,7 @@
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
-  "groupPaymentSubBilling": "Your subscription will auto-renew on <strong><%= dateRenewal %></strong>.",
+  "groupsPaymentSubBilling": "Your next billing date is <strong>11/11/1111</strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",
   "paymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel this subscription, you can do so from your settings.",
   "groupsPaymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel, you can do so from the Group Billing tab.",

From 796d7529749894974b9027b87f9e9cc9b21b2342 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 2 Sep 2022 16:55:28 -0400
Subject: [PATCH 20/36] update: success modal

---
 .../src/components/payments/successModal.vue  | 77 +++++++++++++++----
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 197e691400..98b71c63a9 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -17,11 +17,42 @@
     </div>
     <div slot="modal-footer">
       <div
-        v-once
+        v-if="!paymentData.paymentType === 'groupPlan' && !paymentData.newGroup"
         class="small-text"
       >
         {{ $t('giftSubscriptionText4') }}
       </div>
+      <div
+        v-else
+        class="demographics"
+      >
+        <lockable-label
+          :text="$t('groupUse')"
+          class="demo-label"
+        />
+        <select-translated-array
+          :items="[
+            'groupParentChildren',
+            'groupCouple',
+            'groupFriends',
+            'groupCoworkers',
+            'groupManager',
+            'groupTeacher'
+          ]"
+          class="group-input"
+          :placeholder="'groupUseDefault'"
+          :value="groupPlanUpgraded.demographics"
+          @select="groupPlanUpgraded.demographics = $event"
+        />
+        <button
+          v-if="!paymentData.newGroup"
+          class="btn btn-primary"
+          :disabled="!'groupPlanUpgraded.demographics'"
+          @click="close()"
+        >
+          {{ $t('submit') }}
+        </button>
+      </div>
     </div>
     <div class="row">
       <div class="col-12 modal-body-col">
@@ -81,8 +112,9 @@
             class=""
           >
             <div class="details-block group-billing-date">
-              <span>
-                {{ $t('groupsPaymentSubBilling') }}
+              <span
+                v-html="$t('groupsPaymentSubBilling')"
+              >
               </span>
             </div>
             <div class="small-text group-auto-renew">
@@ -91,7 +123,7 @@
               >{{ $t('groupsPaymentAutoRenew') }}
               </span>
             </div>
-            <div class="demographics">
+<!--             <div class="demographics">
               <lockable-label
                 :text="$t('groupUse')"
               />
@@ -116,7 +148,7 @@
               >
                 {{ $t('submit') }}
               </button>
-            </div>
+            </div> -->
           </div>
         </template>
         <template
@@ -205,7 +237,7 @@
   .details-block {
     background: $gray-700;
     border-radius: 4px;
-    padding: 8px 24px;
+    padding: 8px 16px;
     margin-top: 16px;
     display: inline-flex;
     flex-direction: row;
@@ -232,22 +264,15 @@
     font-style: normal;
   }
   .group-auto-renew {
-    margin-top: 16px;
-    margin-bottom: 16px;
+    margin: 12px 20px -8px 20px;
     color: $yellow-5;
     font-style: normal;
   }
-  .demographics {
-    background-color: $gray-700;
-    width: 100%;
-    padding: 0 12px;
-    width: 100%;
-    padding: 16px 32px 32px 32px;
-  }
   .group-billing-date {
     width: 269px;
   }
 }
+
 #payments-success-modal .modal-footer {
   background: $gray-700;
   border-bottom-right-radius: 8px;
@@ -259,6 +284,28 @@
     font-style: normal;
   }
 }
+  .demographics {
+    background-color: $gray-700;
+    padding: 16px 0px;
+    margin-top: -16px;
+    width: 400px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+
+    .btn.btn-primary {
+      margin-top: 24px;
+      width: 77px;
+      align-self: center;
+
+    }
+  #lockable-label .modal-footer label {
+    text-align: center !important;
+    width: 400px !important;
+  }
+
+  }
+
 </style>
 
 <script>

From abdb6244d3b9665effc71607565efc1f140b985f Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 6 Sep 2022 17:06:19 -0400
Subject: [PATCH 21/36] updates: add comments to success modal to flag issues

---
 .../src/components/payments/successModal.vue      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 98b71c63a9..8398653006 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -5,6 +5,9 @@
     :hide-footer="isFromBalance"
     :modal-class="isFromBalance ? ['modal-hidden-footer'] : []"
   >
+    <!-- there are basically 3 footer conditions: isFromBalance, groupPlanUpgraded, & everyone else
+     was trying to make that work with a separate footer for groupPlanUpgraded
+    but that's not working-->
     <div slot="modal-header">
       <div class="check-container d-flex align-items-center justify-content-center">
         <div
@@ -17,7 +20,8 @@
     </div>
     <div slot="modal-footer">
       <div
-        v-if="!paymentData.paymentType === 'groupPlan' && !paymentData.newGroup"
+        v-if="!paymentData.paymentType === 'groupPlan'
+          && !groupPlanUpgraded"
         class="small-text"
       >
         {{ $t('giftSubscriptionText4') }}
@@ -26,6 +30,7 @@
         v-else
         class="demographics"
       >
+      <!-- lockable label needs to be centered -->
         <lockable-label
           :text="$t('groupUse')"
           class="demo-label"
@@ -44,6 +49,7 @@
           :value="groupPlanUpgraded.demographics"
           @select="groupPlanUpgraded.demographics = $event"
         />
+        <!-- need to add correct :disabled value here 'cause this one ain't working -->
         <button
           v-if="!paymentData.newGroup"
           class="btn btn-primary"
@@ -123,7 +129,10 @@
               >{{ $t('groupsPaymentAutoRenew') }}
               </span>
             </div>
-<!--             <div class="demographics">
+          <!-- this is the demographics code if needed to move back down here from footer
+            this was working BUT I couldn't get the CSS working which is why I moved it to footer
+          <div class="demographics">
+              lockable label needs to be centered
               <lockable-label
                 :text="$t('groupUse')"
               />
@@ -141,6 +150,7 @@
                 :value="groupPlanUpgraded.demographics"
                 @select="groupPlanUpgraded.demographics = $event"
               />
+              need to add correct :disabled value here 'cause this one ain't working
               <button
                 v-if="!paymentData.newGroup"
                 class="btn btn-primary"
@@ -363,6 +373,7 @@ export default {
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
+    // how is amplitude formed?
   },
 };
 </script>

From c6ba1d8402dcbb7983e8ea7958cc1cc17146212b Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 8 Sep 2022 12:55:53 -0400
Subject: [PATCH 22/36] update: success modal

---
 .../src/components/payments/successModal.vue  | 151 ++++++++----------
 website/client/src/mixins/payments.js         |   8 +-
 website/common/locales/en/npc.json            |   2 +-
 3 files changed, 73 insertions(+), 88 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 8398653006..ad9ba387c2 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -5,9 +5,6 @@
     :hide-footer="isFromBalance"
     :modal-class="isFromBalance ? ['modal-hidden-footer'] : []"
   >
-    <!-- there are basically 3 footer conditions: isFromBalance, groupPlanUpgraded, & everyone else
-     was trying to make that work with a separate footer for groupPlanUpgraded
-    but that's not working-->
     <div slot="modal-header">
       <div class="check-container d-flex align-items-center justify-content-center">
         <div
@@ -19,21 +16,21 @@
       <h2>{{ $t(isFromBalance ? 'success' : 'paymentSuccessful') }}</h2>
     </div>
     <div slot="modal-footer">
+      <!-- everyone else -->
       <div
-        v-if="!paymentData.paymentType === 'groupPlan'
-          && !groupPlanUpgraded"
+        v-if="paymentData.paymentType !== 'groupPlan' || paymentData.newGroup"
         class="small-text"
       >
         {{ $t('giftSubscriptionText4') }}
       </div>
+      <!-- upgradedGroup -->
       <div
         v-else
-        class="demographics"
+        class="demographics d-flex flex-column justify-content-center"
       >
-      <!-- lockable label needs to be centered -->
         <lockable-label
           :text="$t('groupUse')"
-          class="demo-label"
+          class="mx-auto label-text"
         />
         <select-translated-array
           :items="[
@@ -49,12 +46,11 @@
           :value="groupPlanUpgraded.demographics"
           @select="groupPlanUpgraded.demographics = $event"
         />
-        <!-- need to add correct :disabled value here 'cause this one ain't working -->
         <button
           v-if="!paymentData.newGroup"
-          class="btn btn-primary"
-          :disabled="!'groupPlanUpgraded.demographics'"
-          @click="close()"
+          class="btn btn-primary mx-auto"
+          :disabled="!groupPlanUpgraded.demographics"
+          @click="submit()"
         >
           {{ $t('submit') }}
         </button>
@@ -62,6 +58,7 @@
     </div>
     <div class="row">
       <div class="col-12 modal-body-col">
+        <!-- buy gems for self -->
         <template v-if="paymentData.paymentType === 'gems'">
           <strong v-once>{{ $t('paymentYouReceived') }}</strong>
           <div class="details-block gems">
@@ -73,6 +70,7 @@
             <span>{{ paymentData.gemsBlock.gems }}</span>
           </div>
         </template>
+        <!-- buy or gift gems to someone else -->
         <template
           v-if="paymentData.paymentType === 'gift-gems'
             || paymentData.paymentType === 'gift-gems-balance'"
@@ -87,12 +85,16 @@
             <span>{{ paymentData.gift.gems.amount }}</span>
           </div>
         </template>
+        <!-- give gift subscription (non-recurring)-->
         <template v-if="paymentData.paymentType === 'gift-subscription'">
-          <span
-            v-html="$t('paymentYouSentSubscription', {
-              name: paymentData.giftReceiver, months: paymentData.subscription.months})"
-          ></span>
+          <div>
+            <span
+              v-html="$t('paymentYouSentSubscription', {
+                name: paymentData.giftReceiver, months: paymentData.subscription.months})"
+            ></span>
+          </div>
         </template>
+        <!-- buy self subscription (recurring) -->
         <template v-if="paymentData.paymentType === 'subscription'">
           <strong v-once>{{ $t('nowSubscribed') }}</strong>
           <div class="details-block">
@@ -101,25 +103,37 @@
                 amount: paymentData.subscription.price, months: paymentData.subscription.months})"
             ></span>
           </div>
+          <div
+            v-once
+            class="small-text auto-renew"
+          >
+            {{ $t('paymentAutoRenew') }}
+          </div>
         </template>
+        <!-- buttons for subscriptions -->
+        <div>
+          <button
+            v-if="paymentData.paymentType === 'subscription'
+              || paymentData.paymentType === 'gift-subscription'"
+            class="btn btn-primary"
+            @click="onwards()"
+          >
+            {{ $t('onwards') }}
+          </button>
+        </div>
+        <!-- group plan new or upgraded -->
         <template v-if="paymentData.paymentType === 'groupPlan'">
           <span
             v-html="$t(paymentData.newGroup
               ? 'groupPlanCreated' : 'groupPlanUpgraded', {groupName: paymentData.group.name})"
           ></span>
-          <!--<div class="details-block">
-            <span
-              v-html="$t('paymentSubBilling', {
-                amount: groupPlanCost, months: paymentData.subscription.months})"
-            ></span>
-          </div> -->
           <div
-            v-if="!paymentData.newGroup"
+            v-if="!paymentData.newGroup || paymentData.newGroup"
             class=""
           >
             <div class="details-block group-billing-date">
               <span
-                v-html="$t('groupsPaymentSubBilling')"
+                v-html="$t('groupsPaymentSubBilling', { renewalDate })"
               >
               </span>
             </div>
@@ -129,55 +143,17 @@
               >{{ $t('groupsPaymentAutoRenew') }}
               </span>
             </div>
-          <!-- this is the demographics code if needed to move back down here from footer
-            this was working BUT I couldn't get the CSS working which is why I moved it to footer
-          <div class="demographics">
-              lockable label needs to be centered
-              <lockable-label
-                :text="$t('groupUse')"
-              />
-              <select-translated-array
-                :items="[
-                  'groupParentChildren',
-                  'groupCouple',
-                  'groupFriends',
-                  'groupCoworkers',
-                  'groupManager',
-                  'groupTeacher'
-                ]"
-                class="group-input"
-                :placeholder="'groupUseDefault'"
-                :value="groupPlanUpgraded.demographics"
-                @select="groupPlanUpgraded.demographics = $event"
-              />
-              need to add correct :disabled value here 'cause this one ain't working
-              <button
-                v-if="!paymentData.newGroup"
-                class="btn btn-primary"
-                @click="close()"
-              >
-                {{ $t('submit') }}
-              </button>
-            </div> -->
           </div>
         </template>
-        <template
+        <!-- buy self subscription auto renew -->
+<!--         <template
           v-if="paymentData.paymentType === 'subscription'"
         >
           <span
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
-        </template>
-        <div>
-          <button
-            v-if="paymentData.paymentType === 'subscription'"
-            class="btn btn-primary"
-            @click="close()"
-          >
-            {{ $t('onwards') }}
-          </button>
-        </div>
+        </template> -->
       </div>
     </div>
   </b-modal>
@@ -294,30 +270,33 @@
     font-style: normal;
   }
 }
-  .demographics {
-    background-color: $gray-700;
-    padding: 16px 0px;
-    margin-top: -16px;
-    width: 400px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
 
-    .btn.btn-primary {
-      margin-top: 24px;
-      width: 77px;
-      align-self: center;
+.demographics {
+  background-color: $gray-700;
 
-    }
-  #lockable-label .modal-footer label {
-    text-align: center !important;
+  .label-text {
+    margin-bottom: 20px;
+  }
+
+  .group-input {
     width: 400px !important;
+    margin-top: -24px !important;
   }
+  .btn {
+    margin-top: 0px;
+    width: 77px;
+    margin-bottom: 20px;
+  }
+}
+</style>
+
+<style lang="scss">
+  @import '~@/assets/scss/mixins.scss';
 
-  }
 
 </style>
 
+
 <script>
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
@@ -325,6 +304,7 @@ import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
 import paymentsMixin from '@/mixins/payments';
+import * as Analytics from '@/libs/analytics';
 
 export default {
   components: {
@@ -369,11 +349,16 @@ export default {
     this.$root.$off('habitica:payments-success');
   },
   methods: {
-    close () {
+    submit () {
+      this.paymentData = {};
+      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
+      Analytics.track({ },
+        console.log(Analytics.track));
+    },
+    onwards () {
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
-    // how is amplitude formed?
   },
 };
 </script>
diff --git a/website/client/src/mixins/payments.js b/website/client/src/mixins/payments.js
index 17cf1aea88..f22c5ffc5f 100644
--- a/website/client/src/mixins/payments.js
+++ b/website/client/src/mixins/payments.js
@@ -39,12 +39,12 @@ export default {
       return moment(this.user.purchased.plan.dateTerminated)
         .format(this.user.preferences.dateFormat.toUpperCase());
     },
-    dateRenewal () {
+    renewalDate () {
+      const renewalDate = moment().add(1, 'months');
       if (!this.user.preferences || !this.user.preferences.dateFormat) {
-        return this.user.purchased.plan.dateRenewal;
+        return renewalDate;
       }
-      return moment(this.user.purchased.plan.dateRenewal).add(1, 'months')
-        .format(this.user.preferences.dateFormat.toUpperCase());
+      return renewalDate.format(this.user.preferences.dateFormat.toUpperCase());
     },
   },
   methods: {
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 76b34fb15b..a9d0e6c007 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -93,7 +93,7 @@
   "paymentYouSentGems": "You sent <strong><%- name %></strong>:",
   "paymentYouSentSubscription": "You sent <strong><%- name %></strong> a <%= months %>-months Habitica subscription.",
   "paymentSubBilling": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong>.",
-  "groupsPaymentSubBilling": "Your next billing date is <strong>11/11/1111</strong>.",
+  "groupsPaymentSubBilling": "Your next billing date is <strong><%= renewalDate %></strong>.",
   "paymentSubBillingWithMethod": "Your subscription will be billed <strong>$<%= amount %></strong> every <strong><%= months %> months</strong> via <strong><%= paymentMethod %></strong>.",
   "paymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel this subscription, you can do so from your settings.",
   "groupsPaymentAutoRenew": "This subscription will auto-renew until it is canceled. If you need to cancel, you can do so from the Group Billing tab.",

From 36a4ec69d55d19941512c79b1343ff5c21ee6b64 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 8 Sep 2022 15:53:26 -0400
Subject: [PATCH 23/36] update: success modal (testing something)

---
 .../src/components/payments/successModal.vue  | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index ad9ba387c2..5827423ea5 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -87,12 +87,10 @@
         </template>
         <!-- give gift subscription (non-recurring)-->
         <template v-if="paymentData.paymentType === 'gift-subscription'">
-          <div>
-            <span
-              v-html="$t('paymentYouSentSubscription', {
-                name: paymentData.giftReceiver, months: paymentData.subscription.months})"
-            ></span>
-          </div>
+          <span
+            v-html="$t('paymentYouSentSubscription', {
+              name: paymentData.giftReceiver, months: paymentData.subscription.months})"
+          ></span>
         </template>
         <!-- buy self subscription (recurring) -->
         <template v-if="paymentData.paymentType === 'subscription'">
@@ -103,24 +101,7 @@
                 amount: paymentData.subscription.price, months: paymentData.subscription.months})"
             ></span>
           </div>
-          <div
-            v-once
-            class="small-text auto-renew"
-          >
-            {{ $t('paymentAutoRenew') }}
-          </div>
         </template>
-        <!-- buttons for subscriptions -->
-        <div>
-          <button
-            v-if="paymentData.paymentType === 'subscription'
-              || paymentData.paymentType === 'gift-subscription'"
-            class="btn btn-primary"
-            @click="onwards()"
-          >
-            {{ $t('onwards') }}
-          </button>
-        </div>
         <!-- group plan new or upgraded -->
         <template v-if="paymentData.paymentType === 'groupPlan'">
           <span
@@ -146,14 +127,24 @@
           </div>
         </template>
         <!-- buy self subscription auto renew -->
-<!--         <template
+        <template
           v-if="paymentData.paymentType === 'subscription'"
         >
           <span
             v-once
             class="small-text auto-renew"
           >{{ $t('paymentAutoRenew') }}</span>
-        </template> -->
+        </template>
+        <!-- buttons for subscriptions -->
+        <div>
+          <button
+            v-if="paymentData.paymentType === 'subscription'"
+            class="btn btn-primary"
+            @click="onwards()"
+          >
+            {{ $t('onwards') }} to Mayhem!
+          </button>
+        </div>
       </div>
     </div>
   </b-modal>

From 5c13bf1980a415e2353f659c7738d93f80b6db2e Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 8 Sep 2022 17:34:36 -0400
Subject: [PATCH 24/36] update: add analytics to create and success modals

---
 .../group-plans/groupPlanCreationModal.vue    | 34 ++++--------------
 .../src/components/groups/groupPlan.vue       |  6 ----
 .../src/components/payments/successModal.vue  | 35 ++++++++++++-------
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 5b63bafb93..ffc4466cbe 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -119,13 +119,6 @@
           :amazon-data="pay(PAYMENTS.AMAZON)"
         />
       </div>
-      <!-- TEMPORARY BUTTON FOR TESTING -->
-<!--       <button
-        class="btn btn-primary btn-payment"
-        @click="success()"
-      >
-        Clicky click click!
-      </button> -->
     </div>
   </b-modal>
 </template>
@@ -258,6 +251,7 @@ import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
+// import * as Analytics from '@/libs/analytics';
 
 export default {
   components: {
@@ -277,7 +271,6 @@ export default {
       PAYMENTS: {
         AMAZON: 'amazon',
         STRIPE: 'stripe',
-        // OTHER: 'tempcode', // TEMP CODE
       },
       paymentMethod: '',
       newGroup: {
@@ -312,7 +305,10 @@ export default {
       this.activePage = page;
     },
     createGroup () {
-      console.log(this.newGroup);
+      // Analytics.track({
+      //   name: this.paymentData.demographics,
+      // },
+      // console.log(this.paymentData.demographics));
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
@@ -342,29 +338,13 @@ export default {
         this.redirectToStripe(paymentData);
       }
 
-      // TEMP CODE
-      // if (this.paymentMethod === this.PAYMENTS.OTHER) {
-      //   console.log(paymentData);
-      // }
-
       return null;
     },
-    // need to figure out where/how to create the event in amplitude
-    // right now being sent to console in success()
-    sendAnalytics () {
-      return this.newGroup.demographics;
-    },
+
     onHide () {
       this.sendingInProgress = false;
     },
-    // temporary function to go with temporary button
-    // success () {
-    //   this.pay(this.PAYMENTS.OTHER);
-    //   console.log(this.sendAnalytics());
-    //   this.sendAnalytics();
-    //   this.$root.$emit('bv::hide::modal', 'create-group');
-    //   this.$root.$emit('bv::show::modal', 'payments-success-modal');
-    // },
+
   },
 };
 </script>
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index a4667cc7a2..0eb76a8ae4 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -400,14 +400,8 @@ export default {
   },
   methods: {
     launchModal () {
-      console.log('i am creating a group');
-      // this.changePage(this.PAGES.CREATE_GROUP);
       this.$root.$emit('bv::show::modal', 'create-group');
     },
-    // changePage (page) {
-    //   this.activePage = 'page';
-    //   window.scrollTo(0, 0);
-    // },
     createGroup () {
       this.changePage(this.PAGES.PAY);
     },
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 5827423ea5..577c06d619 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -2,8 +2,8 @@
   <b-modal
     id="payments-success-modal"
     :title="$t('accountSuspendedTitle')"
-    :hide-footer="isFromBalance"
-    :modal-class="isFromBalance ? ['modal-hidden-footer'] : []"
+    :hide-footer="isFromBalance || paymentData.newGroup"
+    :modal-class="isFromBalance || paymentData.newGroup ? ['modal-hidden-footer'] : []"
   >
     <div slot="modal-header">
       <div class="check-container d-flex align-items-center justify-content-center">
@@ -136,15 +136,14 @@
           >{{ $t('paymentAutoRenew') }}</span>
         </template>
         <!-- buttons for subscriptions -->
-        <div>
-          <button
-            v-if="paymentData.paymentType === 'subscription'"
-            class="btn btn-primary"
-            @click="onwards()"
-          >
-            {{ $t('onwards') }} to Mayhem!
-          </button>
-        </div>
+        <button
+          v-if="paymentData.paymentType !== 'groupPlan'"
+          v-once
+          class="btn btn-primary"
+          @click="onwards()"
+        >
+          {{ $t('onwards') }}
+        </button>
       </div>
     </div>
   </b-modal>
@@ -325,6 +324,14 @@ export default {
     isFromBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
+    upgradedGroup () {
+      const upgradedGroup = (this.paymentData.paymentType !== 'groupPlan' || this.paymentData.newGroup);
+      const demographicsKey = upgradedGroup.demographics;
+      const groupPlanUpgraded = {
+        demographics: demographicsKey,
+      };
+      return groupPlanUpgraded.demographics;
+    },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -341,10 +348,12 @@ export default {
   },
   methods: {
     submit () {
+      Analytics.track({
+        name: this.groupPlanUpgraded.demographics,
+      },
+      console.log(Analytics.track));
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
-      Analytics.track({ },
-        console.log(Analytics.track));
     },
     onwards () {
       this.paymentData = {};

From e6f903fd2eaea84ae780ebb94dded90faa3d7435 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Sep 2022 15:37:08 -0400
Subject: [PATCH 25/36] update: more analytics work

---
 .../group-plans/groupPlanCreationModal.vue    | 17 +++++++----
 .../src/components/payments/successModal.vue  | 23 ++++++++++----
 website/client/src/libs/analytics.js          | 30 +++++++++++++++++++
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index ffc4466cbe..7b5546c78d 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -251,7 +251,7 @@ import { mapState } from '@/libs/store';
 import paymentsButtons from '@/components/payments/buttons/list';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
-// import * as Analytics from '@/libs/analytics';
+import * as Analytics from '@/libs/analytics';
 
 export default {
   components: {
@@ -282,6 +282,7 @@ export default {
           challenges: false,
         },
         demographics: null,
+        user: '',
       },
       activePage: 'create-group',
       type: 'guild',
@@ -305,10 +306,6 @@ export default {
       this.activePage = page;
     },
     createGroup () {
-      // Analytics.track({
-      //   name: this.paymentData.demographics,
-      // },
-      // console.log(this.paymentData.demographics));
       this.changePage(this.PAGES.PAY);
     },
     pay (paymentMethod) {
@@ -320,6 +317,16 @@ export default {
         demographics: demographicsKey,
       };
 
+      Analytics.track({
+        hitType: 'event',
+        eventName: 'group plan create',
+        eventAction: 'group plan create',
+        eventCategory: 'behavior',
+        createGroupName: this.newGroup.name,
+        demographicsCreated: this.newGroup.demographics,
+        typeCreated: this.newGroup.type,
+      });
+
       if (this.upgradingGroup && this.upgradingGroup._id) {
         paymentData.groupId = this.upgradingGroup._id;
         paymentData.group = this.upgradingGroup;
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 577c06d619..b708cd3b42 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -290,6 +290,7 @@
 <script>
 import checkIcon from '@/assets/svg/check.svg';
 import gemIcon from '@/assets/svg/gem.svg';
+import { mapState } from '@/libs/store';
 import subscriptionBlocks from '@/../../common/script/content/subscriptionBlocks';
 import selectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray';
 import lockableLabel from '@/components/tasks/modal-controls/lockableLabel';
@@ -309,16 +310,16 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
-      groupPlanUpgraded: {
+      upgradedGroupInfo: {
         demographics: null,
       },
     };
   },
   computed: {
+    ...mapState({ user: 'user.data', group: 'group.data' }),
     groupPlanCost () {
       const sub = this.paymentData.subscription;
       const memberCount = this.paymentData.group.memberCount || 1;
-      console.log(this.paymentData);
       return sub.price + 3 * (memberCount - 1);
     },
     isFromBalance () {
@@ -327,10 +328,15 @@ export default {
     upgradedGroup () {
       const upgradedGroup = (this.paymentData.paymentType !== 'groupPlan' || this.paymentData.newGroup);
       const demographicsKey = upgradedGroup.demographics;
+      const upgradedGroupName = upgradedGroup.name;
+      const upgradedGroupType = upgradedGroup.type;
       const groupPlanUpgraded = {
         demographics: demographicsKey,
+        name: upgradedGroupName,
+        type: upgradedGroupType,
       };
-      return groupPlanUpgraded.demographics;
+      console.log(groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
+      return (groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
     },
   },
   mounted () {
@@ -349,9 +355,14 @@ export default {
   methods: {
     submit () {
       Analytics.track({
-        name: this.groupPlanUpgraded.demographics,
-      },
-      console.log(Analytics.track));
+        hitType: 'event',
+        eventName: 'group plan upgrade',
+        eventAction: 'group plan upgrade',
+        eventCategory: 'behavior',
+        upgradedGroupName: this.upgradedGroup.name,
+        demographicsUpgraded: this.upgradedGroup.demographics,
+        typeUpgraded: this.upgradedGroup.type,
+      });
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 14648d70e3..42bb296215 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -75,6 +75,22 @@ function _gatherUserStats (properties) {
   if (user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId;
 }
 
+// added to gather group stats
+function _gatherGroupStats (properties) {
+  const store = getStore();
+  const user = store.state.user.data;
+  const group = store.state.groups.data;
+
+  properties.UUID = user._id;
+
+  properties.createGroupName = group.newGroup.name;
+  properties.demographicsCreated = group.newGroup.demographics;
+  properties.typeCreated = group.newGroup.type;
+  properties.upgradedGroupName = group.upgradedGroup.name;
+  properties.demographicsUpgraded = group.upgradedGroup.demographics;
+  properties.typeUpgraded = group.upgradedGroup.type;
+}
+
 export function setUser () {
   const store = getStore();
   const user = store.state.user.data;
@@ -89,6 +105,7 @@ export function track (properties, options = {}) {
     if (_doesNotHaveAllowedHitType(properties)) return;
 
     const trackOnClient = options && options.trackOnClient === true;
+    console.log(properties, options); // delete this!
     // Track events on the server by default
     if (trackOnClient === true) {
       amplitude.getInstance().logEvent(properties.eventAction, properties);
@@ -114,6 +131,19 @@ export function updateUser (properties = {}) {
   });
 }
 
+// added to get group data
+export function updateGroup (properties = {}) {
+  Vue.nextTick(() => {
+    _gatherGroupStats(properties);
+
+    forEach(properties, (value, key) => {
+      const idGroup = new amplitude.Identify().set(key, value);
+      amplitude.getInstance().identify(idGroup);
+    });
+    window.ga('set', properties);
+  });
+}
+
 export function setup () {
   // Setup queues until the real scripts are loaded
 

From 771558e1fd067e77369fe8b75a2f849f527ca238 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Sep 2022 16:27:25 -0400
Subject: [PATCH 26/36] update: analytics debugging

---
 .../src/components/payments/successModal.vue  | 56 +++++++++----------
 website/client/src/libs/analytics.js          |  6 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index b708cd3b42..3c098d9887 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -140,7 +140,7 @@
           v-if="paymentData.paymentType !== 'groupPlan'"
           v-once
           class="btn btn-primary"
-          @click="onwards()"
+          @click="submit()"
         >
           {{ $t('onwards') }}
         </button>
@@ -310,7 +310,8 @@ export default {
         gem: gemIcon,
       }),
       paymentData: {},
-      upgradedGroupInfo: {
+      upgradedGroup: {
+        name: '',
         demographics: null,
       },
     };
@@ -325,19 +326,21 @@ export default {
     isFromBalance () {
       return this.paymentData.paymentType === 'gift-gems-balance';
     },
-    upgradedGroup () {
-      const upgradedGroup = (this.paymentData.paymentType !== 'groupPlan' || this.paymentData.newGroup);
-      const demographicsKey = upgradedGroup.demographics;
-      const upgradedGroupName = upgradedGroup.name;
-      const upgradedGroupType = upgradedGroup.type;
-      const groupPlanUpgraded = {
-        demographics: demographicsKey,
-        name: upgradedGroupName,
-        type: upgradedGroupType,
-      };
-      console.log(groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
-      return (groupPlanUpgraded.demographics, groupPlanUpgraded.name, groupPlanUpgraded.type);
-    },
+    // upgradedGroup () {
+    //   const upgradedGroup = (this.paymentData.paymentType === 'groupPlan'
+    // && !this.paymentData.newGroup);
+    //   const demographicsKey = upgradedGroup.demographics;
+    //   const upgradedGroupName = upgradedGroup.name;
+    //   const upgradedGroupType = upgradedGroup.type;
+    //   const groupPlanUpgraded = {
+    //     demographics: demographicsKey,
+    //     name: upgradedGroupName,
+    //     type: upgradedGroupType,
+    //   };
+    //   console.log(groupPlanUpgraded.demographics,
+    //     groupPlanUpgraded.name, groupPlanUpgraded.type);
+    //   return groupPlanUpgraded;
+    // },
   },
   mounted () {
     this.$root.$on('habitica:payment-success', data => {
@@ -354,19 +357,16 @@ export default {
   },
   methods: {
     submit () {
-      Analytics.track({
-        hitType: 'event',
-        eventName: 'group plan upgrade',
-        eventAction: 'group plan upgrade',
-        eventCategory: 'behavior',
-        upgradedGroupName: this.upgradedGroup.name,
-        demographicsUpgraded: this.upgradedGroup.demographics,
-        typeUpgraded: this.upgradedGroup.type,
-      });
-      this.paymentData = {};
-      this.$root.$emit('bv::hide::modal', 'payments-success-modal');
-    },
-    onwards () {
+      if (!this.paymentData.newGroup) {
+        Analytics.track({
+          hitType: 'event',
+          eventName: 'group plan upgrade',
+          eventAction: 'group plan upgrade',
+          eventCategory: 'behavior',
+          demographics: this.paymentData.group.demographics, // if that's where this lives?
+          typeUpgraded: this.paymentData.group.type,
+        });
+      }
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');
     },
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 42bb296215..6493a07f5f 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -86,9 +86,9 @@ function _gatherGroupStats (properties) {
   properties.createGroupName = group.newGroup.name;
   properties.demographicsCreated = group.newGroup.demographics;
   properties.typeCreated = group.newGroup.type;
-  properties.upgradedGroupName = group.upgradedGroup.name;
-  properties.demographicsUpgraded = group.upgradedGroup.demographics;
-  properties.typeUpgraded = group.upgradedGroup.type;
+  // properties.upgradedGroupName = group.upgradedGroup.name;
+  // properties.demographicsUpgraded = group.upgradedGroup.demographics;
+  // properties.typeUpgraded = group.upgradedGroup.type;
 }
 
 export function setUser () {

From 5a85e0730c9c142c5819f90d24a7c90deb43d65b Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Sep 2022 16:56:19 -0400
Subject: [PATCH 27/36] update: analytics debugging

---
 .../components/group-plans/groupPlanCreationModal.vue  |  5 ++---
 .../client/src/components/payments/successModal.vue    | 10 +++++-----
 website/client/src/libs/analytics.js                   |  8 ++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 7b5546c78d..ff61a904b6 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -322,9 +322,8 @@ export default {
         eventName: 'group plan create',
         eventAction: 'group plan create',
         eventCategory: 'behavior',
-        createGroupName: this.newGroup.name,
-        demographicsCreated: this.newGroup.demographics,
-        typeCreated: this.newGroup.type,
+        demographics: this.newGroup.demographics,
+        type: this.newGroup.type,
       });
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 3c098d9887..fb3abaf39e 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -43,13 +43,13 @@
           ]"
           class="group-input"
           :placeholder="'groupUseDefault'"
-          :value="groupPlanUpgraded.demographics"
-          @select="groupPlanUpgraded.demographics = $event"
+          :value="upgradedGroup.demographics"
+          @select="upgradedGroup.demographics = $event"
         />
         <button
           v-if="!paymentData.newGroup"
           class="btn btn-primary mx-auto"
-          :disabled="!groupPlanUpgraded.demographics"
+          :disabled="!upgradedGroup.demographics"
           @click="submit()"
         >
           {{ $t('submit') }}
@@ -363,8 +363,8 @@ export default {
           eventName: 'group plan upgrade',
           eventAction: 'group plan upgrade',
           eventCategory: 'behavior',
-          demographics: this.paymentData.group.demographics, // if that's where this lives?
-          typeUpgraded: this.paymentData.group.type,
+          demographics: this.upgradedGroup.demographics,
+          type: this.paymentData.group.type, // also tried this.upgradedGroup.type
         });
       }
       this.paymentData = {};
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 6493a07f5f..9f81f6272f 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -83,12 +83,8 @@ function _gatherGroupStats (properties) {
 
   properties.UUID = user._id;
 
-  properties.createGroupName = group.newGroup.name;
-  properties.demographicsCreated = group.newGroup.demographics;
-  properties.typeCreated = group.newGroup.type;
-  // properties.upgradedGroupName = group.upgradedGroup.name;
-  // properties.demographicsUpgraded = group.upgradedGroup.demographics;
-  // properties.typeUpgraded = group.upgradedGroup.type;
+  properties.demographics = group.newGroup.demographics || group.upgradedGroup.demographics;
+  properties.type = group.newGroup.type || group.upgradedGroup.type;
 }
 
 export function setUser () {

From 21185b689c787ac9ad9380821b408036c1e2a5e6 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 12 Sep 2022 11:42:39 -0400
Subject: [PATCH 28/36] update: add 'type' to amazonModal.vue, removed
 extraneous analytics.js code

---
 .../src/components/payments/amazonModal.vue   |  2 +-
 website/client/src/libs/analytics.js          | 26 -------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/website/client/src/components/payments/amazonModal.vue b/website/client/src/components/payments/amazonModal.vue
index 8641a957bb..fcae0e01ec 100644
--- a/website/client/src/components/payments/amazonModal.vue
+++ b/website/client/src/components/payments/amazonModal.vue
@@ -196,7 +196,7 @@ export default {
           appState.group = pick(this.amazonPayments.groupToCreate, ['_id', 'memberCount', 'name']);
         } else {
           appState.newGroup = false;
-          appState.group = pick(this.amazonPayments.group, ['_id', 'memberCount', 'name']);
+          appState.group = pick(this.amazonPayments.group, ['_id', 'memberCount', 'name', 'type']);
         }
       } else if (paymentType && paymentType.indexOf('gift-') === 0) {
         appState.gift = this.amazonPayments.gift;
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 9f81f6272f..14648d70e3 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -75,18 +75,6 @@ function _gatherUserStats (properties) {
   if (user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId;
 }
 
-// added to gather group stats
-function _gatherGroupStats (properties) {
-  const store = getStore();
-  const user = store.state.user.data;
-  const group = store.state.groups.data;
-
-  properties.UUID = user._id;
-
-  properties.demographics = group.newGroup.demographics || group.upgradedGroup.demographics;
-  properties.type = group.newGroup.type || group.upgradedGroup.type;
-}
-
 export function setUser () {
   const store = getStore();
   const user = store.state.user.data;
@@ -101,7 +89,6 @@ export function track (properties, options = {}) {
     if (_doesNotHaveAllowedHitType(properties)) return;
 
     const trackOnClient = options && options.trackOnClient === true;
-    console.log(properties, options); // delete this!
     // Track events on the server by default
     if (trackOnClient === true) {
       amplitude.getInstance().logEvent(properties.eventAction, properties);
@@ -127,19 +114,6 @@ export function updateUser (properties = {}) {
   });
 }
 
-// added to get group data
-export function updateGroup (properties = {}) {
-  Vue.nextTick(() => {
-    _gatherGroupStats(properties);
-
-    forEach(properties, (value, key) => {
-      const idGroup = new amplitude.Identify().set(key, value);
-      amplitude.getInstance().identify(idGroup);
-    });
-    window.ga('set', properties);
-  });
-}
-
 export function setup () {
   // Setup queues until the real scripts are loaded
 

From 37e5d6b40aa9c75e192a6ad01a143be80b41007c Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 14 Sep 2022 17:06:33 -0400
Subject: [PATCH 29/36] update: remove duplicate key from groups.json

---
 website/common/locales/en/groups.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index f46fed3316..f9e1cdd157 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -353,7 +353,6 @@
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
   "next": "Next",
-  "cancel": "Cancel",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 014a4b653ae99638dd527f7d2f9baca6ebf5da34 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 14 Sep 2022 17:24:29 -0400
Subject: [PATCH 30/36] update: remove another duplicate key from groups.json

---
 website/common/locales/en/groups.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index f9e1cdd157..9d3aea4ff7 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -352,7 +352,6 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
-  "next": "Next",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 719fab8d4bb1c226035565eb4b0c1aca56789541 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 16 Sep 2022 16:12:34 -0400
Subject: [PATCH 31/36] chore: merge develop in

---
 habitica-images                               |    2 +-
 test/api/unit/libs/email.test.js              |   25 -
 test/api/unit/libs/password.test.js           |    2 +-
 .../v3/integration/user/DELETE-user.test.js   |   39 -
 .../DELETE-user_auth_social_network.test.js   |   64 -
 .../user/auth/POST-user_auth_social.test.js   |  141 ---
 .../auth/POST-user_reset_password.test.js     |   13 +
 website/client/src/assets/svg/facebook.svg    |    4 +-
 website/client/src/assets/svg/instagram.svg   |    4 +-
 website/client/src/assets/svg/tumblr.svg      |    3 +
 website/client/src/assets/svg/twitter.svg     |    4 +-
 website/client/src/components/appFooter.vue   | 1119 +++++++++++------
 .../client/src/components/auth/authForm.vue   |   20 -
 .../components/auth/registerLoginReset.vue    |    4 -
 .../src/components/groups/groupPlan.vue       |   12 +-
 .../src/components/payments/buyGemsModal.vue  |    8 -
 .../client/src/components/settings/site.vue   |    4 +-
 .../client/src/components/static/privacy.vue  |    7 +-
 .../src/components/static/staticWrapper.vue   |  104 +-
 website/client/vue.config.js                  |    1 -
 website/common/locales/da/backgrounds.json    |    3 +-
 website/common/locales/da/challenge.json      |    3 +-
 .../locales/da/communityguidelines.json       |  104 +-
 website/common/locales/da/content.json        |    2 +-
 website/common/locales/da/contrib.json        |    5 +-
 website/common/locales/da/death.json          |    4 +-
 website/common/locales/da/defaulttasks.json   |    4 +-
 website/common/locales/da/faq.json            |   36 +-
 website/common/locales/da/front.json          |    9 +-
 website/common/locales/da/gear.json           |    9 +-
 website/common/locales/da/groups.json         |    7 +-
 website/common/locales/da/limited.json        |  173 ++-
 website/common/locales/da/npc.json            |    9 +-
 website/common/locales/da/overview.json       |    6 +-
 website/common/locales/da/pets.json           |    8 +-
 website/common/locales/da/quests.json         |   12 +-
 website/common/locales/da/questscontent.json  |    2 +-
 website/common/locales/da/rebirth.json        |    2 +-
 website/common/locales/da/settings.json       |    8 +-
 website/common/locales/da/subscriber.json     |   16 +-
 website/common/locales/da/tasks.json          |   22 +-
 website/common/locales/de/groups.json         |    2 +-
 website/common/locales/en/front.json          |   11 +-
 website/common/locales/en/npc.json            |    3 +-
 website/common/locales/en/questsContent.json  |    2 +-
 website/common/locales/en/subscriber.json     |    2 +-
 website/common/locales/es/gear.json           |   34 +-
 website/common/locales/it/backgrounds.json    |    9 +-
 website/common/locales/it/gear.json           |    6 +-
 website/common/locales/ja/backgrounds.json    |    9 +-
 website/common/locales/ja/gear.json           |    6 +-
 website/common/locales/ja/generic.json        |    4 +-
 website/common/locales/ja/quests.json         |    2 +-
 website/common/locales/pt_BR/backgrounds.json |    9 +-
 website/common/locales/pt_BR/gear.json        |    6 +-
 website/common/locales/ru/backgrounds.json    |    9 +-
 website/common/locales/ru/groups.json         |   22 +-
 website/common/locales/ru/settings.json       |    3 +-
 website/common/locales/ru/subscriber.json     |    4 +-
 website/common/locales/uk/backgrounds.json    |    9 +-
 website/common/locales/uk/gear.json           |   18 +-
 website/common/locales/uk/questscontent.json  |   38 +-
 website/common/locales/zh/backgrounds.json    |    9 +-
 website/common/locales/zh/faq.json            |    3 +-
 website/common/locales/zh/gear.json           |   10 +-
 website/common/locales/zh/npc.json            |    4 +-
 website/common/script/constants.js            |    1 -
 website/common/script/content/bundles.js      |    3 +-
 .../common/script/content/constants/events.js |    6 +
 .../script/content/shop-featuredItems.js      |   14 +-
 website/server/libs/auth/index.js             |    7 +-
 website/server/libs/auth/social.js            |   10 +-
 website/server/libs/setupPassport.js          |   15 -
 73 files changed, 1297 insertions(+), 1017 deletions(-)
 create mode 100644 website/client/src/assets/svg/tumblr.svg

diff --git a/habitica-images b/habitica-images
index 8d63ff55e5..ce1e117dc9 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 8d63ff55e5c63872f95a3c9106d0b5f90af9ab6f
+Subproject commit ce1e117dc94ac4b1757f144e6897e332ccdaf119
diff --git a/test/api/unit/libs/email.test.js b/test/api/unit/libs/email.test.js
index b3fe180086..8673e03b62 100644
--- a/test/api/unit/libs/email.test.js
+++ b/test/api/unit/libs/email.test.js
@@ -13,11 +13,6 @@ function getUser () {
         username: 'username',
         email: 'email@email',
       },
-      facebook: {
-        emails: [{
-          value: 'email@facebook',
-        }],
-      },
       google: {
         emails: [{
           value: 'email@google',
@@ -62,30 +57,12 @@ describe('emails', () => {
       expect(data).to.have.property('canSend', true);
     });
 
-    it('returns correct user data [facebook users]', () => {
-      const attachEmail = requireAgain(pathToEmailLib);
-      const { getUserInfo } = attachEmail;
-      const user = getUser();
-      delete user.profile.name;
-      delete user.auth.local.email;
-      delete user.auth.google.emails;
-      delete user.auth.apple.emails;
-
-      const data = getUserInfo(user, ['name', 'email', '_id', 'canSend']);
-
-      expect(data).to.have.property('name', user.auth.local.username);
-      expect(data).to.have.property('email', user.auth.facebook.emails[0].value);
-      expect(data).to.have.property('_id', user._id);
-      expect(data).to.have.property('canSend', true);
-    });
-
     it('returns correct user data [google users]', () => {
       const attachEmail = requireAgain(pathToEmailLib);
       const { getUserInfo } = attachEmail;
       const user = getUser();
       delete user.profile.name;
       delete user.auth.local.email;
-      delete user.auth.facebook.emails;
       delete user.auth.apple.emails;
 
       const data = getUserInfo(user, ['name', 'email', '_id', 'canSend']);
@@ -103,7 +80,6 @@ describe('emails', () => {
       delete user.profile.name;
       delete user.auth.local.email;
       delete user.auth.google.emails;
-      delete user.auth.facebook.emails;
 
       const data = getUserInfo(user, ['name', 'email', '_id', 'canSend']);
 
@@ -118,7 +94,6 @@ describe('emails', () => {
       const { getUserInfo } = attachEmail;
       const user = getUser();
       delete user.auth.local.email;
-      delete user.auth.facebook;
       delete user.auth.google;
       delete user.auth.apple;
 
diff --git a/test/api/unit/libs/password.test.js b/test/api/unit/libs/password.test.js
index 3ca2643b6d..d9f1572ab5 100644
--- a/test/api/unit/libs/password.test.js
+++ b/test/api/unit/libs/password.test.js
@@ -246,7 +246,7 @@ describe('Password Utilities', () => {
     it('returns false if the user has no local auth', async () => {
       const user = await generateUser({
         auth: {
-          facebook: {},
+          google: {},
         },
       });
       const res = await validatePasswordResetCodeAndFindUser(encrypt(JSON.stringify({
diff --git a/test/api/v3/integration/user/DELETE-user.test.js b/test/api/v3/integration/user/DELETE-user.test.js
index 18be9792ce..5c176fe141 100644
--- a/test/api/v3/integration/user/DELETE-user.test.js
+++ b/test/api/v3/integration/user/DELETE-user.test.js
@@ -289,45 +289,6 @@ describe('DELETE /user', () => {
     });
   });
 
-  context('user with Facebook auth', async () => {
-    beforeEach(async () => {
-      user = await generateUser({
-        auth: {
-          facebook: {
-            id: 'facebook-id',
-          },
-        },
-      });
-    });
-
-    it('returns an error if confirmation phrase is wrong', async () => {
-      await expect(user.del('/user', {
-        password: 'just-do-it',
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('incorrectDeletePhrase', { magicWord: 'DELETE' }),
-      });
-    });
-
-    it('returns an error if confirmation phrase is not supplied', async () => {
-      await expect(user.del('/user', {
-        password: '',
-      })).to.eventually.be.rejected.and.eql({
-        code: 400,
-        error: 'BadRequest',
-        message: t('missingPassword'),
-      });
-    });
-
-    it('deletes a Facebook user', async () => {
-      await user.del('/user', {
-        password: DELETE_CONFIRMATION,
-      });
-      await expect(checkExistence('users', user._id)).to.eventually.eql(false);
-    });
-  });
-
   context('user with Google auth', async () => {
     beforeEach(async () => {
       user = await generateUser({
diff --git a/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js b/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js
index 12bef95459..522a49d369 100644
--- a/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js
+++ b/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js
@@ -20,44 +20,6 @@ describe('DELETE social registration', () => {
     });
   });
 
-  context('Facebook', () => {
-    it('fails if user does not have an alternative registration method', async () => {
-      await user.update({
-        'auth.facebook.id': 'some-fb-id',
-        'auth.local': { ok: true },
-      });
-      await expect(user.del('/user/auth/social/facebook')).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('cantDetachSocial'),
-      });
-    });
-
-    it('succeeds if user has a local registration', async () => {
-      await user.update({
-        'auth.facebook.id': 'some-fb-id',
-      });
-
-      const response = await user.del('/user/auth/social/facebook');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.facebook).to.be.undefined;
-    });
-
-    it('succeeds if user has a google registration', async () => {
-      await user.update({
-        'auth.facebook.id': 'some-fb-id',
-        'auth.google.id': 'some-google-id',
-        'auth.local': { ok: true },
-      });
-
-      const response = await user.del('/user/auth/social/facebook');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.facebook).to.be.undefined;
-    });
-  });
-
   context('Google', () => {
     it('fails if user does not have an alternative registration method', async () => {
       await user.update({
@@ -81,19 +43,6 @@ describe('DELETE social registration', () => {
       await user.sync();
       expect(user.auth.google).to.be.undefined;
     });
-
-    it('succeeds if user has a facebook registration', async () => {
-      await user.update({
-        'auth.google.id': 'some-google-id',
-        'auth.facebook.id': 'some-facebook-id',
-        'auth.local': { ok: true },
-      });
-
-      const response = await user.del('/user/auth/social/google');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.goodl).to.be.undefined;
-    });
   });
 
   context('Apple', () => {
@@ -119,18 +68,5 @@ describe('DELETE social registration', () => {
       await user.sync();
       expect(user.auth.apple).to.be.undefined;
     });
-
-    it('succeeds if user has a facebook registration', async () => {
-      await user.update({
-        'auth.apple.id': 'some-apple-id',
-        'auth.facebook.id': 'some-facebook-id',
-        'auth.local': { ok: true },
-      });
-
-      const response = await user.del('/user/auth/social/apple');
-      expect(response).to.eql({});
-      await user.sync();
-      expect(user.auth.goodl).to.be.undefined;
-    });
   });
 });
diff --git a/test/api/v3/integration/user/auth/POST-user_auth_social.test.js b/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
index c4ffe57efb..df976d0987 100644
--- a/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
+++ b/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
@@ -12,7 +12,6 @@ describe('POST /user/auth/social', () => {
   let user;
   const endpoint = '/user/auth/social';
   let randomAccessToken = '123456';
-  let randomFacebookId = 'facebookId';
   let randomGoogleId = 'googleId';
   let network = 'NoNetwork';
 
@@ -33,146 +32,6 @@ describe('POST /user/auth/social', () => {
     });
   });
 
-  describe('facebook', () => {
-    beforeEach(async () => {
-      randomFacebookId = generateUUID();
-      const expectedResult = {
-        id: randomFacebookId,
-        displayName: 'a facebook user',
-        emails: [
-          { value: `${user.auth.local.username}+facebook@example.com` },
-        ],
-      };
-      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
-      network = 'facebook';
-    });
-
-    afterEach(async () => {
-      passport._strategies.facebook.userProfile.restore();
-    });
-
-    it('registers a new user', async () => {
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.exist;
-      expect(response.id).to.exist;
-      expect(response.newUser).to.be.true;
-      expect(response.username).to.exist;
-
-      await expect(getProperty('users', response.id, 'profile.name')).to.eventually.equal('a facebook user');
-      await expect(getProperty('users', response.id, 'auth.local.lowerCaseUsername')).to.exist;
-      await expect(getProperty('users', response.id, 'auth.local.email')).to.eventually.equal(`${user.auth.local.username}+facebook@example.com`);
-      await expect(getProperty('users', response.id, 'auth.facebook.id')).to.eventually.equal(randomFacebookId);
-    });
-
-    it('logs an existing user in', async () => {
-      const registerResponse = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(registerResponse.apiToken);
-      expect(response.id).to.eql(registerResponse.id);
-      expect(response.newUser).to.be.false;
-      expect(registerResponse.newUser).to.be.true;
-    });
-
-    it('logs an existing user in if they have local auth with matching email', async () => {
-      passport._strategies.facebook.userProfile.restore();
-      const expectedResult = {
-        id: randomFacebookId,
-        displayName: 'a facebook user',
-        emails: [
-          { value: user.auth.local.email },
-        ],
-      };
-      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
-
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(user.apiToken);
-      expect(response.id).to.eql(user._id);
-      expect(response.newUser).to.be.false;
-    });
-
-    it('logs an existing user into their social account if they have local auth with matching email', async () => {
-      const registerResponse = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-      expect(registerResponse.newUser).to.be.true;
-      // This is important for existing accounts before the new social handling
-      passport._strategies.facebook.userProfile.restore();
-      const expectedResult = {
-        id: randomFacebookId,
-        displayName: 'a facebook user',
-        emails: [
-          { value: user.auth.local.email },
-        ],
-      };
-      sandbox.stub(passport._strategies.facebook, 'userProfile').yields(null, expectedResult);
-
-      const response = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(registerResponse.apiToken);
-      expect(response.id).to.eql(registerResponse.id);
-      expect(response.apiToken).not.to.eql(user.apiToken);
-      expect(response.id).not.to.eql(user._id);
-      expect(response.newUser).to.be.false;
-    });
-
-    it('add social auth to an existing user', async () => {
-      const response = await user.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      expect(response.apiToken).to.eql(user.apiToken);
-      expect(response.id).to.eql(user._id);
-      expect(response.newUser).to.be.false;
-    });
-
-    it('does not log into other account if social auth already exists', async () => {
-      const registerResponse = await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-      expect(registerResponse.newUser).to.be.true;
-
-      await expect(user.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      })).to.eventually.be.rejected.and.eql({
-        code: 401,
-        error: 'NotAuthorized',
-        message: t('socialAlreadyExists'),
-      });
-    });
-
-    xit('enrolls a new user in an A/B test', async () => {
-      await api.post(endpoint, {
-        authResponse: { access_token: randomAccessToken }, // eslint-disable-line camelcase
-        network,
-      });
-
-      await expect(getProperty('users', user._id, '_ABtests')).to.eventually.be.a('object');
-    });
-  });
-
   describe('google', () => {
     beforeEach(async () => {
       randomGoogleId = generateUUID();
diff --git a/test/api/v3/integration/user/auth/POST-user_reset_password.test.js b/test/api/v3/integration/user/auth/POST-user_reset_password.test.js
index 8603fa7cb3..da66e5fd3e 100644
--- a/test/api/v3/integration/user/auth/POST-user_reset_password.test.js
+++ b/test/api/v3/integration/user/auth/POST-user_reset_password.test.js
@@ -25,6 +25,19 @@ describe('POST /user/reset-password', async () => {
     expect(user.auth.local.hashed_password).to.not.eql(previousPassword);
   });
 
+  it('resets password for social users', async () => {
+    const email = `${user.auth.local.username}+google@example.com`;
+    await user.update({ 'auth.google.emails': [{ value: email }] });
+    await user.sync();
+    const previousPassword = user.auth.local.passwordResetCode;
+    const response = await user.post(endpoint, {
+      email,
+    });
+    expect(response).to.eql({ data: {}, message: t('passwordReset') });
+    await user.sync();
+    expect(user.auth.local.passwordResetCode).to.not.eql(previousPassword);
+  });
+
   it('same message on error as on success', async () => {
     const response = await user.post(endpoint, {
       email: 'nonExistent@email.com',
diff --git a/website/client/src/assets/svg/facebook.svg b/website/client/src/assets/svg/facebook.svg
index 3150f4d0f9..02315b15bf 100644
--- a/website/client/src/assets/svg/facebook.svg
+++ b/website/client/src/assets/svg/facebook.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16">
-    <path fill-rule="evenodd" d="M7.145 8.006H4.903V16H1.58V8.006H0V5.182h1.58V3.354C1.58 2.045 2.202 0 4.933 0l2.461.01v2.742H5.608c-.291 0-.705.145-.705.77v1.66h2.533l-.291 2.824z"/>
+<svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path d="M20,0H4C1.79,0,0,1.79,0,4V20c0,2.21,1.79,4,4,4H20c2.21,0,4-1.79,4-4V4c0-2.21-1.79-4-4-4Zm-3.72,6.66h-1.26c-1.24,0-1.63,.77-1.63,1.56v1.88h2.78l-.44,2.9h-2.33v7h-3.13v-7h-2.54v-2.9h2.54v-2.21c0-2.51,1.5-3.9,3.78-3.9,1.1,0,2.24,.2,2.24,.2v2.47Z" fill-rule="evenodd"/>
 </svg>
diff --git a/website/client/src/assets/svg/instagram.svg b/website/client/src/assets/svg/instagram.svg
index 80ff7254f5..c5ee2c2447 100644
--- a/website/client/src/assets/svg/instagram.svg
+++ b/website/client/src/assets/svg/instagram.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-    <path fill-rule="evenodd" d="M8 0c2.173 0 2.445.01 3.298.048.852.04 1.433.174 1.942.372.526.205.973.478 1.418.922.444.445.717.892.922 1.418.198.509.333 1.09.372 1.942C15.99 5.555 16 5.827 16 8s-.01 2.445-.048 3.298c-.04.852-.174 1.433-.372 1.942a3.924 3.924 0 0 1-.922 1.418 3.924 3.924 0 0 1-1.418.922c-.509.198-1.09.333-1.942.372-.853.04-1.125.048-3.298.048s-2.445-.009-3.298-.048c-.852-.04-1.433-.174-1.942-.372a3.924 3.924 0 0 1-1.418-.922A3.924 3.924 0 0 1 .42 13.24c-.198-.509-.333-1.09-.372-1.942C.01 10.445 0 10.173 0 8s.01-2.445.048-3.298C.088 3.85.222 3.269.42 2.76c.205-.526.478-.973.922-1.418A3.924 3.924 0 0 1 2.76.42C3.269.222 3.85.087 4.702.048 5.555.01 5.827 0 8 0zm0 3.892a4.108 4.108 0 1 0 0 8.216 4.108 4.108 0 0 0 0-8.216zm5.23-.162a.96.96 0 1 0-1.92 0 .96.96 0 0 0 1.92 0zM8 10.667a2.666 2.666 0 1 1 0-5.333 2.666 2.666 0 0 1 0 5.333z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path d="M14.67,12A2.67,2.67,0,1,1,12,9.33,2.67,2.67,0,0,1,14.67,12Zm3.89,0c0,1.16.1,3.66-.32,4.71a2.7,2.7,0,0,1-1.52,1.52c-1.06.42-3.55.33-4.72.33s-3.66.09-4.71-.33a2.65,2.65,0,0,1-1.52-1.52c-.42-1.05-.33-3.55-.33-4.71s-.09-3.67.33-4.72A2.65,2.65,0,0,1,7.29,5.76c1-.42,3.55-.32,4.71-.32a18,18,0,0,1,4.72.32,2.7,2.7,0,0,1,1.52,1.52C18.66,8.34,18.56,10.83,18.56,12ZM16.1,12A4.1,4.1,0,1,0,12,16.1,4.09,4.09,0,0,0,16.1,12Zm1.13-4.27a1,1,0,1,0-1,1A1,1,0,0,0,17.23,7.73ZM24,4V20a4,4,0,0,1-4,4H4a4,4,0,0,1-4-4V4A4,4,0,0,1,4,0H20A4,4,0,0,1,24,4ZM19.94,8.7a4.71,4.71,0,0,0-1.29-3.35A4.71,4.71,0,0,0,15.3,4.06C14,4,10,4,8.7,4.06A4.76,4.76,0,0,0,5.35,5.34,4.75,4.75,0,0,0,4.06,8.7C4,10,4,14,4.06,15.3a4.73,4.73,0,0,0,1.29,3.35A4.77,4.77,0,0,0,8.7,19.94c1.32.08,5.28.08,6.6,0a4.71,4.71,0,0,0,3.35-1.29,4.73,4.73,0,0,0,1.29-3.35C20,14,20,10,19.94,8.7Z" />
 </svg>
diff --git a/website/client/src/assets/svg/tumblr.svg b/website/client/src/assets/svg/tumblr.svg
new file mode 100644
index 0000000000..4e8eabc27e
--- /dev/null
+++ b/website/client/src/assets/svg/tumblr.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path d="M20,0H4A4,4,0,0,0,0,4V20a4,4,0,0,0,4,4H20a4,4,0,0,0,4-4V4A4,4,0,0,0,20,0ZM16.68,19a4.47,4.47,0,0,1-3,1C9.86,20,9,17.22,9,15.61v-4.5H7.56a.31.31,0,0,1-.31-.32V8.67a.52.52,0,0,1,.35-.5,4,4,0,0,0,2.63-3.66c0-.34.21-.51.51-.51H13a.31.31,0,0,1,.32.31v3.6h2.59a.31.31,0,0,1,.31.31v2.55a.31.31,0,0,1-.31.32H13.25v4.16c0,1.07.74,1.67,2.13,1.12a.67.67,0,0,1,.4-.07.36.36,0,0,1,.23.25l.68,2C16.75,18.71,16.8,18.89,16.68,19Z" fill-rule="evenodd"/>
+</svg>
diff --git a/website/client/src/assets/svg/twitter.svg b/website/client/src/assets/svg/twitter.svg
index c48698bcdb..b477dbb472 100644
--- a/website/client/src/assets/svg/twitter.svg
+++ b/website/client/src/assets/svg/twitter.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="13" viewBox="0 0 16 13">
-    <path fill-rule="evenodd" d="M14.362 3.238c.007.141.01.281.01.424 0 4.338-3.302 9.34-9.34 9.34A9.284 9.284 0 0 1 0 11.527c.257.029.518.045.783.045a6.576 6.576 0 0 0 4.076-1.404 3.288 3.288 0 0 1-3.065-2.28 3.312 3.312 0 0 0 1.481-.056A3.288 3.288 0 0 1 .642 4.613v-.041c.444.246.949.393 1.488.41A3.28 3.28 0 0 1 .67 2.25c0-.602.162-1.166.444-1.651a9.315 9.315 0 0 0 6.766 3.43A3.28 3.28 0 0 1 11.078 0c.943 0 1.797.398 2.395 1.035a6.565 6.565 0 0 0 2.085-.797 3.289 3.289 0 0 1-1.443 1.816A6.543 6.543 0 0 0 16 1.539a6.665 6.665 0 0 1-1.638 1.699"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path d="M20,0H4A4,4,0,0,0,0,4V20a4,4,0,0,0,4,4H20a4,4,0,0,0,4-4V4A4,4,0,0,0,20,0ZM18.36,8.74c0,.14,0,.29,0,.43A9.34,9.34,0,0,1,4,17a6.85,6.85,0,0,0,.79,0,6.57,6.57,0,0,0,4.07-1.4A3.29,3.29,0,0,1,5.8,13.39a4.1,4.1,0,0,0,.62,0,3.49,3.49,0,0,0,.86-.11,3.28,3.28,0,0,1-2.63-3.22v0a3.35,3.35,0,0,0,1.48.42A3.29,3.29,0,0,1,4.67,7.76,3.22,3.22,0,0,1,5.12,6.1a9.3,9.3,0,0,0,6.76,3.43,3.67,3.67,0,0,1-.08-.75,3.28,3.28,0,0,1,5.67-2.24,6.54,6.54,0,0,0,2.08-.79,3.22,3.22,0,0,1-1.44,1.8A6.67,6.67,0,0,0,20,7.05,7.31,7.31,0,0,1,18.36,8.74Z" fill-rule="evenodd"/>
 </svg>
diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue
index c3e0b81ac0..963cd6d9d9 100644
--- a/website/client/src/components/appFooter.vue
+++ b/website/client/src/components/appFooter.vue
@@ -1,487 +1,792 @@
 <template>
-  <div class="row footer-row">
+  <div>
     <buy-gems-modal v-if="user" />
     <!--modify-inventory(v-if="isUserLoaded")-->
-    <footer class="col-12 expanded">
-      <div class="row">
-        <div class="col-12 col-md-2">
-          <h3>
+    <footer>
+      <!-- Product -->
+      <div class="product">
+        <h3>{{ $t('footerProduct') }}</h3>
+        <ul>
+          <li>
             <a
               href="https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8"
               target="_blank"
-            >{{ $t('mobileIOS') }}</a>
-          </h3>
-          <h3>
+            >{{ $t('mobileIOS') }}
+            </a>
+          </li>
+          <li>
             <a
               href="https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica"
               target="_blank"
-            >{{ $t('mobileAndroid') }}</a>
-          </h3>
+            >{{ $t('mobileAndroid') }}
+            </a>
+          </li>
+          <li>
+            <router-link to="/group-plans">
+              {{ $t('groupPlans') }}
+            </router-link>
+          </li>
+          <li>
+            <router-link to="/static/features">
+              {{ $t('companyAbout') }}
+            </router-link>
+          </li>
+        </ul>
+      </div>
+      <!-- Company -->
+      <div class="company">
+        <h3>{{ $t('footerCompany') }}</h3>
+        <ul>
+          <li>
+            <router-link to="/static/contact">
+              {{ $t('contactUs') }}
+            </router-link>
+          </li>
+          <li>
+            <router-link to="/static/press-kit">
+              {{ $t('presskit') }}
+            </router-link>
+          </li>
+          <li>
+            <a
+              href="https://habitica.wordpress.com/"
+              target="_blank"
+            >{{ $t('companyBlog') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Whats_New"
+              target="_blank"
+            >{{ $t('oldNews') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- Community -->
+      <div class="community">
+        <h3>{{ $t('footerCommunity') }}</h3>
+        <ul>
+          <li>
+            <a
+              target="_blank"
+              href="/static/community-guidelines"
+            >{{ $t('communityGuidelines') }}
+            </a>
+          </li>
+          <li>
+            <router-link to="/hall/contributors">
+              {{ $t('hall') }}
+            </router-link>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
+              target="_blank"
+            >{{ $t('companyContribute') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- Support -->
+      <div class="support">
+        <h3>{{ $t ('support') }}</h3>
+        <ul>
+          <li>
+            <router-link to="/static/faq">
+              {{ $t('FAQ') }}
+            </router-link>
+          </li>
+          <li
+            v-if="user"
+          >
+            <a
+              target="_blank"
+              @click.prevent="openBugReportModal()"
+            >
+              {{ $t('reportBug') }}
+            </a>
+          </li>
+          <li
+            v-else
+          >
+            <a
+              href="mailto:admin@habitica.com?subject=Habitica Web Bug Report"
+              target="_blank"
+            >
+              {{ $t('reportBug') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
+              target="_blank"
+            >{{ $t('requestFeature') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/"
+              target="_blank"
+            >{{ $t('wiki') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- Developers -->
+      <div class="developers">
+        <h3>{{ $t('footerDevs') }}</h3>
+        <ul>
+          <li>
+            <a
+              href="/apidoc"
+              target="_blank"
+            >{{ $t('APIv3') }}
+            </a>
+          </li>
+          <li>
+            <a
+              :href="getDataDisplayToolUrl"
+              target="_blank"
+            >{{ $t('dataDisplayTool') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
+              target="_blank"
+            >{{ $t('guidanceForBlacksmiths') }}
+            </a>
+          </li>
+          <li>
+            <a
+              href="https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations"
+              target="_blank"
+            >{{ $t('communityExtensions') }}
+            </a>
+          </li>
+        </ul>
+      </div>
+
+      <!-- Help Support Habitica -->
+      <div class="donate">
+        <div>
+          <h3>{{ $t('helpSupportHabitica') }}</h3>
+          <p class="donate-text">
+            {{ $t('donateText3') }}
+          </p>
         </div>
-        <div class="col-12 col-md-2">
-          <h3>{{ $t('footerCompany') }}</h3>
-          <ul>
-            <li>
-              <router-link to="/static/features">
-                {{ $t('companyAbout') }}
-              </router-link>
-            </li>
-            <li>
-              <a
-                href="https://habitica.wordpress.com/"
-                target="_blank"
-              >{{ $t('companyBlog') }}</a>
-            </li>
-            <li>
-              <a
-                href="https://blog.habitrpg.com/"
-                target="_blank"
-              >{{ $t('tumblr') }}</a>
-            </li>
-            <li>
-              <router-link to="/static/faq">
-                {{ $t('FAQ') }}
-              </router-link>
-            </li>
-            <li>
-              <a
-                href="https://habitica.fandom.com/wiki/Whats_New"
-                target="_blank"
-              >{{ $t('oldNews') }}</a>
-            </li>
-            <!-- Commenting out merch page see https://github.com/HabitRPG/habitica/issues/12039
-            <li>
-              <router-link to="/static/merch">
-                {{ $t('merch') }}
-              </router-link>
-            </li>
-            -->
-            <li>
-              <router-link to="/static/press-kit">
-                {{ $t('presskit') }}
-              </router-link>
-            </li>
-            <li>
-              <router-link to="/static/contact">
-                {{ $t('contactUs') }}
-              </router-link>
-            </li>
-          </ul>
-        </div>
-        <div class="col-12 col-md-2">
-          <h3>{{ $t('footerCommunity') }}</h3>
-          <ul>
-            <li>
-              <a
-                target="_blank"
-                href="/static/community-guidelines"
-              >{{ $t('communityGuidelines') }}</a>
-            </li>
-            <li>
-              <router-link to="/hall/contributors">
-                {{ $t('hall') }}
-              </router-link>
-            </li>
-            <li v-if="user">
-              <a
-                target="_blank"
-                @click.prevent="openBugReportModal()"
-              >
-                {{ $t('reportBug') }}
-              </a>
-            </li>
-            <li v-else>
-              <a
-                href="mailto:admin@habitica.com?subject=Habitica Web Bug Report"
-                target="_blank"
-              >
-                {{ $t('reportBug') }}
-              </a>
-            </li>
-            <li>
-              <a
-                href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
-                target="_blank"
-              >{{ $t('requestFeature') }}</a>
-            </li>
-            <li v-html="$t('communityExtensions')"></li>
-            <li>
-              <a
-                href="https://www.facebook.com/Habitica"
-                target="_blank"
-              >{{ $t('communityFacebook') }}</a>
-            </li>
-            <li>
-              <a
-                href="https://www.instagram.com/habitica"
-                target="_blank"
-              >{{ $t('communityInstagram') }}</a>
-            </li>
-          </ul>
-        </div>
-        <div class="col-12 col-md-6">
-          <div class="row">
-            <div class="col-6">
-              <h3>{{ $t('footerDevs') }}</h3>
-              <ul>
-                <li>
-                  <a
-                    href="/apidoc"
-                    target="_blank"
-                  >{{ $t('APIv3') }}</a>
-                </li>
-                <li>
-                  <a
-                    :href="getDataDisplayToolUrl"
-                    target="_blank"
-                  >{{ $t('dataDisplayTool') }}</a>
-                </li>
-                <li>
-                  <a
-                    href="https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
-                    target="_blank"
-                  >{{ $t('guidanceForBlacksmiths') }}</a>
-                </li>
-              </ul>
-            </div>
-            <div class="col-6 social">
-              <h3>{{ $t('footerSocial') }}</h3>
-              <div class="icons">
-                <a
-                  class="social-circle"
-                  href="https://twitter.com/habitica"
-                  target="_blank"
-                >
-                  <div
-                    class="social-icon svg-icon"
-                    v-html="icons.twitter"
-                  ></div>
-                </a>
-                <a
-                  class="social-circle"
-                  href="https://www.instagram.com/habitica/"
-                  target="_blank"
-                >
-                  <div
-                    class="social-icon svg-icon instagram"
-                    v-html="icons.instagram"
-                  ></div>
-                </a>
-                <a
-                  class="social-circle"
-                  href="https://www.facebook.com/Habitica"
-                  target="_blank"
-                >
-                  <div
-                    class="social-icon facebook svg-icon"
-                    v-html="icons.facebook"
-                  ></div>
-                </a>
-              </div>
-            </div>
+      </div>
+      <div class="donate-button">
+        <button
+          class="button btn-contribute"
+          @click="donate()"
+        >
+          <div class="text">
+            💜 {{ $t('companyDonate') }}
           </div>
-          <div class="row">
-            <div class="col-12 col-md-8">
-              {{ $t('donateText3') }}
-            </div>
-            <div class="col-12 col-md-4">
-              <button
-                v-if="user"
-                class="btn btn-contribute btn-front btn-flat"
-                @click="donate()"
-              >
-                <div
-                  class="svg-icon heart"
-                  v-html="icons.heart"
-                ></div>
-                <div class="text">
-                  {{ $t('companyDonate') }}
-                </div>
-              </button>
+        </button>
+      </div>
+
+      <!-- Social - Desktop/Tablet -->
+      <div class="social">
+        <div>
+          <h3>{{ $t('footerSocial') }}</h3>
+          <div class="icons">
+            <a
+              class="social-circle"
+              href="https://www.instagram.com/habitica/"
+              target="_blank"
+            >
               <div
-                v-else
-                class="btn btn-contribute btn-front btn-flat"
-              >
-                <a
-                  href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
-                  target="_blank"
-                >
-                  <div
-                    class="svg-icon heart"
-                    v-html="icons.heart"
-                  ></div>
-                  <div class="text">{{ $t('companyContribute') }}</div>
-                </a>
-              </div>
-            </div>
+                class="social-icon svg-icon instagram"
+                v-html="icons.instagram"
+              ></div>
+            </a>
+            <a
+              class="social-circle"
+              href="https://twitter.com/habitica"
+              target="_blank"
+            >
+              <div
+                class="social-icon svg-icon twitter"
+                v-html="icons.twitter"
+              ></div>
+            </a>
+            <a
+              class="social-circle"
+              href="https://www.facebook.com/Habitica"
+              target="_blank"
+            >
+              <div
+                class="social-icon facebook svg-icon"
+                v-html="icons.facebook"
+              ></div>
+            </a><a
+              class="social-circle"
+              href="https://www.tumblr.com/Habitica"
+              target="_blank"
+            >
+              <div
+                class="social-icon tumblr svg-icon"
+                v-html="icons.tumblr"
+              ></div>
+            </a>
           </div>
         </div>
       </div>
-      <div class="row">
-        <div class="col-12">
+
+      <div class="hr">
+        <div>
           <hr>
         </div>
       </div>
-      <div class="row">
-        <div class="col-12 col-md-5 text-center text-md-left">
+      <!-- Colophon -->
+      <div class=" copyright">
+        <div>
           © {{ currentYear }} Habitica. All rights reserved.
-          <div
-            v-if="!IS_PRODUCTION && isUserLoaded"
-            class="debug float-left"
-          >
-            <button
-              class="btn btn-primary"
-              @click="debugMenuShown = !debugMenuShown"
-            >
-              Toggle Debug Menu
-            </button>
-            <div
-              v-if="debugMenuShown"
-              class="debug-group"
-            >
-              <a
-                class="btn btn-secondary"
-                @click="setHealthLow()"
-              >Health = 1</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(1)"
-              >+1 Missed Day</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(2)"
-              >+2 Missed Days</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(8)"
-              >+8 Missed Days</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMissedDay(32)"
-              >+32 Missed Days</a>
-              <a
-                class="btn btn-secondary"
-                @click="addTenGems()"
-              >+10 Gems</a>
-              <a
-                class="btn btn-secondary"
-                @click="addHourglass()"
-              >+1 Mystic Hourglass</a>
-              <a
-                class="btn btn-secondary"
-                @click="addGold()"
-              >+500GP</a>
-              <a
-                class="btn btn-secondary"
-                @click="plusTenHealth()"
-              >+ 10HP</a>
-              <a
-                class="btn btn-secondary"
-                @click="addMana()"
-              >+MP</a>
-              <a
-                class="btn btn-secondary"
-                @click="addLevelsAndGold()"
-              >+Exp +GP +MP</a>
-              <a
-                class="btn btn-secondary"
-                @click="addExp()"
-              >+Exp</a>
-              <a
-                class="btn btn-secondary"
-                @click="addOneLevel()"
-              >+1 Level</a>
-              <a
-                class="btn btn-secondary"
-                tooltip="+1000 to boss quests. 300 items to collection quests"
-                @click="addQuestProgress()"
-              >Quest Progress Up</a>
-              <a
-                class="btn btn-secondary"
-                @click="makeAdmin()"
-              >Make Admin</a>
-              <a
-                class="btn btn-secondary"
-                @click="openModifyInventoryModal()"
-              >Modify Inventory</a>
-            </div>
+        </div>
+      </div>
+      <div class="melior">
+        <div
+          class="logo svg-icon"
+          v-html="icons.gryphon"
+        ></div>
+      </div>
+      <!-- DESKTOP PRIVACY & TERMS -->
+      <div class="privacy-terms">
+        <span class="privacy-policy">
+          <a
+            target="_blank"
+            href="/static/privacy"
+          >{{ $t('privacy') }}</a>
+        </span>
+        <span class="terms">
+          <a
+            target="_blank"
+            href="/static/terms"
+          >{{ $t('terms') }}</a>
+        </span>
+      </div>
+      <!-- MOBILE PRIVACY & TERMS -->
+      <div class="privacy-policy mobile desktop">
+        <a
+          target="_blank"
+          href="/static/privacy"
+        >{{ $t('privacy') }}</a>
+      </div>
+      <div class="mobile-terms mobile desktop">
+        <a
+          target="_blank"
+          href="/static/terms"
+        >{{ $t('terms') }}</a>
+      </div>
+
+      <div
+        v-if="!IS_PRODUCTION && isUserLoaded"
+        class="debug-toggle"
+      >
+        <button
+          class="debug btn-primary"
+          @click="debugMenuShown = !debugMenuShown"
+        >
+          Toggle Debug Menu
+        </button>
+        <div
+          v-if="debugMenuShown"
+          class="debug-toggle debug-group"
+        >
+          <div class="debug-pop">
+            <a
+              class="btn btn-secondary"
+              @click="setHealthLow()"
+            >Reduce Health to 1</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(1)"
+            >+1 Missed Day</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(2)"
+            >+2 Missed Days</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(8)"
+            >+8 Missed Days</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMissedDay(32)"
+            >+32 Missed Days</a>
+            <a
+              class="btn btn-secondary"
+              @click="addTenGems()"
+            >+10 Gems</a>
+            <a
+              class="btn btn-secondary"
+              @click="addHourglass()"
+            >+1 Mystic Hourglass</a>
+            <a
+              class="btn btn-secondary"
+              @click="addGold()"
+            >+500GP</a>
+            <a
+              class="btn btn-secondary"
+              @click="plusTenHealth()"
+            >+ 10HP</a>
+            <a
+              class="btn btn-secondary"
+              @click="addMana()"
+            >+MP</a>
+            <a
+              class="btn btn-secondary"
+              @click="addLevelsAndGold()"
+            >+Exp +GP +MP</a>
+            <a
+              class="btn btn-secondary"
+              @click="addExp()"
+            >+Exp</a>
+            <a
+              class="btn btn-secondary"
+              @click="addOneLevel()"
+            >+1 Level</a>
+            <a
+              class="btn btn-secondary"
+              tooltip="+1000 to boss quests. 300 items to collection quests"
+              @click="addQuestProgress()"
+            >Quest Progress Up</a>
+            <a
+              class="btn btn-secondary"
+              @click="makeAdmin()"
+            >Make Admin</a>
           </div>
         </div>
-        <div class="col-12 col-md-2 text-center">
-          <div
-            class="logo svg-icon"
-            v-html="icons.gryphon"
-          ></div>
-        </div>
-        <div class="col-12 col-md-5 text-center text-md-right my-1">
-          <span class="ml-4">
-            <a
-              target="_blank"
-              href="/static/privacy"
-            >{{ $t('privacy') }}</a>
-          </span>
-          <span class="ml-4">
-            <a
-              target="_blank"
-              href="/static/terms"
-            >{{ $t('terms') }}</a>
-          </span>
-        </div>
       </div>
     </footer>
   </div>
 </template>
 
 <style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
 .footer-row {
   margin: 0;
   flex: 0 1 auto;
   z-index: 10;
 }
-footer {
-  color: #c3c0c7;
-  padding-bottom: 3em;
-  a {
-    color: #2995cd;
-  }
-}
-h3 {
-  color: #878190;
+
+button {
+  border: none;
+  border-radius: 4px;
+  text-align: center;
+  line-height: 1.71;
+  font-weight: 700;
+  font-size: .875rem;
+  margin-bottom: 1rem;
+  padding: .5rem 1rem;
+  box-shadow: 0 1px 3px 0 rgb(26 24 29 / 12%), 0 1px 2px 0 rgb(26 24 29 / 24%);
 }
+
 ul {
-  padding-left: 0;
-  list-style-type: none;
+  list-style: none;
+  margin: 0;
+  padding: 0;
 }
+
 li {
-  margin-bottom: 0.5em;
+  margin: 0 0 .5rem 0;
+  padding: 0;
 }
-.social {
-  h3 {
-    text-align: right;
-  }
-}
-.icons {
+
+.product { grid-area: product; }
+.company { grid-area: company; }
+.community { grid-area: community; }
+.support { grid-area: support; }
+.developers { grid-area: developers; }
+
+// row 2
+.donate {
+  align-items: flex-end;
+  display: flex;
+  justify-content: start;
+  grid-area: donate;
+  padding-top: 12px;
+}
+.donate-text {
+  grid-area: donate-text;
+  font-size: 0.75rem;
+  font-color: $gray-100;
+  line-height: 1.33;
   display: flex;
-  justify-content: flex-end;
   flex-shrink: 1;
 }
-// smaller than desktop
-@media only screen and (max-width: 992px) {
-  .social-circle {
-    height: 32px !important;
-    width: 32px !important;
-    margin-left: 0.75em !important;
-  }
-}
-//mobile view
-@media screen and (max-width: 770px) {
-  .footer-main {
-    display: flex;
-    flex-direction: column;
-  }
-  .logo-container {
-    order: 1;
-  }
-}
-.social-circle {
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  background-color: #c3c0c7;
+.donate-button {
+  grid-area: donate-button;
+  padding-top: 44px;
+ }
+.social {
+  align-items: flex-start;
   display: flex;
-  margin-left: 1em;
+  justify-content: start;
+  grid-area: social;
+  padding-top: 12px;
+}
+
+// row 3
+.hr {
+  color: $gray-400;
+  grid-area: hr;
+}
+
+// row 4
+.copyright {
+  grid-area: copyright;
+  line-height: 1.71;
+}
+.melior { grid-area: melior; }
+.privacy-terms {
+  grid-area: privacy-terms;
+  display: flex;
+  justify-content: end;
+  line-height: 1.71;
+}
+.terms {
+  padding-left: 16px;
+  }
+  .mobile {
+    display: none;
+  }
+
+// row 5
+.debug-toggle { grid-area: debug-toggle;}
+.debog-pop {
+  grid-area: debug-pop;
+   }
+
+footer {
+  background-color: $gray-500;
+  color: $gray-50;
+  padding: 32px 142px 40px;
+  a {
+    color: $gray-50;
+  }
+  a:hover {
+    color: $purple-300;
+    text-decoration: underline;
+  }
+  a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct
+    color: $purple-300;
+    text-decoration: underline;
+  }
+
+  column-gap: 1.5rem;
+  display: grid;
+  grid-template-areas:
+    "product company community support developers"
+    "donate donate donate donate-button social"
+    "donate-text donate-text donate-text donate-button social"
+    "hr hr hr hr hr"
+    "copyright copyright melior privacy-terms privacy-terms"
+    "debug-toggle debug-toggle debug-toggle blank blank";
+  grid-template-columns: repeat(5, 1fr);
+  grid-template-rows: auto;
+
+}
+
+h3 {
+  font-weight: bold;
+}
+
+.icons {
+  display: flex;
+  height: 24px;
+  padding-top: 4px;
+}
+
+.social-circle {
+  width: 24px;
+  height: 24px;
+  border-radius: 4px;
+  background-color: $gray-50;
+  display: flex;
+  margin: 0 8px 0 8px;
   &:first-child {
     margin-left: 0;
   }
-  &:hover {
-    background-color: #a5a1ac;
-  }
-  .social-icon {
-    color: #e1e0e3;
-    width: 16px;
-    margin: auto;
+  &:last-child {
+    margin-right: 0;
   }
 }
+
 .logo {
   width: 24px;
   height: 24px;
-  margin: 0 auto;
-  color: #e1e0e3;
+  margin: 0px auto 5px;
+  color: $gray-200;
 }
+
+.terms {
+  padding-left: 16px;
+  display:flex;
+  justify-content: end;
+}
+
+.desktop {
+  display: none;
+}
+
+.debug {
+  margin-top: 16px;
+  display: flex;
+  justify-content: center;
+}
+
 .debug-group {
-  position: absolute;
-  background: #fff;
-  top: -300px;
-  border-radius: 2px;
-  padding: 2em;
-}
-.btn-contribute {
-  background: #c3c0c7;
-  box-shadow: none;
   border-radius: 4px;
-  font-family: Roboto Condensed, sans-serif;
-  &:hover {
-    background: #a5a1ac;
-    .text {
-      color: white;
+  padding: 16px;
+  box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+  font-weight: 700;
+  background-color: $gray-600;
+
+ .btn {
+  margin: 2px;
+  }
+}
+
+.btn-contribute {
+  background: $white;
+  border-radius: 2px;
+  width: 175px;
+  height: 32px;
+  color: $gray-50;
+  text-align: center;
+  vertical-align: middle;
+  padding: 0;
+  margin: 0;
+    &:hover {
+      color:$purple-300;
+      box-shadow: 0 3px 6px 0 rgba(26, 24, 29, 0.16), 0 3px 6px 0 rgba(26, 24, 29, 0.24);
+    &:active:not(:disabled) {
+      color:$purple-300;
+      border: 1px solid $purple-400;
+      box-shadow: 0 3px 6px 0 rgba(26, 24, 29, 0.16), 0 3px 6px 0 rgba(26, 24, 29, 0.24);
     }
   }
+
   a {
     display: flex;
   }
-  .heart {
-    max-height: 25px;
-    width: 18px;
-    margin-right: 0.5em;
-    margin-bottom: 0.2em;
-  }
-  .text,
-  .heart {
+
+  .text{
     display: inline-block;
     vertical-align: bottom;
   }
 }
+
+// media breakpoints
+
+// Small devices (landscape phones, 576px and under)
+@media (max-width: 767.99px) {
+
+  // row 1
+  .product {
+    grid-area: product;
+    padding-top: 12px;
+     }
+  .company {
+    grid-area: company;
+    padding-top: 12px;
+  }
+
+  //row 2
+  .community {
+    grid-area: community;
+    padding-top: 12px;
+  }
+  .support {
+    grid-area: support;
+    padding-top: 12px;
+  }
+
+  //row 3
+  .developers {
+    grid-area: developers;
+    padding-top: 12px;
+  }
+  .social {
+    grid-area: social;
+    padding-top: 12px;
+  }
+
+  // row 4
+  .donate {
+    grid-area: donate;
+  }
+  // row 5
+  .donate-text {
+    grid-area: donate-text;
+  }
+  //row 6
+  .donate-button {
+    grid-area: donate-button;
+    padding-top: 0px;
+   }
+
+  // row 7
+  .hr {
+    grid-area: hr;
+    padding-top: 8px;
+  }
+
+  // row 8
+  .copyright {
+    grid-area: copyright;
+    display: flex;
+    justify-content: center;
+  }
+  // row 9
+  .privacy-terms {
+    display: none;
+  }
+  .desktop {
+    display: none;
+  }
+  .privacy-policy {
+    grid-area: privacy-policy;
+    display: grid;
+    justify-content: center;
+    line-height: 1.71;
+    padding-top: 10px;
+  }
+  //row 10
+  .mobile-terms {
+    grid-area: mobile-terms;
+    display:grid;
+    justify-content: center;
+    padding: 8px 0px 16px 0px;
+  }
+  // row 11
+  .melior { grid-area: melior; }
+
+  // row 12
+  .debug-toggle {
+    grid-area: debug-toggle;
+    width: 100%;
+  }
+
+  footer {
+    padding: 24px 16px;
+    a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct
+      color: $purple-300;
+      text-decoration: underline;
+    }
+
+    column-gap: 1.5rem;
+    display: grid;
+    grid-template-areas:
+      "product company"
+      "community support"
+      "developers social"
+      "donate donate"
+      "donate-text donate-text"
+      "donate-button donate-button"
+      "hr hr"
+      "copyright copyright"
+      "privacy-policy privacy-policy"
+      "mobile-terms mobile-terms"
+      "melior melior"
+      "debug-toggle debug-toggle";
+    grid-template-columns: repeat(2, 2fr);
+    grid-template-rows: auto;
+    }
+  .btn-contribute {
+    width: 100%;
+  }
+  .debug {
+    width: 100%;
+  }
+  .social-circle {
+    margin: 0 6px 0 6px;
+      &:first-child {
+    margin-left: 0;
+    }
+      &:last-child {
+    margin-right: 0;
+    }
+  }
+}
+
+// Medium devices (tablets, 768px and under)
+@media (max-width: 1024px) and (min-width: 768px) {
+  footer {
+    padding: 24px 24px;
+    a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct
+      color: $purple-300;
+      text-decoration: underline;
+    }
+  }
+
+  .desktop {
+   display: none;
+  }
+ }
 </style>
 
 <style lang="scss">
-.heart svg {
-  margin-top: 0.1em;
+.instagram svg {
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+    &:hover {
+    fill: #6133B4;
+  }
 }
+
+.twitter svg {
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+    &:hover {
+    fill: #6133B4;
+  }
+}
+
 .facebook svg {
-  width: 10px;
-  margin: 0 auto;
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+    &:hover {
+    fill: #6133B4;
+  }
 }
-footer {
-  &.expanded {
-    padding-left: 6em;
-    padding-right: 6em;
-    padding-top: 3em;
-    background: #e1e0e3;
-    color: #878190;
-    min-height: 408px;
-    a {
-      color: #878190;
-    }
-    .logo {
-      color: #c3c0c7;
-    }
-    @media screen and (max-width: 770px) {
-      padding-left: 1em;
-      padding-right: 1em;
-    }
+
+.tumblr svg {
+  background-color: #e1e0e3;
+  fill: #878190;
+  height: 24px;
+  width: 24px;
+      &:hover {
+    fill: #6133B4;
   }
 }
 </style>
 
 <script>
+// modules
 import axios from 'axios';
 import moment from 'moment';
-import { mapState } from '@/libs/store';
+
+// images
 import gryphon from '@/assets/svg/gryphon.svg';
 import twitter from '@/assets/svg/twitter.svg';
 import facebook from '@/assets/svg/facebook.svg';
 import instagram from '@/assets/svg/instagram.svg';
+import tumblr from '@/assets/svg/tumblr.svg';
 import heart from '@/assets/svg/heart.svg';
+
+// components & modals
+import { mapState } from '@/libs/store';
 import buyGemsModal from './payments/buyGemsModal.vue';
 import reportBug from '@/mixins/reportBug.js';
 
@@ -498,6 +803,7 @@ export default {
         twitter,
         facebook,
         instagram,
+        tumblr,
         heart,
       }),
       debugMenuShown: false,
@@ -592,9 +898,6 @@ export default {
       // Reload the website then go to Help > Admin Panel to set contributor level, etc.');
       // @TODO: sync()
     },
-    openModifyInventoryModal () {
-      this.$root.$emit('bv::show::modal', 'modify-inventory');
-    },
     donate () {
       this.$root.$emit('bv::show::modal', 'buy-gems', { alreadyTracked: true });
     },
diff --git a/website/client/src/components/auth/authForm.vue b/website/client/src/components/auth/authForm.vue
index e24951f496..6354f6d160 100644
--- a/website/client/src/components/auth/authForm.vue
+++ b/website/client/src/components/auth/authForm.vue
@@ -1,21 +1,5 @@
 <template>
   <div class="form">
-    <div class="form-group row text-center">
-      <div class="col-12">
-        <div
-          class="btn btn-secondary social-button"
-          @click="socialAuth('facebook')"
-        >
-          <div
-            class="svg-icon social-icon"
-            v-html="icons.facebookIcon"
-          ></div>
-          <span>{{ registering
-            ? $t('signUpWithSocial', {social: 'Facebook'})
-            : $t('loginWithSocial', {social: 'Facebook'}) }}</span>
-        </div>
-      </div>
-    </div>
     <div class="form-group row text-center">
       <div class="col-12">
         <div
@@ -243,7 +227,6 @@ import debounce from 'lodash/debounce';
 import isEmail from 'validator/lib/isEmail';
 import { setUpAxios, buildAppleAuthUrl } from '@/libs/auth';
 import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
-import facebookSquareIcon from '@/assets/svg/facebook-square.svg';
 import googleIcon from '@/assets/svg/google.svg';
 import appleIcon from '@/assets/svg/apple_black.svg';
 
@@ -260,7 +243,6 @@ export default {
     };
 
     data.icons = Object.freeze({
-      facebookIcon: facebookSquareIcon,
       googleIcon,
       appleIcon,
     });
@@ -308,8 +290,6 @@ export default {
   },
   mounted () {
     hello.init({
-      facebook: process.env.FACEBOOK_KEY, // eslint-disable-line
-      // windows: WINDOWS_CLIENT_ID,
       google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line
     });
   },
diff --git a/website/client/src/components/auth/registerLoginReset.vue b/website/client/src/components/auth/registerLoginReset.vue
index 890581ca5f..f48bbd2811 100644
--- a/website/client/src/components/auth/registerLoginReset.vue
+++ b/website/client/src/components/auth/registerLoginReset.vue
@@ -621,7 +621,6 @@ import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
 import exclamation from '@/assets/svg/exclamation.svg';
 import gryphon from '@/assets/svg/gryphon.svg';
 import habiticaIcon from '@/assets/svg/habitica-logo.svg';
-import facebookSquareIcon from '@/assets/svg/facebook-square.svg';
 import googleIcon from '@/assets/svg/google.svg';
 import appleIcon from '@/assets/svg/apple_black.svg';
 
@@ -644,7 +643,6 @@ export default {
       exclamation,
       gryphon,
       habiticaIcon,
-      facebookIcon: facebookSquareIcon,
       googleIcon,
       appleIcon,
     });
@@ -734,8 +732,6 @@ export default {
   },
   mounted () {
     hello.init({
-      facebook: process.env.FACEBOOK_KEY, // eslint-disable-line
-      // windows: WINDOWS_CLIENT_ID,
       google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line
     });
   },
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index 0eb76a8ae4..c628774d9e 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -94,7 +94,6 @@
               </div>
             </div>
             <div class="box payment-providers">
-              <h3>Choose your payment method</h3>
               <payments-buttons
                 :stripe-fn="() => pay(PAYMENTS.STRIPE)"
                 :amazon-data="pay(PAYMENTS.AMAZON)"
@@ -167,6 +166,11 @@
 
     .purple-box {
       color: #bda8ff;
+      border-top-right-radius: 0px;
+      border-bottom-right-radius: 0px;
+      border-top-left-radius: 8px;
+      border-bottom-left-radius: 8px;
+      box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
     }
 
     .number {
@@ -180,6 +184,8 @@
 
     .payment-providers {
       width: 350px;
+      border-top-right-radius: 8px;
+      border-bottom-right-radius: 8px;
     }
   }
 
@@ -304,6 +310,10 @@
   .payment-options {
     margin-bottom: 64px;
 
+    h4 {
+      color: #34313a;
+    }
+
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 701ae8026a..02ebfe31ac 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -153,14 +153,6 @@
             </span>
           </div>
         </div>
-        <div class="row text-center">
-          <h4
-            v-once
-            class="col-12 text-payment mb-3"
-          >
-            {{ $t('choosePaymentMethod') }}
-          </h4>
-        </div>
         <payments-buttons
           :disabled="!selectedGemsBlock"
           :stripe-fn="() => redirectToStripe({ gemsBlock: selectedGemsBlock })"
diff --git a/website/client/src/components/settings/site.vue b/website/client/src/components/settings/site.vue
index bbb475473a..671e94da39 100644
--- a/website/client/src/components/settings/site.vue
+++ b/website/client/src/components/settings/site.vue
@@ -387,9 +387,7 @@
               {{ $t('saveAndConfirm') }}
             </button>
           </div>
-          <h5
-            v-if="user.auth.local.email"
-          >
+          <h5 v-if="user.auth.local.has_password">
             {{ $t('changeEmail') }}
           </h5>
           <div
diff --git a/website/client/src/components/static/privacy.vue b/website/client/src/components/static/privacy.vue
index 6ae0a9f1ca..8fbbfbe2ae 100644
--- a/website/client/src/components/static/privacy.vue
+++ b/website/client/src/components/static/privacy.vue
@@ -3,7 +3,7 @@
   <div class="container-fluid">
     <h1>Privacy Notice</h1>
     <p class="strong pagemeta">
-      Last Updated: December 10, 2021
+      Last Updated: September 15, 2022
     </p>
     <p>
       HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
@@ -39,8 +39,9 @@
       In connection with the creation of an account on our Platforms, we collect account credentials such as
       your email, username, and password. We use this account information to create your account, including to
       verify your identity. We also use this information to manage your account, including your transactions. If
-      you choose to log into your account through Google, Apple or Facebook, we capture and store the User
-      ID and email address connected to the respective account, so we can verify your identity when you log in.
+      you choose to log into your account through Google or Apple, we capture and store the User ID and email
+      address connected to the respective account, so we can verify your identity when you log in.
+      (We no longer offer the ability to log in using Facebook's authentication procedure.)
     </p>
     <h3>User Content</h3>
     <p>
diff --git a/website/client/src/components/static/staticWrapper.vue b/website/client/src/components/static/staticWrapper.vue
index 878be4158c..73952d1f59 100644
--- a/website/client/src/components/static/staticWrapper.vue
+++ b/website/client/src/components/static/staticWrapper.vue
@@ -33,7 +33,7 @@
   @import '~@/assets/scss/colors.scss';
 
   .home-header {
-    background: #6133b4 !important;
+    background: $purple-300 !important;
     position: static;
     box-shadow: none !important;
     height: 100px !important;
@@ -46,13 +46,13 @@
 
     .nav-item a {
       font-size: 14px !important;
-      color: #d5c8ff !important;
+      color: $purple-600 !important;
       padding-top: 2.8em !important;
     }
 
     .nav-item a:hover {
       background: transparent !important;
-      color: #fff !important;
+      color: $white !important;
     }
 
     .nav-item .nav-link {
@@ -73,20 +73,20 @@
   }
 
   .white-header {
-    background: #fff !important;
-    background-color: #fff !important;
+    background: $white !important;
+    background-color: $white !important;
 
     a {
-      color: #271b3d !important;
+      color: $header-dark-background !important;
     }
 
     a:hover {
-      color: #fff !important;
+      color: $white !important;
     }
   }
 
   #purple-footer {
-    background-color: #271b3d;
+    background-color: $header-dark-background;
 
     .row {
       margin: 0;
@@ -94,19 +94,91 @@
 
     footer, footer a {
       background: transparent;
-      color: #d5c8ff;
+      color: $purple-500;
+      &:hover {
+        color: $white;
+      }
+    }
+
+    h3 {
+      color: $purple-400;
+    }
+
+    hr {
+      border-top-color: $purple-100;
+    }
+
+    .donate-text {
+      color: $purple-500;
     }
 
     .logo {
-      color: #bda8ff;
+      color: $purple-300;
     }
 
-    .social-circle, .btn-contribute {
-      background: #36205d;
-      color: #bda8ff;
+    .colophon {
+      color: $purple-500;
+    }
 
-      .svg-icon {
-        color: #bda8ff;
+    .social-circle {
+      background: $purple-50;
+      color: $purple-500;
+
+      .instagram svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .twitter svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .facebook svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+
+      .tumblr svg {
+        background-color: $purple-50;
+        fill: $purple-500;
+        &:hover {
+          fill: $white;
+        }
+      }
+    }
+    .btn-contribute {
+      background: $white;
+      box-shadow: none;
+      border-radius: 2px;
+      width: 175px;
+      height: 32px;
+      color: $gray-50;
+      text-align: center;
+      line-height: 1.71;
+      font-weight: bold;
+      font-size: 0.875rem;
+      vertical-align: middle;
+      padding: 0;
+      margin: 32px 0 32px 24px;
+      box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+
+      a {
+        display: flex;
+      }
+
+      .text{
+        display: inline-block;
+        vertical-align: bottom;
       }
     }
   }
@@ -142,7 +214,7 @@
 
 <style lang="scss" scoped>
   #bottom-wrap.purple-4 {
-    background-color: #271b3d;
+    background-color: #271B3D;
   }
 
   #bottom-wrap {
diff --git a/website/client/vue.config.js b/website/client/vue.config.js
index 6dd491b224..fd9f24185f 100644
--- a/website/client/vue.config.js
+++ b/website/client/vue.config.js
@@ -23,7 +23,6 @@ const envVars = [
   'BASE_URL',
   'GA_ID',
   'STRIPE_PUB_KEY',
-  'FACEBOOK_KEY',
   'GOOGLE_CLIENT_ID',
   'APPLE_AUTH_CLIENT_ID',
   'AMPLITUDE_KEY',
diff --git a/website/common/locales/da/backgrounds.json b/website/common/locales/da/backgrounds.json
index 248204ea8c..23b0eea03c 100644
--- a/website/common/locales/da/backgrounds.json
+++ b/website/common/locales/da/backgrounds.json
@@ -492,5 +492,6 @@
     "backgroundParkWithStatueText": "Park med Statue",
     "backgroundDojoNotes": "Lær nye teknikker i en Dojo.",
     "backgroundDojoText": "Dojo",
-    "backgrounds052019": "SET 60: Frigivet Maj 2019"
+    "backgrounds052019": "SET 60: Frigivet Maj 2019",
+    "hideLockedBackgrounds": "Skjul låste baggrunde"
 }
diff --git a/website/common/locales/da/challenge.json b/website/common/locales/da/challenge.json
index 485c28ec48..0067022823 100644
--- a/website/common/locales/da/challenge.json
+++ b/website/common/locales/da/challenge.json
@@ -103,5 +103,6 @@
     "selectParticipant": "Vælg en deltager",
     "filters": "Filtre",
     "wonChallengeDesc": "<%= challengeName %> udvalgte dig som vinder! Din sejr er noteret i dine Præstationer.",
-    "yourReward": "Din Belønning"
+    "yourReward": "Din Belønning",
+    "removeTasks": "Fjern opgaver"
 }
diff --git a/website/common/locales/da/communityguidelines.json b/website/common/locales/da/communityguidelines.json
index 8e4bb8ce29..60d0198d4a 100644
--- a/website/common/locales/da/communityguidelines.json
+++ b/website/common/locales/da/communityguidelines.json
@@ -2,25 +2,25 @@
     "tavernCommunityGuidelinesPlaceholder": "Venlig påmindelse: Det her er en chat for alle aldre, så hold venligst en passende tone og vær opmærksom på indholdet af dine beskeder! Læs Retningslinjer for fællesskabet i sidepanelet, hvis du har spørgsmål.",
     "lastUpdated": "Sidst opdateret:",
     "commGuideHeadingWelcome": "Velkommen til Habitica!",
-    "commGuidePara001": "Vær hilset, eventyrer! Velkommen til Habitica, et land af produktivitet, sund levemåde, og til tider en enkelt hærgende grif. Vi er et muntert fællesskab fuld af hjælpsomme folk der støtter op om hinanden på deres vej til at forbedre sig selv. For at passe ind har du kun brug for en positiv attitude, respektfuld opførsel, og forståelse for at alle har forskellige evner of begrænsninger -- inklusiv dig! Habiticanere er tålmodige med hinanden og forsøger at hjælpe hvor de kan.",
-    "commGuidePara002": "For at sikre at alle er trygge, glade, og produktive i vores fællesskab, har vi nogle retningslinjer. Vi har omhyggeligt konstrueret dem så de er så venlige og letlæselige som muligt. Brug venligt et øjeblik på at læse dem inden du begynder at chatte.",
-    "commGuidePara003": "Disse regler gælder alle de sociale områder vi bruger, inklusiv (men ikke nødvendigvis begrænset til) Trello, GitHub, Weblate og Wikia (wiki'en). Sommetider vil der opstå uforudsete situationer, eksempelvis en ny kilde til konflikt eller en ondskabsfuld åndemaner. Når det sker, kan moderatorer reagere ved at ændre disse retningslinjer for at beskytte fællesskabet mod ny trusler. Frygt ikke: Du vil blive gjort opmærksom på ændringer i retningslinjerne via en påmindelse fra Bailey.",
+    "commGuidePara001": "Vær hilset, eventyrer! Velkommen til Habitica, et land af produktivitet, sund levemåde, og til tider en enkelt hærgende grif. Vi er et muntert fællesskab fuld af hjælpsomme folk der støtter op om hinanden på deres vej til at forbedre sig selv. For at passe ind har du kun brug for en positiv attitude, respektfuld opførsel, og forståelse for at alle har forskellige evner of begrænsninger - inklusiv dig! Habiticanere er tålmodige med hinanden og forsøger at hjælpe hvor de kan.",
+    "commGuidePara002": "For at sikre at alle er trygge, glade, og produktive i vores fællesskab, har vi nogle retningslinjer. Vi har omhyggeligt konstrueret dem så de er så venlige og letlæselige som muligt. Brug venligst et øjeblik på at læse dem inden du begynder at chatte.",
+    "commGuidePara003": "Disse regler gælder alle de sociale områder vi bruger, inklusiv (men ikke nødvendigvis begrænset til) Trello, GitHub, Weblate og Habitica wiki'en på fandom.com. Efterhånden som Habitica vokser og forandres, kan det ske at vores regler bliver ændret. Når der er sket bemærkelsesværdige ændringer af retningslinjerne for fællesskabet, vil du kunne høre om det i en meddelelse fra Bailey og/eller på vores sociale medier!",
     "commGuideHeadingInteractions": "Interaktioner i Habitica",
-    "commGuidePara015": "Habitica har to slags sociale rum: offentlige og private. Offentlige rum inkluderer Værtshuset, Offentlige klaner, GitHub, Trello og Wiki'en. Private rum er Private klaner, Holdchatten og Private beskeder. Alle display names skal følge retningslinjerne for offentlige rum. Gå til Bruger > Indstillinger > Side for at ændre dit brugernavn.",
-    "commGuidePara016": "Når du navigerer rundt i de offentlige steder af Habitica, er der nogle generelle regler for at sørge for, at alle er sikre og glade. De burde være lette for eventyrere som dig!",
-    "commGuideList02A": "<strong>Respekter hinanden</strong>. Vær høflig, venlig og hjælpsom. Husk: Habiticanere kommer fra alle baggrunde og har haft vildt skiftende oplevelser og erfaringer. Det er en del af det, der gør Habitica så cool! At bygge et fællesskab betyder at vi respekterer og fejrer vores forskelle såvel som vores ligheder. Her er nogle nemme måder at vise respekt for hinanden på:",
-    "commGuideList02B": "<strong>Adlyd alt i <a href='/static/terms' target='_blank'>Vilkår og betingelser</a></strong>.",
-    "commGuideList02C": "<strong>Læg ikke billeder eller tekst op, der er voldeligt, truende eller seksuelt eksplicit/antydende, eller som promoverer diskrimination, fordomme, racisme, sexisme, had, chikane eller skade mod et individ eller en gruppe</strong>. Ikke engang som en joke. Dette inkluderer skældsord såvel som udtalelser. Ikke alle har den samme form for humor, så noget du anser som en joke er muligvis sårende for en anden. Angrib jeres Daglige opgaver, ikke hinanden.",
-    "commGuideList02D": "<strong>Hold diskussioner passende for alle aldre</strong>. Vi har mange unge Habiticanere der bruger hjemmesiden! Lad os ikke genere nogen uskyldige eller forhindre nogen Habiticanere i at opnår deres mål.",
-    "commGuideList02E": "<strong>Undgå bandeord. Dette inkluderer mildere, religiøst baserede bandeord der kan være acceptable andre steder</strong>. Vi har folk fra alle religiøse og kulturelle baggrunde, og vi vil gerne sørge for at de alle føler sig trygge i offentlige rum. <strong>Hvis en moderator eller medarbejder fortæller dig at et udtryk ikke er tilladt i Habitica, selvom det er et udtryk, du ikke vidste var problematisk, er den beslutning endegyldig</strong>. Der vil blive slået særlig hårdt ned på skældsord, da de også går imod vores Vilkår og betingelser.",
-    "commGuideList02F": "<strong>Undgå lange diskussioner af opsplittende emner i Værtshuset og hvor det ellers ikke ville være et passende emne</strong>. Hvis du føler nogen har sagt noget uhøfligt eller sårende, så svar dem ikke. Hvis nogen nævner noget der er tilladt ifølge retningslinjerne, men sårende for dig, er det okay høfligt at sige det til dem. Hvis det er imod retningslinjerne eller Vilkår og betingelser, så rapporter det og lad en moderator håndtere det. Hvis du er i tvivl, så rapporter beskeden.",
-    "commGuideList02G": "<strong>Overhold omgående enhver anmodning fra en Moderator.</strong>. Dette kan inkludere, men er ikke begrænset til, at bede dig begrænse antallet af dine beskeder i et bestemt rum, at fjerne upassende indhold fra din profil, at bede dig om at tage din diskussion et mere passende sted osv.",
-    "commGuideList02J": "<strong>Spam ikke</strong>. Spam inkluderer, men er ikke begrænset til: at skrive den samme kommentar eller spørgsmål flere steder, at lægge links op uden forklaring eller kontekst, at skrive meningsløse beskeder, at skrive adskillige promoverende beskeder om en Klan, Hold eller Udfordring, eller at skrive mange beskeder på én gang. At tigge om ædelsten eller et abonnement i ethvert chatrum eller via Privatbesked betragtes også som spam.<br/><br/>Det er op til moderatorerne at beslutte om noget er spam eller kan føre til spam, selv hvis du ikke mener du har spammet. For eksempel er det i orden at reklamere for en Klan en enkelt eller to gange, men adskillige beskeder samme da ville sikkert blive betragtet som spam, uanset hvor nyttig Klanen er!",
+    "commGuidePara015": "Habitica har to slags sociale rum: offentlige og private. Offentlige rum inkluderer Værtshuset, offentlige klaner, GitHub, Trello og wiki'en. Private rum tæller private klaner, Holdchatten og private beskeder. Alle displaynavne og @brugernavne skal følge retningslinjerne for offentlige rum. Gå til Menu > Indstillinger > Profil for at ændre dit displaynavn eller @brugernavn i app'en. På Habiticas hjemmeside skal du gå til Bruger > Indstillinger.",
+    "commGuidePara016": "Når du navigerer rundt i de offentlige rum af Habitica, er der nogle generelle regler for at sørge for, at alle er sikre og glade.",
+    "commGuideList02A": "<strong>Respekter hinanden</strong>. Vær høflig, venlig og hjælpsom. Husk: Habiticanere kommer fra alle baggrunde og har haft vildt skiftende oplevelser og erfaringer. Det er en del af det, der gør Habitica så cool! At bygge et fællesskab betyder at vi respekterer og fejrer vores forskelle såvel som vores ligheder.",
+    "commGuideList02B": "<strong>Adlyd alt i <a href='/static/terms' target='_blank'>Vilkår og betingelser</a></strong> i både offentlige og private rum.",
+    "commGuideList02C": "<strong>Læg ikke billeder eller tekst op, der er voldeligt, truende eller seksuelt eksplicit/antydende, eller som promoverer diskrimination, fordomme, racisme, sexisme, had, chikane eller skade mod et individ eller en gruppe</strong>. Ikke engang som en joke. Dette inkluderer skældsord såvel som udtalelser. Ikke alle har den samme form for humor, så noget du anser som en joke er muligvis sårende for en anden.",
+    "commGuideList02D": "<strong>Hold diskussioner passende for alle aldre</strong>. Dette betyder at 18+ emner ikke bør diskuteres i offentlige rum. Vi har mange unge Habiticanere der bruger hjemmesiden, og vores brugere kommer fra mange steder i verden. Vi vil gerne have, at Habitica er så rart og inkluderende et sted som muligt.",
+    "commGuideList02E": "<strong>Undgå bandeord. Dette inkluderer mildere, religiøst baserede bandeord der kan være acceptable andre steder, og forkortede eller forklædte bandeord.</strong> Vi har folk fra alle religiøse og kulturelle baggrunde, og vi vil gerne sørge for at de alle føler sig trygge i offentlige rum. <strong>Hvis en moderator eller medarbejder fortæller dig at et udtryk ikke er tilladt i Habitica, selvom det er et udtryk, du ikke vidste var problematisk, er den beslutning endegyldig.</strong> Der vil blive slået særlig hårdt ned på skældsord, da de også går imod vores Vilkår og betingelser.",
+    "commGuideList02F": "Undgå lange diskussioner af opsplittende emner i Værtshuset og hvor det ellers ikke ville være et passende emne. Hvis nogen siger noget der er tilladt under vores retningslinjer, men som er sårende for dig, er det okay høfligt at sige det til dem. Hvis nogen siger til dig, at du har gjort dem ubehageligt til mode, så tag et øjeblik til at tænke over dine ord frem for at svare i vrede. Hvis du føler, at en samtale er ved at blive overophedet, følelsesladet eller sårende, <strong>så hold op med at svare. Rapportér i stedet de relevante beskeder for at sende besked til os.</strong> Moderatorerne vil se på det, så hurtigt de kan. Du kan også sende en email til <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> og er velkommen til at sende screenshots, hvis det ville hjælpe os med at forstå sagen.",
+    "commGuideList02G": "<strong>Overhold omgående enhver anmodning fra en Moderator.</strong> Dette kan inkludere, men er ikke begrænset til, at bede dig begrænse antallet af dine beskeder i et bestemt rum, at fjerne upassende indhold fra din profil, at bede dig om at tage din diskussion et mere passende sted osv. Begynd ikke at diskutere med moderatorerne. Hvis du har kommentarer til Habiticas moderering, så send en email til <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> for at komme i kontakt med vores community manager.",
+    "commGuideList02J": "<strong>Spam ikke</strong>. Spam inkluderer, men er ikke begrænset til: at skrive den samme kommentar eller spørgsmål flere steder, <strong>at lægge links op uden forklaring eller kontekst</strong>, at skrive meningsløse beskeder, at skrive adskillige promoverende beskeder om en Klan, Hold eller Udfordring, eller at skrive mange beskeder på én gang. Hvis det at andre brugere følger et link vil give nogen form for afkast eller fordel til dig, skal det stå i beskeden, ellers vil det også blive regnet for spam. Det er op til moderatorerne at beslutte om noget er spam.",
     "commGuideList02K": "<strong>Undgå at skrive store overskrifter i offentlige chatrum, især Værtshuset</strong>. Ligesom ALL CAPS læses det som om du råber, og forstyrrer den behagelige stemning.",
-    "commGuideList02L": "<strong>Vi fraråder kraftigt deling af personlig information -- især information der kan bruges til at identificere dig - i offentlige chatrum</strong>. Identificerende personlig information inkluderer, men er ikke begrænset til: din adresse, emailadresse og din API token/password. Det er for din sikkerheds skyld! Medarbejdere eller moderatorer kan fjerne sådanne beskeder efter forgodtbefindende. Hvis du bliver bedt om personlig information i en privat Klan, Hold eller Besked, anbefaler vi kraftigt at du høfligt afviser og gør medarbejderne og moderatorerne opmærksomme ved enten 1) at rapportere beskeden hvis det er i chatten tilhørende et Hold eller privat Klan, eller 2) at udfylde <a href='https://contact.habitica.com/' target='_blank'>Moderatorkontaktformularen</a> og vedlægger screenshots.",
+    "commGuideList02L": "<strong>Vi fraråder kraftigt deling af personlig information -- især information der kan bruges til at identificere dig - i offentlige chatrum</strong>. Identificerende personlig information inkluderer, men er ikke begrænset til: din adresse, emailadresse og din API token/password. Det er for din sikkerheds skyld! Medarbejdere eller moderatorer kan fjerne sådanne beskeder efter forgodtbefindende. Hvis du bliver bedt om personlig information i en privat Klan, Hold eller Besked, anbefaler vi kraftigt at du høfligt afviser og gør medarbejderne og moderatorerne opmærksomme ved enten 1) at rapportere beskeden, eller 2) at sende en email til <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> og vedhæfte screenshots.",
     "commGuidePara019": "<strong>I private rum</strong> har brugere mere frihed til at diskutere hvilke emner de har lyst til, men de må stadig ikke gå imod Vilkår og betingelser, inklusiv at skrive nedværdigende skældsord eller noget diskriminerende, voldeligt eller truende indhold. Bemærk, at fordi navne på Udfordringer kan ses i vinderens offentlige profil skal ALLE navne på Udfrodringer adlyde retningslinjerne for offentlige rum, selv hvis de foregår i et privat rum.",
-    "commGuidePara020": "<strong>Privatbeskeder</strong> har nogle ekstra retningslinjer. Hvis nogen har blokeret dig må du ikke kontakte dem på andre måder for at bede dem om at fjerne blokeringen. Derudover må du ikke sende privatbeskeder til andre for at bede om hjælp (fordi offentlige svar til spørgsmål om hjælp også kan hjælpe resten af fællesskabet). Sidst men ikke mindst må du ikke sende privatbeskeder til nogen for at tigge om ædelsten eller et abonnement, da dette kan anses som spamming.",
-    "commGuidePara020A": "<strong>Hvis du ser et indlæg eller en privatbesked, du mener går imod retningslinjerne for offenlige rum, beskrevet ovenfor, eller hvis du ser indlæg eller privatbeskeder, der bekymrer dig eller gør dig utryg, kan du gøre Moderatorer og Medarbejdere opmærksomme på den ved at klikke på flag-ikonet for at rapportere det</strong>. En Medarbejder eller Moderator vil tage sig af situationen, så snart de kan. Bemærk venligst, at det at rapportere uskyldige indlæg går imod disse Retningslinjer (se \"Overtrædelser\" nedenunder). Du kan også kontakte Moderatorerne via formularen “<a href='https://contact.habitica.com/' target='_blank'>Kontakt Moderatorerne</a>.” Det kan være det bedste at gøre dette hvis der er flere problematiske indlæg af den samme person i forskellige Klaner, eller hvis situationen kræver en forklaring. Du kan kontakte os på dit eget sprog hvis det er lettere for dig. Vi bliver muligvis nødt til at bruge Google Translate, men vi vil gerne have at du føler dig tryg ved at tage kontakt til os, hvis du har et problem.",
+    "commGuidePara020": "<strong>Privatbeskeder</strong> har nogle ekstra retningslinjer. Hvis nogen har blokeret dig må du ikke kontakte dem på andre måder for at bede dem om at fjerne blokeringen. Derudover må du ikke sende privatbeskeder til andre for at bede om hjælp (fordi offentlige svar til spørgsmål om hjælp også kan hjælpe resten af fællesskabet). Sidst men ikke mindst må du ikke sende privatbeskeder til nogen for at tigge om nogen form for service, der koster rigtige penge.",
+    "commGuidePara020A": "<strong>Hvis du ser et indlæg eller en privatbesked, du mener går imod retningslinjerne for offentlige rum, beskrevet ovenfor, eller hvis du ser indlæg eller privatbeskeder, der bekymrer dig eller gør dig utryg, kan du gøre Moderatorer og Medarbejdere opmærksomme på den ved at klikke på flag-ikonet for at rapportere det</strong>. En Medarbejder eller Moderator vil tage sig af situationen, så snart de kan. Bemærk venligst, at det at rapportere uskyldige indlæg går imod disse retningslinjer (se \"Overtrædelser\" nedenunder). Du kan også kontakte Moderatorerne ved at emaile <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>. Det kan være det bedste at gøre dette, hvis der er flere problematiske indlæg af den samme person i forskellige Klaner, eller hvis situationen kræver en forklaring. Du kan kontakte os på dit eget sprog hvis det er lettere for dig. Vi bliver muligvis nødt til at bruge Google Translate, men vi vil gerne have at du føler dig tryg ved at tage kontakt til os, hvis du har et problem.",
     "commGuidePara021": "Herudover har nogen offentlige steder i Habitica ekstra retningslinjer.",
     "commGuideHeadingTavern": "Værtshuset",
     "commGuidePara022": "Værtshuset er det primære sted Habiticanere hænger ud. Kroværten Daniel holder stedet funklende rent, og Lemoness vil med glæde fremtrylle dig et glas lemonade mens du sidder og snakker. Bare husk…",
@@ -31,8 +31,8 @@
     "commGuidePara029": "<strong>Offentlige Klaner er meget ligesom Værtshuset, bortset fra at de i stedet for at være til generelle samtaler har et bestemt tema</strong>. Chat i offentlige Klaner bør have fokus på dette tema. For eksempel ville medlemmer af Klanen Wordsmiths måske blive fornærmede, hvis samtalen pludselig handler om havearbejde, og Klanen for Dragefans har nok ikke meget interesse i at tyde oldtidens runer. Nogle Klaner er meget afslappede om dette end andre, men forsøg generelt <strong>at holde dig til emnet</strong>!",
     "commGuidePara031": "I nogle offentlige Klaner omtales der følsomme emner som depression, religion, politik osv. Dette er helt i orden, så længe samtalerne i Klanen ikke bryder nogle Vilkår og betingelser eller Regler for offentlige rum, og så længe de holder sig til Klanens emne.",
     "commGuidePara033": "<strong>Offentlige Klaner må IKKE indeholde indhold for aldersgruppen 18+. Hvis de planlægger jævnligt at diskutere følsomt indhold, skal dette stå i Klanens beskrivelse</strong>. Dette er for at holde Habitica sikkert of trygt for alle.",
-    "commGuidePara035": "<strong>Hvis en Klan omhandler flere forskellige følsomme emner, er det hensynsfuldt over for dine med-Habiticanere at skrive din kommentar efter en advarsel (fx \"Advarsel: Omtaler selvskade\")</strong>. Disse kan karakteriseres som trigger warnings og/eller noter om indholdet, og Klaner kan have deres egne regler om disse udover dem, der er givet her. Hvis det er muligt, så brug venligst <a href='http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a> for at gemme det potentielt følsomme indhold under flere linjeskift, så de, der ikke ønsker at læse det, kan scrolle forbi uden at se indholdet. Habiticas medarbejdere og moderatorer kan stadig fjerne dette indhold efter eget skøn.",
-    "commGuidePara036": "Desuden bør følsomt indhold stadig være aktuelt for Klanens emne - at tale om selvskade i en Klan hvor fokus er på at kæmpe mod depression giver mening, men er mindre passende i en Klan for musik. Hvis du ser nogen, som gentagne gange går imod denne retningslinje, især efter at være blevet bedt om at stoppe flere gange, så rapportér venligst deres indlæg og gør moderatorerne opmærksom på dette via <a href='https://contact.habitica.com/' target='_blank'>Moderatorkontaktformularen</a>.",
+    "commGuidePara035": "<strong>Hvis en Klan omhandler flere forskellige følsomme emner, er det hensynsfuldt over for dine med-Habiticanere at skrive din kommentar efter en advarsel (fx \"Advarsel: Omtaler selvskade\")</strong>. Disse kan karakteriseres som trigger warnings og/eller noter om indholdet, og Klaner kan have deres egne regler om disse udover dem, der er givet her. Hvis det er muligt, så brug venligst <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a> for at gemme det potentielt følsomme indhold under flere linjeskift, så de, der ikke ønsker at læse det, kan scrolle forbi uden at se indholdet. Habiticas medarbejdere og moderatorer kan stadig fjerne dette indhold efter eget skøn.",
+    "commGuidePara036": "Desuden bør følsomt indhold stadig være aktuelt for Klanens emne - at tale om selvskade i en Klan hvor fokus er på at kæmpe mod depression giver mening, men er mindre passende i en Klan for musik. Hvis du ser nogen, som gentagne gange går imod denne retningslinje, især efter at være blevet bedt om at stoppe flere gange, så rapportér deres beskeder.",
     "commGuidePara037": "<strong>Ingen Klaner, hverken Offentlige eller Private, bør oprettes med det formål at angribe en gruppe eller et individ</strong>. At oprette en sådan Klan er grundlæg for øjeblikkelig bortvisning fra Habitica. Nedkæmp dårlige vaner, ikke dine med-eventyrere!",
     "commGuidePara038": "<strong>Alle Udfordringer i Værtshuset og Offentlige Klaner skal også følge disse regler</strong>.",
     "commGuideHeadingInfractionsEtc": "Overtrædelser, Konsekvenser og Genskabelse",
@@ -44,24 +44,24 @@
     "commGuidePara053": "De følgende er eksempler på større overtrædelser. Listen er ikke fyldestgørende.",
     "commGuideList05A": "Brud på Betingelser og Vilkår",
     "commGuideList05B": "Hadtale/billeder, Chikane/stalking, Cyber-mobning, Flaming og Trolling",
-    "commGuideList05C": "Brud på Prøvetid",
-    "commGuideList05D": "At udgive sig for at være Ansat eller Moderator",
-    "commGuideList05E": "Gentagne Moderate Overtrædelser",
+    "commGuideList05C": "Brud på prøvetid",
+    "commGuideList05D": "At udgive sig for at være Ansat eller Moderator - dette inkluderer at påstå, at brugerskabte platforme, der ikke at associerede med Habitica, er officielle og/eller modereret af Habitica eller deres mods/medarbejdere",
+    "commGuideList05E": "Gentagne moderate overtrædelser",
     "commGuideList05F": "Oprettelse af en ekstra konto for at undgå konsekvenser (for eksempel at oprette en ny konto til at chatte med, efter at have fået frataget ens chat-privilegier)",
     "commGuideList05G": "Bevidst bedrag af Ansatte eller Moderatorer med det formål at undgå konsekvenser eller bringe en anden bruger i vanskeligheder",
-    "commGuideHeadingModerateInfractions": "Moderate Overtrædelser",
+    "commGuideHeadingModerateInfractions": "Moderate overtrædelser",
     "commGuidePara054": "Moderate overtrædelser gør ikke fællesskabet usikkert, men de gør det ubehageligt. Disse overtrædelser har moderate konsekvenser. Når de står sammen med andre overtrædelser, kan konsekvenserne blive større.",
-    "commGuidePara055": "De følgende er eksempler på Moderate Overtrædelser. Listen er ikke endelig.",
+    "commGuidePara055": "De følgende er eksempler på moderate overtrædelser. Listen er ikke fyldestgørende.",
     "commGuideList06A": "At ignorere, opføre respektløst overfor, eller skændes med en Moderator. Dette inkluderer offentlige at klage over moderatorer eller andre brugere, offentligt at forherlige eller forsvare bortviste brugere, eller at debatterer hvorvidt en moderators handlinger var passende. Hvis du er bekymret om en af reglerne eller en Moderators opførsel, så kontakt venligst de ansatte via email (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
     "commGuideList06B": "Backseat Modding. For at tydeliggøre en relevant pointe: En venlig påmindelse om reglerne er helt fint. Backseat modding består i at fortælle, kræve, og/eller stærkt antyde at nogen bør gøre som du siger for at rette op på en fejl. Du kan gøre nogen opmærksom på at de har begået en overtrædelse, men forlang venligst ikke at de skal gøre noget - for eksempel er det bedre at sige \"Bare så du ved det er det ikke så godt at bande i Værtshuset, så det kan være du skulle slette det\" end \"Jeg er nødt til at bede dig slette det indlæg.\"",
     "commGuideList06C": "At rapportere uskyldige indlæg med vilje.",
     "commGuideList06D": "Gentagne gange at bryde Retningslinjerne for offentlige rum",
     "commGuideList06E": "Gentagne gange at begå mindre overtrædelser",
-    "commGuideHeadingMinorInfractions": "Mindre Overtrædelser",
+    "commGuideHeadingMinorInfractions": "Mindre overtrædelser",
     "commGuidePara056": "Mindre overtrædelser har kun mindre konsekvenser, men er stadig ikke anbefalede. Hvis de sker gentagne gange kan det føre til større konsekvenser.",
-    "commGuidePara057": "De følgende er eksempler på Mindre Overtrædelser. Listen er ikke fyldestgørende.",
+    "commGuidePara057": "De følgende er eksempler på mindre overtrædelser. Listen er ikke fyldestgørende.",
     "commGuideList07A": "Førstegangsbrud på Retningslinjer for Offentlige Steder",
-    "commGuideList07B": "Alle udsagn eller handlinger, som udløser et \"Lad venligst være\". Når en Moderator er nødt til at sige \"Lad venligst være med det\" til en bruger, kan det tælle som en meget lille overtrædelse for den bruger. Et eksempel kunne være \"Lad venligst være med at blive ved med at argumentere for indførslen af den funktion, når vi har sgat til dig adskillige gange at det ikke kan lade sig gøre.\" I mange tilfælde vil 'Lad venligst være' blot være konsekvensen af overtrædelsen, men hvis Moderatorerne er nødt til at bede den samme bruger flere gange om at holde op, vil de Mindre Overtrædelser begynde at tælle som Moderate Overtrædelser.",
+    "commGuideList07B": "Alle udsagn eller handlinger, som udløser et \"lad venligst være\" fra en moderator. Når du offentligt bliver bedt om at stoppe en handling, kan dette i sig selv tælle som en mindre overtrædelse. Hvis mods er nødt til gentagne gange at irettesætte den samme person, kan det komme til at tælle som en grovere overtrædelse",
     "commGuidePara057A": "Nogle indlæg kan blive skjult fordi de indeholder følsom information eller kan give folk det forkerte indtryk. Typisk gælder dette ikke som en overtrædelser, især ikke den første gang det sker!",
     "commGuideHeadingConsequences": "Konsekvenser",
     "commGuidePara058": "I Habitica - som i virkeligheden - har alle handlinger også konsekvenser, hvad enten det er at komme i bedre form fordi du har løbet, få huller i tænderne fordi du har spist for meget sukker, eller bestå et fag fordi du har studeret.",
@@ -71,53 +71,63 @@
     "commGuideList08B": "hvad konsekvensen er",
     "commGuideList08C": "hvad der skal til for at rette fejlen og genoprette din status, hvis muligt.",
     "commGuidePara060A": "Hvis situationen påkræver det kan du også modtage en PM eller email plus et indlæg i det forum, hvor overtrædelsen blev begået. I nogle tilfælde bliver du slet ikke irettesat offentligt.",
-    "commGuidePara060B": "Hvis din konto bortvises (en alvorlig konsekvens), vil du ikke være i stand til at logge på Habitica, og vil få en fejl-besked når du prøver. <strong>Hvis du ønsker at undskylde eller argumentere for genoprettelse af din konto, så skriv venligst en email til de ansatte på <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> med dit UUID (unikke bruger-ID)</strong> (som vil blive oplyst i fejl-beskeden). Det er <strong>dit</strong> ansvar at tage kontakt, hvis du ønsker en genovervejelse af situationen, eller genoprettelse.",
-    "commGuideHeadingSevereConsequences": "Eksempler på Større Konsekvenser",
+    "commGuidePara060B": "Hvis din konto bortvises (en alvorlig konsekvens), vil du ikke være i stand til at logge på Habitica, og vil få en fejl-besked når du prøver. <strong>Hvis du ønsker at undskylde eller argumentere for genoprettelse af din konto, så skriv venligst en email til de ansatte på <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> med dit bruger-ID</strong> (som vil blive oplyst i fejlbeskeden) eller @brugernavn. Det er <strong>dit</strong> ansvar at tage kontakt, hvis du ønsker en genovervejelse af situationen, eller genoprettelse.",
+    "commGuideHeadingSevereConsequences": "Eksempler på større konsekvenser",
     "commGuideList09A": "Kontoudelukkelser (se ovenstående)",
     "commGuideList09C": "Permanent deaktivering (\"indefrysning\") af fremskridt i Bidragsyder-niveauer",
-    "commGuideHeadingModerateConsequences": "Eksempler på Moderate Konsekvenser",
+    "commGuideHeadingModerateConsequences": "Eksempler på moderate konsekvenser",
     "commGuideList10A": "Begrænsede offentlige og/eller private chatprivilegier",
-    "commGuideList10A1": "Hvis dine handlinger resulterer i fradragelse af dine rettigheder til chatten, vil en Moderator eller Ansat sende dig en privatbesked og/eller et indlæg i det forum du blev suspenderet fra for at fortælle dig grunden til og længden af din suspendering. Efter denne periode vil du få dine chatrettigheder tilbage, forudsat at du er villig til at ændre ved den opførsel du blev suspenderet for og overholde Fællesskabets Retningslinjer.",
+    "commGuideList10A1": "Hvis dine handlinger resulterer i fradragelse af dine rettigheder til chatten, vil en Moderator eller Ansat sende dig en privatbesked og/eller et indlæg i det forum du blev suspenderet fra for at fortælle dig grunden til og længden af din suspendering, og/eller hvad du skal gøre for at få dine chatprivilegier tilbage. Du vil få dem igen, hvis du høfligt følger de anvisninger du får, og erklærer dig villig til at følge vores Retningslinjer for Fællesskabet og Betingelser & Vilkår",
     "commGuideList10C": "Begrænsede Klan/Udfordringsoprettelsesprivilegier",
     "commGuideList10D": "Midlertidig deaktivering (\"indefrysning\") af fremskridt i Bidragsyder-niveauer",
     "commGuideList10E": "Degradering af Bidragsyder-niveauer",
-    "commGuideList10F": "Sætte brugere på \"Prøvetid\"",
-    "commGuideHeadingMinorConsequences": "Eksempler på Mindre Konsekvenser",
+    "commGuideList10F": "At sætte brugere på \"prøvetid\"",
+    "commGuideHeadingMinorConsequences": "Eksempler på mindre konsekvenser",
     "commGuideList11A": "Påmindelser om Retningslinjer for Offentlige Steder",
     "commGuideList11B": "Advarsler",
     "commGuideList11C": "Anmodninger",
     "commGuideList11D": "Slettelser (Moderatorer/Ansatte kan slette problematisk indhold)",
-    "commGuideList11E": "Rettelser (Moderatorer/Ansatte kan slette problematisk indhold)",
+    "commGuideList11E": "Rettelser (Moderatorer/Ansatte kan redigere problematisk indhold)",
     "commGuideHeadingRestoration": "Genoprettelse",
     "commGuidePara061": "Habitica er en land dedikeret til forbedring, og vi tror på at give en chance til <strong>Hvis du begår en overtrædelse og bliver udsat for en konsekvens som følge, så se det som en mulighed for at evaluere dine handlinger og forbedre din opførsel som medlem af fællesskabet</strong>.",
     "commGuidePara062": "Den bekendtgørelse, besked og/eller email du modtager, der forklarer konsekvenserne af dine handlinger, er en god kilde til information. Hold dig til de begrænsninger der er blevet påført, og bestræb dig på at møde de krav, der kan få eventuelle straffe ophævet.",
     "commGuidePara063": "Hvis du ikke forstår konsekvenserne eller arten af din overtrædelse, så bed Medarbejderne/Moderatorerne om hjælp, så du kan undgå at begå overtrædelser i fremtiden. Hvis du føler at en bestemt beslutning var uretfærdig, kan du kontakte de ansatte for at diskutere det på <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>.",
     "commGuideHeadingMeet": "Mød de Ansatte og Moderatorerne!",
-    "commGuidePara006": "Habitica har nogle utrættelige omvandrende riddere, der kæmper sammen med de ansatta for at holde fællesskabet roligt, tilfreds, og frit for trolde. Hver har et specifikt domæne, men vil sommetider blive  kaldt ind for at hjælpe i andre sociale sfærer.",
+    "commGuidePara006": "Habitica har nogle utrættelige omvandrende riddere, der kæmper sammen med de ansatte for at holde fællesskabet roligt, tilfreds, og frit for trolde. Hver har et specifikt domæne, men vil sommetider blive kaldt ind for at hjælpe i andre sociale sfærer.",
     "commGuidePara007": "Ansatte har lilla tags markeret med kroner. Deres titel er \"Heltemodig\".",
-    "commGuidePara008": "Moderatorer har mørkeblå tags markeret med stjerner. Deres titel er \"Beskytter\". Den eneste undtagelse er Bailey, der som NPC har et sort og grønt tag markeret med en stjerne.",
-    "commGuidePara009": "De nuværende Ansatte er (fra venstre mod højre):",
-    "commGuideAKA": "<%= habitName %> aka <%= realName %>",
+    "commGuidePara008": "Moderatorer har mørkeblå tags markeret med stjerner. Deres titel er \"Beskytter\".",
+    "commGuidePara009": "De nuværende ansatte er (fra venstre mod højre):",
+    "commGuideAKA": "<%= habitName %>, aka <%= realName %>",
     "commGuideOnTrello": "<%= trelloName %> på Trello",
     "commGuideOnGitHub": "<%= gitHubName %> på GitHub",
     "commGuidePara010": "Der er også flere Moderatorer, der hjælper de ansatte. Disse er omhyggeligt udvalgt, så vis dem respekt og lyt til deres forslag.",
-    "commGuidePara011": "De nuværende Moderatorer er (fra venstre mod højre):",
-    "commGuidePara011b": "På GitHub/Wikia",
-    "commGuidePara011c": "på Wikia",
+    "commGuidePara011": "De nuværende moderatorer er (fra venstre mod højre):",
+    "commGuidePara011b": "på GitHub/Fandom",
+    "commGuidePara011c": "på wiki'en",
     "commGuidePara011d": "på GitHub",
     "commGuidePara012": "Hvis du har et problem eller bekymring, der drejer sig om en bestemt Moderator, så send venligst en email til vores Medarbejdere (<a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>).",
     "commGuidePara013": "Brugere kommer og går i et fællesskab så stort som Habitica. Sommetider bliver en medarbejder eller moderator nødt til at fralægge sig deres ædle kappe, og slappe lidt af. De følgende er Ansatte og Moderatorer Emeritus. De løfter ikke længere et ansvar som Ansat eller Moderator, men vi vil stadig gerne mindes deres indsats!",
-    "commGuidePara014": "Ansatte og Moderatorer Emeritus:",
-    "commGuideHeadingFinal": "Den Sidste Sektion",
-    "commGuidePara067": "Det var så det, modige Habiticaner - Retningslinjerne for fællesskabet! Tør sveden af panden og giv dig selv nogle Erfaringpoint for at læse det hele. Hvis du har nogle spørgsmål om disse Retningslinjer for fællesskabet, så tag venligst fat i os via <a href='https://contact.habitica.com/' target='_blank'>Moderatorkontaktformularen</a>, og vi vil med glæde forsøge at gøre tingene klart for dig.",
-    "commGuidePara068": "Tag afsted, modige eventyrer, og bekæmp nogle Daglige!",
+    "commGuidePara014": "Ansatte og Moderatorer emeritus:",
+    "commGuideHeadingFinal": "Den sidste sektion",
+    "commGuidePara067": "Det var så det, modige Habiticaner - Retningslinjerne for fællesskabet! Tør sveden af panden og giv dig selv nogle Erfaringpoint for at læse det hele. Hvis du har nogle spørgsmål om disse Retningslinjer for fællesskabet, så tag venligst fat i os via <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, og vi vil med glæde forsøge at gøre tingene klart for dig.",
+    "commGuidePara068": "Tag afsted, modige eventyrer, og nedkæmp nogle Daglige!",
     "commGuideHeadingLinks": "Nyttige links",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: en Klan hvor brugere kan stille spørgsmål!",
-    "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>Wiki'en</a>: den største samling af information om Habitica.",
-    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: til bug-rapporter eller hjælp med kodning!",
+    "commGuideLink02": "<a href='https://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>Wiki'en</a>: den største samling af information om Habitica.",
+    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: for at hjælpe med kodning!",
     "commGuideLink04": "<a href='https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link' target='_blank'>Feedbackformularen</a>: til forslag til hjemmesiden og app'en.",
     "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>Den mobile Trello</a>: til at bede om funktioner til vores apps.",
     "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>Kunst-Trello</a>: til at indsende pixel art.",
     "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>Quest-Trello</a>: til at indsende tekst til quests.",
-    "commGuidePara069": "Følgende talentfulde kunstnere har bidraget med disse illustrationer:"
+    "commGuidePara069": "Følgende talentfulde kunstnere har bidraget med disse illustrationer:",
+    "commGuidePara017": "Her er den hurtige version, men vi opfordrer dig til at læse den mere detaljerede udgave nedenunder:",
+    "commGuideList01A": "Vores Betingelser & Vilkår gælder alle steder i Habitica, inklusiv private klaner, holdchatten og private beskeder.",
+    "commGuideList02M": "Bed eller tig ikke andre om at give dig ædelsten, et abonnement eller medlemskab i gruppeplaner. Dette er ikke tilladt at gøre i hverken Værtshuset, offentlige eller private rum, eller i privatbeskeder. Hvis du får en besked med en anmodning om ting, der koster rigtige penge, så rapportér dem venligst. Gentaget eller groft tiggeri, især efter en advarsel er blevet udstedt, kan resulterer i en blokering af din konto.",
+    "commGuideList01B": "Forbudt: Al kommunikation der er voldeligt, truende, opfordrer til diskrimination osv., inklusiv memes, billeder og jokes.",
+    "commGuideList01C": "Al samtale skal være passende for enhver aldersgruppe og ikke indeholde skælds- ellers bandeord.",
+    "commGuideList01D": "Følg venligst moderatorernes anvisninger.",
+    "commGuideList01E": "Start og deltag ikke i diskussioner i Værtshuset, der kan føre til skænderier.",
+    "commGuideList01F": "Bed ikke andre om at give dig ting der koster rigtige penge, spam ikke, og skriv ikke beskeder i all caps eller stor overskriftstekst.",
+    "commGuideList05H": "Grove eller gentagne forsøg på at bedrage eller presse andre spillere til at give dig genstande/services, der koster rigtige penge",
+    "commGuideList09D": "Fjernelse af Bidragsyder-niveauer"
 }
diff --git a/website/common/locales/da/content.json b/website/common/locales/da/content.json
index 411aeda35b..24dc9bd63e 100644
--- a/website/common/locales/da/content.json
+++ b/website/common/locales/da/content.json
@@ -200,7 +200,7 @@
     "hatchingPotionEmber": "Glødende",
     "hatchingPotionThunderstorm": "Tordenvejr",
     "hatchingPotionGhost": "Spøgelse",
-    "hatchingPotionRoyalPurple": "Royal lilla",
+    "hatchingPotionRoyalPurple": "Purpur",
     "hatchingPotionHolly": "Kristtorn",
     "hatchingPotionCupid": "Amor",
     "hatchingPotionShimmer": "Glimmer",
diff --git a/website/common/locales/da/contrib.json b/website/common/locales/da/contrib.json
index 61d0a1d553..e858d56429 100644
--- a/website/common/locales/da/contrib.json
+++ b/website/common/locales/da/contrib.json
@@ -49,9 +49,10 @@
     "balance": "Balance",
     "playerTiers": "Spillertrin",
     "tier": "Trin",
-    "conRewardsURL": "http://habitica.fandom.com/wiki/Contributor_Rewards",
+    "conRewardsURL": "https://habitica.fandom.com/wiki/Contributor_Rewards",
     "surveysSingle": "Hjalp Habitica med at vokse ved at udfylde et spørgeskema eller var en stor hjælp ved test. Tusind tak!",
     "surveysMultiple": "Hjalp Habitica med at vokse ved <%= count %> lejligheder, enten ved at udfylde et spørgeskema eller hjalp med et større test-arbejde. Tusind tak!",
     "blurbHallPatrons": "Dette er Protektorernes Sal, hvor vi ærer de ædle eventyrere, der støttede Habiticas originale Kickstarter. Vi takker dem for at hjælpe os med at vække Habitica til live!",
-    "blurbHallContributors": "Dette er Bidragsydernes Sal, hvor dem, der har bidraget med open-source materiale til Habitica, bliver æret. Om det er gennem kode, grafik, musik, tekst eller bare generel hjælpsomhed, har de modtaget <a href='http://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> ædelsten, eksklusivt udstyr</a>, og <a href='http://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>prestigefyldte titler</a>. Du kan også bidrage til Habitica! <a href='http://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Find ud af mere her. </a>"
+    "blurbHallContributors": "Dette er Bidragsydernes Sal, hvor dem, der har bidraget med open-source materiale til Habitica, bliver æret. Om det er gennem kode, grafik, musik, tekst eller bare generel hjælpsomhed, har de modtaget <a href='https://habitica.fandom.com/wiki/Contributor_Rewards' target='_blank'> ædelsten, eksklusivt udstyr</a>, og <a href='https://habitica.fandom.com/wiki/Contributor_Titles' target='_blank'>prestigefyldte titler</a>. Du kan også bidrage til Habitica! <a href='https://habitica.fandom.com/wiki/Contributing_to_Habitica' target='_blank'> Find ud af mere her. </a>",
+    "noPrivAccess": "Du har ikke de påkrævede rettigheder."
 }
diff --git a/website/common/locales/da/death.json b/website/common/locales/da/death.json
index b24a8ac49b..eeadc8213f 100644
--- a/website/common/locales/da/death.json
+++ b/website/common/locales/da/death.json
@@ -3,7 +3,7 @@
     "dontDespair": "Bare rolig!",
     "deathPenaltyDetails": "Du mistede et Niveau, dit Guld og et stykke Udstyr, men du kan få det hele igen med hårdt arbejde! Held og lykke - du skal nok klare den.",
     "refillHealthTryAgain": "Genfyld Liv og Prøv Igen",
-    "dyingOftenTips": "Sker dette ofte? <a href='http://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Her er nogle fif!</a>",
+    "dyingOftenTips": "Sker dette ofte? <a href='https://habitica.fandom.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Her er nogle fif!</a>",
     "losingHealthWarning": "Pas på - du mister Liv!",
     "losingHealthWarning2": "Lad ikke dit Liv falde til nul! Hvis du gør det vil du tabe et niveau, alt dit guld og et stykke udstyr.",
     "toRegainHealth": "For at genopfylde Liv:",
@@ -14,4 +14,4 @@
     "lowHealthTips4": "Hvis en Daglig ikke er forfalden på en given dag, kan du deaktivere den ved at klikke på blyanten.",
     "goodLuck": "Held og lykke!",
     "cannotRevive": "Du kan ikke genoplive hvis du ikke er død"
-}
\ No newline at end of file
+}
diff --git a/website/common/locales/da/defaulttasks.json b/website/common/locales/da/defaulttasks.json
index d51a9c3a14..4c09693337 100644
--- a/website/common/locales/da/defaulttasks.json
+++ b/website/common/locales/da/defaulttasks.json
@@ -3,9 +3,9 @@
     "defaultHabit2Text": "Spis junk food (Klik på blyanten for at redigere)",
     "defaultHabit3Text": "Tag trapperne/elevatoren (Klik på blyanten for at redigere)",
     "defaultHabit4Text": "Tilføj en opgave til Habitica",
-    "defaultHabit4Notes": "Enten en Vane, en Daglig eller en To-Do",
+    "defaultHabit4Notes": "Enten en Vane, en Daglig eller en To Do",
     "defaultTodo1Text": "Begynd at bruge Habitica (Markér mig som færdig!)",
-    "defaultTodoNotes": "Du kan enten færdiggøre denne To-Do, ændre den, eller fjerne den.",
+    "defaultTodoNotes": "Du kan enten færdiggøre denne To Do, ændre den eller fjerne den.",
     "defaultReward1Text": "15 minutters pause",
     "defaultReward2Text": "Beløn dig selv",
     "defaultReward2Notes": "Se fjernsyn, spil et spil, spis noget guf, det er op til dig!",
diff --git a/website/common/locales/da/faq.json b/website/common/locales/da/faq.json
index 3bbf684819..7fd793e1d0 100644
--- a/website/common/locales/da/faq.json
+++ b/website/common/locales/da/faq.json
@@ -9,9 +9,9 @@
     "androidFaqAnswer1": "Gode vaner (med et +) er opgaver du kan gøre mange gange om dagen, som for eksempel at spise grøntsager. Dårlige vaner (med et -) er opgaver du bør undgå, som for eksempel at bide negle. Vaner med både + og - involverer et godt og et dårligt valg, som for eksempel at tage trappen vs. at tage elevatoren. Gode vaner belønner dig med erfaring og guld. Dårlige vaner trækker fra dit Helbred (HP).\n\n Daglige er opgaver du skal gøre hver dag, såsom at børste dine tænder eller tjekke din email. Du kan justere de dage du skal udføre en Daglig opgave ved at trykke let for at redigere den. Hvis du springer en Daglig opgave over, som du skulle have udført, tager din karakter skade i løbet af natten. Vær forsigtig ikke at tilføje for mange Daglige opgaver ad gangen!\n\n To Do's er din To Do liste. At gennemføre en To Do giver guld og erfaring. Du mister aldrig Helbred ved ikke at udføre en To Do. Du kan tilføje en dato, hvor du skal have udført din To Do ved at trykke let for at redigere den.",
     "webFaqAnswer1": "* Gode Vaner (the ones with a :heavy_plus_sign:) er opgaver du kan gøre flere gange om dagen, såsom at spise grøntsager. Dårlige Vaner (the ones with a :heavy_minus_sign:) er opgaver du bør undgå, såsom at bide negle. Vaner med både et :heavy_plus_sign: og et :heavy_minus_sign: har et godt og et skidt valg, som fx at tage trappen VS at tage elevatoren. Gode Vaner belønner dig med Erfaring og Guld. Dårlige Vaner trækker fra dit Helbred (HP).\n* Daglige er opgaver du skal gøre hver dag, såsom at børste tænder eller checke din email. Du kan justere de dage, en Daglig er forfalden på, ved at klikke på blyantsikonet for at redigere opgaven. Hvis du skipper en Daglig, der er fordalden, vil din avatar tage skade i løbet af natten. Tilføj ikke for mange Daglige af gangen!\n* To Do's er din To Doliste. At fuldføre en To Do giver dig Guld og Erfaring. Du vil aldrig miste Liv fra To Do's. Du kan give en To Do en forfaldsdato, ved at klikke på blyantsikonet for at redigere den.",
     "faqQuestion2": "Har I nogle eksempler på opgaver?",
-    "iosFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "androidFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-    "webFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To-Dos)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "iosFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "androidFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+    "webFaqAnswer2": "Wiki'en har fire lister med eksempler på opgaver, der kan bruges som inspiration. Habitica Wiki'en er endnu ikke oversat til dansk.\n\n* [Eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits)\n* [Eksempler på Daglige opgaver](https://habitica.fandom.com/wiki/Sample_Dailies)\n* [Eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s)\n* [Eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
     "faqQuestion3": "Hvorfor skifter mine opgaver farve?",
     "iosFaqAnswer3": "Dine opgaver ændrer farve baseret på hvor godt du klarer dig i øjeblikket! Hver ny opgave begynder som neutral gul. Udfør Daglige opgaver eller gode Vaner oftere, og de vil begynde at ændre sig til blå. Undlad at udføre en daglig opgave, eller buk under for en dårlig vane, og opgaven vil ændre sig til rød. Jo rødere en opgave er, jo større er belønningen for at udføre den, men hvis det er en daglig opgave eller en dårlig vane, jo mere vil den skade dit helbred! Dette hjælper med at motivere dig til at udføre de opgaver, der ellers giver dig problemer.",
     "androidFaqAnswer3": "Dine opgaver ændrer farve baseret på hvor godt du klarer dig i øjeblikket! Hver ny opgave begynder som neutral gul. Udfør Daglige opgaver eller gode Vaner oftere, og de vil begynde at ændre sig til blå. Undlad at udføre en daglig opgave, eller buk under for en dårlig vane, og opgaven vil ændre sig til rød. Jo rødere en opgave er, jo større er belønningen for at udføre den, men hvis det er en daglig opgave eller en dårlig vane, jo mere vil den skade dit helbred! Dette hjælper med at motivere dig til at udføre de opgaver, der ellers giver dig problemer.",
@@ -22,12 +22,12 @@
     "webFaqAnswer4": "Der er adskillige ting, der kan få dig til at miste HP. For det første, hvis du undlod at sætte mærke ved Daglige opgaver i løbet af natten, og heller ikke satte mærke ved dem i pop-up vinduet næste morgen, vil de uudførte Daglige skade dig. For det andet vil du tage skade, hvis du klikker på en dårlig Vane. Til slut vil du, hvis du er ved at kæmpe mod en Boss med dit Hold, og et af dine Holdmedlemmer ikke udfører alle deres daglige, blive angrebet af Bossen og tage skade. Den primære måde at få Helbred tilbage er ved at stige i niveau, hvilket giver dig fuldt HP igen. Du kan også købe en Livseliksir med guld fra kolonnen 'Belønninger'. Desuden kan du, fra niveau 10 og opefter, vælge at blive en Helbreder, og du vil da lære helende Evner. Hvis du er på Hold med en Helbreder, kan de også hele dig. Lær mere ved at trykke på \"Hold\" i navigationen.",
     "faqQuestion5": "Hvordan spiller jeg Habitica med mine venner?",
     "iosFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit Hold! Hold kan gå på Quests, slås mod monstre, og bruge Evner for at støtte hinanden.\n\nHvis du vil starte dit eget Hold, så gå til Menu > [Hold](https://habitica.com/party) og tap Opret nyt Hold\". Bagefter scroller du ned og finder \"Inviter et Medlem\" for at invitere dine venner ved at indtaste deres @brugernavn. Hvis du hellere vil være med på en andens Hold, så bare giv dem dit @brugernavn, og så kan de invitere dig!\n\nDu og dine venner kan også være med i Klaner, som er offentlige chatrum der bringer folk sammen baseret på fælles interesser! Der er mange hjælpsomme og sjove fællesskaber at opdage.\n\nHvis du føler dig mere konkurrencelysten, kan du og dine venner lave eller deltage i Udfordringer for at tackle et bestemt sæt opgaver. Der er alle mulige slags offentlige Udfordringer for en bred vifte af interesser og mål. Nogle offentlige Udfordringer har endda en belønning i form af Ædelsten, hvis du bliver den endelige vinder.",
-    "androidFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. Gå til [websitet](https://habitica.com) for at oprette et, hvis du ikke allerede har et hold. I kan også melde jer ind i Klaner sammen (Social > Klaner). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold.\n\n For mere detaljeret info, så læs wiki'en om [Hold](http://habitica.fandom.com/wiki/Party) og [Klaner](http://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
-    "webFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold sammen med dig ved at klikke på \"Hold\" i navigationen! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. I kan også melde jer ind i Klaner sammen (klike på \"Klaner\" i navigationen). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold. For mere detaljeret info, så læs wiki'en om [Hold](http://habitica.fandom.com/wiki/Party) og [Klaner](http://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
+    "androidFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. Gå til [websitet](https://habitica.com) for at oprette et, hvis du ikke allerede har et hold. I kan også melde jer ind i Klaner sammen (Social > Klaner). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold.\n\n For mere detaljeret info, så læs wiki'en om [Hold](https://habitica.fandom.com/wiki/Party) og [Klaner](https://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
+    "webFaqAnswer5": "Den bedste måde at gøre det på er ved at invitere dem til dit hold sammen med dig ved at klikke på \"Hold\" i navigationen! Hold kan lave quests, kæmpe mod monstre, og kaste evner for at hjælpe hinanden. I kan også melde jer ind i Klaner sammen (klike på \"Klaner\" i navigationen). Klaner er chatrum med fokus på en bestemt interesse eller fælles mål, og kan være offentlige eller private. Du kan være med i så mange Klaner du har lyst, men kun et Hold. For mere detaljeret info, så læs wiki'en om [Hold](https://habitica.fandom.com/wiki/Party) og [Klaner](https://habitica.fandom.com/wiki/Guilds). Habitica wiki'en er endnu ikke oversat til dansk.",
     "faqQuestion6": "Hvordan får jeg et kæledyr eller ridedyr?",
     "iosFaqAnswer6": "Hver gang du fuldfører en opgave har du en tilfældig chance for at få et Kæledyrsæg, en Udrugningseliksir, eller et stykke Kæledyrsmad. Du kan finde dem alle under Menu > Genstande.\n\nFor at udklække et Kæledyr har du brug for et Æg og en Eliksir. Tryk på Ægget for at finde ud af, hvilken art du vil udklække, og vælg \"Udklæk Æg\". Vælg derefter en Udrugningseliksir for at vælge Kæledyrets farve! Få til Menu > Kæledyr og tryk på dit nye Kæledyr for at lade det følges med din avatar.\n\nDu kan også lade Kæledyr vokse til Rudedyr ved at fodre dem under Menu > Kæledyr. Tryk på dit Kæledyr og vælg \"Fodr Kæledyr\"!. Du er nødt til at fodre et Kæledyr mange gange før det bliver til et Ridedyr, men hvis du kan regne dets livret ud, vil det vokse hurtigere. Prøv dig frem eller [se svaret her](https://habitica.fandom.com/wiki/Food#Food_Preferences). Når du har et Ridedyr, så gå til Menu > Ridedyr og tryk på det for at lade det følges med din avatar.\n\nDu kan også få Æg af Questkæledyr ved at klare bestemte Quests (for at lære mere om Quests, se [Hvordan slås jeg mod monstre og deltager i Quests](https://habitica.com/static/faq/#monsters-quests)).",
     "androidFaqAnswer6": "Ved niveau 3 aktiveres Dropsystemet. Hver gang du fuldfører en opgave, vil du have en tilfældig chance for at modtage et Æg, en Udrugningseleksir, eller et stykke Kæledyrsmad. De vil opbevares i Menu > Genstande.\n\n For at udruge et Kæledyr skal du bruge et Æg og en Udrugningseleksir. Klik på Ægget for at afklare hvilken art du vil udruge, og klik så på \"Udrug Æg\". Vælg derefter en Udrugningseleksir for at vælge dets farve! For at anvende et nyt Kæledyr skal du gå til Menu > Stald > Kæledyr, vælge en art, klikke på det Kæledyr du ønsker og vælge \"Brug\" (Din Avatar opdateres ikke med det nye valg).\n\n Du kan også opfostre dine Kæledyr til Ridedyr ved at fodre dem under Menu > Stald [ > Kæledyr ]. Tryk på et Kæledyr og vælg \"Fodr\"! Du skal fodre et Kæledyr mange gange før det bliver et Ridedyr, men hvis du kan regne ud hvilken slags mad det kan lide, vil det vokse langt hurtigere. Prøv dig frem, eller [se løsningen her](https://habitica.fandom.com/wiki/Food#Food_Preferences). For at tilføje dit Ridedyr skal du gå til Menu > Stald > Ridedyr, klikke på det Ridedyr du vil ønsker og vælge \"Brug\" (Din Avatar opdateres ikke med det nye valg).\n\n Du kan også få Æg til Questkæledyr ved at fuldføre visse Quests. (Se herunder for at få mere at vide om Quests.)",
-    "webFaqAnswer6": "Ved niveau 3 aktiveres Dropsystemet. Hver gang du fuldfører en opgave, vil du have en tilfældig chance for at modtage et Æg, en Udrugningseleksir, eller et stykke Kæledyrsmad. De vil opbevares i Menu > Genstande. For at udruge et Kæledyr skal du bruge et Æg og en Udrugningseleksir. Når du har både et Æg og en Udrugningseliksir, så gå til Inventar > Stald for at udklække dit Kæledyr ved at klikke på dets billede. Når du har udklækket et Kæledyr, kan du tage det med dig ved at klikke på det. Du kan også opfostre dine Kæledyr til Ridedyr ved at fodre dem under Inventar > Stald. Træk et stykke mad fra den grå bar nederst på skærmen over på et Kæledyr for at fodre det! Du skal fodre et Kæledyr mange gange før det bliver et Ridedyr, men hvis du kan regne ud hvilken slags mad det bedst kan lide, vil det vokse langt hurtigere. Prøv dig frem, eller [se løsningen her](http://habitica.fandom.com/wiki/Food#Food_Preferences). Når du har et Ridedyr, så klik på den for at tilføje den til din avatar. Du kan også få Æg til Questkæledyr ved at gennemføre visse Quests. (Se herunder for at få mere at vide om Quests.)",
+    "webFaqAnswer6": "Ved niveau 3 aktiveres Dropsystemet. Hver gang du fuldfører en opgave, vil du have en tilfældig chance for at modtage et Æg, en Udrugningseleksir, eller et stykke Kæledyrsmad. De vil opbevares i Menu > Genstande. For at udruge et Kæledyr skal du bruge et Æg og en Udrugningseleksir. Når du har både et Æg og en Udrugningseliksir, så gå til Inventar > Stald for at udklække dit Kæledyr ved at klikke på dets billede. Når du har udklækket et Kæledyr, kan du tage det med dig ved at klikke på det. Du kan også opfostre dine Kæledyr til Ridedyr ved at fodre dem under Inventar > Stald. Træk et stykke mad fra den grå bar nederst på skærmen over på et Kæledyr for at fodre det! Du skal fodre et Kæledyr mange gange før det bliver et Ridedyr, men hvis du kan regne ud hvilken slags mad det bedst kan lide, vil det vokse langt hurtigere. Prøv dig frem, eller [se løsningen her](https://habitica.fandom.com/wiki/Food#Food_Preferences). Når du har et Ridedyr, så klik på den for at tilføje den til din avatar. Du kan også få Æg til Questkæledyr ved at gennemføre visse Quests. (Se herunder for at få mere at vide om Quests.)",
     "faqQuestion7": "Hvordan bliver jeg en Kriger, Magiker, Slyngel eller Helbreder?",
     "iosFaqAnswer7": "Når du når niveau 10, kan du vælge at blive en Kriger, Magiker, Slyngel eller Helbreder. (Alle spillere starter som Krigere.) Hver klasse har forskellige muligheder for udstyr, forskellige Evner de kan kaste efter niveau 11, og forskellige fordele. Krigere kan let gøre skade på bosser, tåle mere skade fra deres uudførte opgaver, og hjælpe med at gøre deres gruppe mere hårdføre. Magikere kan også let gøre skade på bosser, samt stige hurtigt i niveau og genskabe mana for deres gruppe. Slyngler er dem, der tjener mest guld og finder de fleste genstande, og de kan hjælpe deres Hold med at gøre det samme. Endelig kan Helbredere hele sig selv og deres holdmedlemmer.\n\nHvis du ikke vil vælge en klasse med det samme - hvis du for eksempel stadig er i gang med at købe alt udstyret til din nuværende klasse - kan du vælge \"Fravælg\" og vælge senere ved at åbne Menuen, derefter ikonet for Indstilliger, og så \"Vælg Klasse\".",
     "androidFaqAnswer7": "Når du når niveau 10 kan du vælge at blive en Kriger, Magiker, Slyngel eller Helbreder. (Alle spillere starter som Krigere.) Hver klasse har forskellige muligheder for udstyr, forskellige Evner du kan kaste efter niveau 11, og forskellige fordele. Krigere kan let gøre skade på bosser, tåle mere skade fra deres u-udførte opgaver, og hjælpe med at gøre deres gruppe sejere. Magikere kan også let gøre skade på bosser, samt stige hurtigt i niveau og genskabe mana for deres gruppe. Slyngler er dem der tjener mest guld og finder de fleste genstande, og de kan hjælpe deres Hold med at gøre det samme. Endelig kan Helbredere hele sig selv og deres holdmedlemmer.\n\nHvis du ikke vil vælge en klasse med det samme - hvis du for eksempel stadig er i gang med at købe alt udstyret til din nuværende klasse -- an du vælge \"Fravælg\", og vælge senere ved at åbne Menuen, derefter ikonet for Indstilliger, og så \"Vælg Klasse\".",
@@ -41,18 +41,20 @@
     "androidFaqAnswer9": "Først er du nødt til at starte eller blive en del af et Hold (se ovenfor). Selvom du kan kæmpe mod monstre alene, så anbefaler vi en gruppe, fordi det vil gøre Quests meget lettere. Desuden er det meget motiverende med en ven, som hepper på dig mens du klarer dine opgaver!\n\n Som det næste skal du bruge en Questskriftrulle, som findes under Menu > Items. Der er fire måder at få en skriftrulle på:\n\n - På niveau 15 får du en Questserie, altså tre sammenhængende quests. Der bliver låst op for flere questserier ved niveau 30, 40 og 60.\n - Når du inviterer folk til dit Hold, vil du blive belønnet med skriftrullen 'Basi-list'!\n - Du kan købe questskriftruller fra questbutikken for Guld og Ædelsten.\n - Når du checker ind i Habitica et bestemt antal gange, vil du blive belønnet med Questskriftruller. Du får en skriftrulle ved check-in nr. 1, 7, 22 og 40.\n\n For at kæmpe mod bossen, eller indsamle genstande til en indsamlingsquest, så udfør bare dine opgaver som normalt, og de vil blive talt med som skade i løbet af natten. (Det kan være nødvendigt at genindlæse data ved at trække ned på skærmen, for at se Bossens HP falde.) Hvis du kæmper mod en Boss og ikke udfører alle Daglige opgaver, vil Bossen skade dit Hold samtidig med at du skader bossen.\n\n Efter niveau 11 vil Krigere og Magikere få Evner, der tillader dem at påføre Bossen ekstra skade, så disse to er gode valg at tage på niveau 10, hvis du ønsker at være en, der slår hårdt!",
     "webFaqAnswer9": "Først er du nødt til at starte eller blive en del af et Hold ved at klikke på \"Hold\" i navigationen. Selvom du kan kæmpe mod monstre alene, så anbefaler vi en gruppe, fordi det vil gøre Quests meget lettere. Desuden er det meget motiverende med en ven, som hepper på dig mens du klarer dine opgaver! Som det næste skal du bruge en Questskriftrulle, som findes under Inventar > Quests. Der er fire måder at få en skriftrulle på:\n * På niveau 15 får du en Questserie, altså tre sammenhængende quests. Der bliver låst op for flere questserier ved niveau 30, 40 og 60.\n * Når du inviterer folk til dit Hold, vil du blive belønnet med skriftrullen 'Basi-list'!\n * Du kan købe questskriftruller fra questbutikken for Guld og Ædelsten.\n * Når du checker ind i Habitica et bestemt antal gange, vil du blive belønnet med Questskriftruller. Du får en skriftrulle ved check-in nr. 1, 7, 22 og 40.\n For at kæmpe mod bossen, eller indsamle genstande til en indsamlingsquest, så udfør bare dine opgaver som normalt, og de vil blive talt med som skade i løbet af natten. (Det kan være nødvendigt at genindlæse siden for at se Bossens HP falde.) Hvis du kæmper mod en Boss og ikke udfører alle Daglige opgaver, vil Bossen skade dit Hold samtidig med at du skader bossen. Efter niveau 11 vil Krigere og Magikere få Evner, der tillader dem at påføre Bossen ekstra skade, så disse to er gode valg at tage på niveau 10, hvis du ønsker at være en, der slår hårdt!",
     "faqQuestion10": "Hvad er Ædelsten, og hvordan får jeg fat i dem?",
-    "iosFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
-    "androidFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
-    "webFaqAnswer10": "Ædelsten købes for rigtige penge, selvom [abonnenter](https://habitica.com/user/settings/subscription) can købe dem for Guld. Når folk abonnnerer eller køber Ædelsten, hjælper de os med at holde hjemmesiden kørende. Vi er meget taknemmelige for deres støtte! Udover at købe Ædelsten direkte, eller blive abonnent, er der to andre måder spillere kan optjene Ædelsten:\n* Vind en Udfordring oprette af en anden spiller. Gå til Udfordringer > Opdag udfordringer for at finde nogle at deltage i.\n * Bidrag med dine egne færdigheder til Habitica. Se denne side på wiki'en for flere detaljer: [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica). Vær opmærksom på, at genstande købt for Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig sagtens bruge hjemmesiden uden dem!",
+    "iosFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
+    "androidFaqAnswer10": "Ædelsten købes for rigtige penge via Menu > Køb Ædelsten. Når du køber Ædelsten hjælper du os med at holde Habitica kørende. Vi er sætter stor pris på al mulig støtte!\n\n Udover at købe Ædelsten direkte er der tre andre måder spillere kan optjene Ædelsten på:\n\n * Vind en Udfordring der er blevet lavet af en anden spiller. Gå til Menu > Udfordringer for at finde nogen at deltage i.\n * Bliv abonnent og få adgang til at købe et begrænset antal Ædelsten med Guld hver måned.\n * Bidrag med dine egne færdigheder til Habitica! Se denne side for flere detaljer: [Bidrag til Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica) (engelsk).\n\nVær opmærksom på, at genstande der er købt med Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig bruge app'en uden dem!",
+    "webFaqAnswer10": "Ædelsten købes for rigtige penge, selvom [abonnenter](https://habitica.com/user/settings/subscription) can købe dem for Guld. Når folk abonnnerer eller køber Ædelsten, hjælper de os med at holde hjemmesiden kørende. Vi er meget taknemmelige for deres støtte! Udover at købe Ædelsten direkte, eller blive abonnent, er der to andre måder spillere kan optjene Ædelsten:\n* Vind en Udfordring oprette af en anden spiller. Gå til Udfordringer > Opdag udfordringer for at finde nogle at deltage i.\n * Bidrag med dine egne færdigheder til Habitica. Se denne side på wiki'en for flere detaljer: [Contributing to Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica). Vær opmærksom på, at genstande købt for Ædelsten ikke giver nogle statistiske fordele, så spillere kan stadig sagtens bruge hjemmesiden uden dem!",
     "faqQuestion11": "Hvordan rapporterer jeg en fejl eller foreslår en ny funktion?",
     "iosFaqAnswer11": "Hvis du mener du har fundet en fejl,  så gå ind under Menu>Support>Get Help for at finde hurtige løsninger, kendte problemer, eller for at indrapportere fejlen til os. Vi vil gøre alt hvad vi kan for at hjælpe dig.\n\nFor at afgive feedback eller komme med forslag til en funktion, kan du finde vores feedback-formular fra Menu>Support>Submit Feedback. Hvis vi har nogle spørgsmål, vil vi kontakte dig for information.",
-    "androidFaqAnswer11": "Hvis du mener du er stødt på en fejl, så gå til Menu>Hjælp>Rapportér en fejl for at finde hurtige løsninger, kendte fejl, eller  anmelde fejlen til os. Vi vil gøre alt hvad vi kan for at hjælpe dig.\n\nFor at give feedback eller foreslå en funktion, kan du finde vores feedbackformular under Menu>Hjælp>Anmod om en funktion. Hvis vi har spørgsmål, vil vi tage kontakt til dig for at få mere information!",
-    "webFaqAnswer11": "For at rapportere en fejl, så gå til [Hjælp > Rapporter en fejl](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) og læs punkterne over chatboksen. Hvis du er ude af stand til at logge på Habitica, så send din log-in information (ikke dit password!) til [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Der er ingen grund til bekymring, vi får snart rettet op på dig! Foreslag om funktioner bliver samlet på via en Google formular. Gå til [Hjælp > Foreslå en funktion](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) og følg instruktionerne. Ta-da!",
+    "androidFaqAnswer11": "Hvis du mener du er stødt på en fejl, så gå til Menu > Hjælp & FAQ > Få hjælp en fejl for at finde hurtige løsninger, se kendte fejl, eller anmelde fejlen til os. Vi vil gøre alt hvad vi kan for at hjælpe dig.\n\nFor at give feedback eller foreslå en funktion, kan du finde vores feedbackformular under Menu > Hjælp & FAQ > Anmod om funktion. Hvis vi har spørgsmål, vil vi tage kontakt til dig for at få mere information!",
+    "webFaqAnswer11": "For at rapportere en fejl, så gå til Hjælp > Rapporter en fejl for at sende os en email (det er muligt, at du skal undersøge om din browser støtter 'mailto' links). Hvis du er ude af stand til at logge på Habitica, så send din log-in information (ikke dit password!) til [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Der er ingen grund til bekymring, vi får snart rettet op på det! Foreslag om funktioner bliver samlet på via en Google-formular. Gå til [Hjælp > Foreslå en funktion](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) og følg instruktionerne. Ta-da!",
     "faqQuestion12": "Hvordan bekæmper jeg en verdensboss?",
-    "iosFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](http://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
-    "androidFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](http://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
-    "webFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk Bossen, og deres opgaver og Evner vil skade Bossen som normalt. Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold. En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig. Du kan læse mere om [tidligere Verdensbosser](http://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
-    "iosFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i  [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i værtshuset under Social > Værtshus! Vi hjælper gerne.",
-    "androidFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Værtshuschatten under Menu > Værtshus! Vi hjælper gerne.",
-    "webFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Klanen [Habitica Help](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Vi hjælper gerne."
+    "iosFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](https://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
+    "androidFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk mod Bossen, og deres opgaver og Evner vil skade Bossen som normalt.\n\n Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold.\n\n En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig.\n\n Du kan læse mere om [tidligere Verdensbosser](https://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
+    "webFaqAnswer12": "Verdensbosser er specielle monstre, der dukker op i Værtshuset. Alle aktive brugere kæmper automatisk Bossen, og deres opgaver og Evner vil skade Bossen som normalt. Du kan også være igang med en normal Quest samtidig. Dine opgaver og Evner vil tælle både mod Verdensbossen og Boss/Indsamlingsquesten for dit hold. En Verdensboss vil aldrig skade dig eller din konto på nogen måde. I stedet har den et Raseri-meter, der bliver fyldt op når brugere misser Daglige opgaver. Hvis dens Raseri-meter bliver fyldt helt op, vil den angribe en af NPCerne omkring websitet, og deres billede vil forandre sig. Du kan læse mere om [tidligere Verdensbosser](https://habitica.fandom.com/wiki/World_Bosses) på wiki'en (engelsk).",
+    "iosFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i værtshuset under Menu > Værtshus! Vi hjælper gerne.",
+    "androidFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Værtshuschatten under Menu > Værtshus! Vi hjælper gerne.",
+    "webFaqStillNeedHelp": "Hvis du har et spørgsmål, der ikke er på listen eller i [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), så kom forbi og spørg i Klanen [Habitica Help](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Vi hjælper gerne.",
+    "faqQuestion13": "Hvad er en Gruppeplan?",
+    "webFaqAnswer13": "## Hvordan virker gruppeplaner?\n\nEn [gruppeplan](/group-plans) giver dit Hold eller Klan adgang til et delt dashboard med opgaver, der ligner dit eget! Det er en delt oplevelse på Habitica, hvor opgaver kan oprettes og markeres som færdige af alle i gruppen.\n\nDer er også andre funktioner, såsom medlemsroller, et statusoverblik og fordeling af opgaver, der giver dig en mere kontrolleret oplevelse. [Besøg vores wiki](https://habitica.fandom.com/wiki/Group_Plans) (EN) for at lære mere om Gruppeplanens funktioner!\n\n## Hvem har nytte af en gruppeplan?\n\nGruppeplaner virker bedst, når du har et mindre hold der gerne vil samarbejde. Vi anbefaler 2-5 medlemmer.\n\nGruppeplaner er geniale til familier, uanset om det er en forælder og et barn, eller dig selv og din partner. Delte mål, huslige opgaver eller ansvar er lette at holde styr på med ét dashboard.\n\nGruppeplaner kan også være nyttige for teams af kollegaer med fælles mål, eller managere der vil introducere deres ansatte til gamification.\n\n## Hurtige tips til at bruge grupper\n\nHer er nogle hurtige tips til dig, så du kan komme i gang med din nye Gruppe. Vi vil komme med flere detaljer i de følgende afsnit:\n\n* Gør et medlem til manager for at give dem evnen til at oprette og redigere opgaver\n* Lad opgaver ikke tilhøre nogen, hvis alle kan udføre den og det kun skal gøres én gang\n* Tildel en opgave til én person for at være sikker på, at ingen andre kan fuldføre den opgave\n* Tildel en opgave til flere personer, hvis de alle skal fuldføre den\n* Slå evnen til at se gruppeopgaver på dit personlige dashboard til, så du ikke går glip af noget\n* Du bliver belønnet for alle de opgaver du klarer, også hvis flere skal udføre dem\n* Belønninger for at fuldføre opgaver bliver ikke opsplittet eller delt mellem holdmedlemmer\n* Brug opgavernes farve på gruppens dashboard for at bedømme den gennemsnitlige færdiggørelsesrate\n* Gennemgå jævnligt opgaverne på gruppens dashboard for at sikre dig, at de stadig er relevante\n* Det vil ikke skade hverken dig eller din gruppe hvis du misser en Daglig, men den vil stadig skifte farve\n\n## Hvordan kan andre i gruppen oprette opgaver?\n\nKun gruppelederen og managere kan oprette opgaver. Hvis du gerne vil have at et gruppemedlem skal kunne gøre dette, skal du gøre dem til manager ved at gå til fanen Gruppeinformation, finde medlemslisten, og klikke på prik-ikonet ved deres navn.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## Hvordan virker opgaver, der ikke er tildelt nogen?\n\nOpgaver, der ikke tilhører nogen, kan fuldføres af alle i gruppen, for eksempel at gå ud med skraldet. Den der går ud med skraldet kan markere opgaven som fuldført, og den vil da være markeret som sådan for alle i gruppen.\n\n## Hvordan virker det synkroniserede starttidspunkt?\n\nDelte opgaver vil nulstille på samme tidspunkt for alle for at synkronisere gruppens dashboard. Dette tidspunkt kan ses på gruppens dashboard, og afhænger af lederens personlige starttidspunkt. Da delte opgaver nulstilles automatisk, vil du ikke få mulighed for at fuldføre gårsdagens delte Daglige, når du checker ind den følgende dag.\n\nDelte Daglige vil ikke skade dig hvis et holdmedlem ikke udfører dem, men de vil begynde at skifte til en rødere farve for at visualisere denne proces. Vi vil ikke have at den delte oplevelse bliver en dårlig en!\n\n## Hvordan bruger jeg min Gruppe på Habiticas apps?\n\nDe mobile apps understøtter endnu ikke alle de funktioner, der hører med i en gruppeplan. Dog kan du stadig udføre delte opgaver fra vores iOS og Android apps. Besøg din gruppes dashboard i browserversionen af Habitica, og slå funktionen 'kopiér opgaver' til. Nu vil alle åbne og tildelte opgaver være synlige på dit eget personlige dashboard på alle platforme.\n\n## Hvad er forskellen på en Gruppes delte opgaver, og Udfordringer?\n\nDe delte dashboards der hører til gruppeplaner er mere dynamiske end dem, der hører til udfordringer, da de konstant kan opdateres og interageres med. Udfordringer er gode, hvis du har ét sæt opgaver, der alle skal klares af flere mennesker.\n\nGruppeplaner koster også rigtige penge at benytte, mens udfordringer er gratis for alle.\n\nDu kan ikke tildele specifikke opgaver til nogen i udfordringer, og udfordringer har ikke et fælles tidspunkt, hvor opgaverne nulstilles. Generelt giver udfordringer ejeren mindre kontrol og direkte interaktion end gruppeplaner."
 }
diff --git a/website/common/locales/da/front.json b/website/common/locales/da/front.json
index f6b8ee2785..bdb8030db4 100644
--- a/website/common/locales/da/front.json
+++ b/website/common/locales/da/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "og",
     "chores": "Pligter",
     "clearBrowserData": "Ryd browserdata",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Tilføjelser og udvidelser</a>",
+    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Tilføjelser og udvidelser</a>",
     "communityFacebook": "Facebook",
     "companyAbout": "Hvordan det virker",
     "companyBlog": "Blog",
@@ -13,7 +13,7 @@
     "companyDonate": "Donér",
     "forgotPassword": "Glemt kodeord?",
     "emailNewPass": "E-mail et nulstillings-link til kodeord",
-    "forgotPasswordSteps": "Skriv den e-mail adresse du benyttede til at registrere din Habitica-konto.",
+    "forgotPasswordSteps": "Skriv dit @brugernavn eller den e-mail adresse, du benyttede til at registrere din Habitica-konto.",
     "sendLink": "Send link",
     "featuredIn": "Omtalt i",
     "footerDevs": "Udviklere",
@@ -44,7 +44,7 @@
     "marketing3Header": "Apps og Udvidelser",
     "marketing3Lead1": "**iPhone & Android** apps lader dig klare dine ting på farten. Vi ved, at det nogen gange er for meget at skulle logge ind på websiden for at klikke på knapper.",
     "marketing3Lead2Title": "Integrationer",
-    "marketing3Lead2": "Andre **tredjepartsværktøjer** kan binde Habitica sammen med andre dele af dit liv. Vores API muliggør integrationer som [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), med hvilken du mister point ved at bruge unyttige hjemmesider, og optjener point når du browser de nyttige i stedet. [Se mere her](http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
+    "marketing3Lead2": "Andre **tredjepartsværktøjer** kan binde Habitica sammen med andre dele af dit liv. Vores API muliggør integrationer som [Chrome Extension](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US), med hvilken du mister point ved at bruge unyttige hjemmesider, og optjener point når du browser de nyttige i stedet. [Se mere her](https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations).",
     "marketing4Header": "Organisatorisk brug",
     "marketing4Lead1": "Uddannelse er en af de bedste områder at bruge spilelementer. Vi ved alle, hvordan studerende nærmest er limet til deres telefon disse dage, så brug dette! Sæt dine elever til at kæmpe mod hinanden som hyggelig konkurrence. Beløn god opførsel med sjældne præmier. Se deres karakterer og opførsel blive forbedret.",
     "marketing4Lead1Title": "Brug af Spilelementer i Undervisning",
@@ -184,5 +184,6 @@
     "mobileApps": "Mobile apps",
     "learnMore": "Lær mere",
     "communityInstagram": "Instagram",
-    "minPasswordLength": "Kodeord skal bestå af 8 eller flere tegn."
+    "minPasswordLength": "Kodeord skal bestå af 8 eller flere tegn.",
+    "enterHabitica": "Spil Habitica"
 }
diff --git a/website/common/locales/da/gear.json b/website/common/locales/da/gear.json
index 55aa315903..b6c9a2b3c6 100644
--- a/website/common/locales/da/gear.json
+++ b/website/common/locales/da/gear.json
@@ -19,7 +19,7 @@
     "sortByStr": "STY",
     "sortByInt": "INT",
     "weapon": "våben",
-    "weaponCapitalized": "Main-Hand Item",
+    "weaponCapitalized": "Primær hånd",
     "weaponBase0Text": "Intet våben",
     "weaponBase0Notes": "Intet våben.",
     "weaponWarrior0Text": "Træningssværd",
@@ -892,7 +892,7 @@
     "headSpecialDandyHatNotes": "Sikke en herlig hat! Den vil klæde dig så nydeligt på en gåtur. Forøger Konstitution med <%= con %>.",
     "headSpecialKabutoText": "Samuraihjelm",
     "headSpecialKabutoNotes": "Denne hjelm er funktionel og smuk! Dine fjender vil være helt distraherede af den. Forøger Intelligens med <%= int %>.",
-    "headSpecialNamingDay2017Text": "Royal lilla grifhjelm",
+    "headSpecialNamingDay2017Text": "Purpurfarvet grifhjelm",
     "headSpecialNamingDay2017Notes": "Glædelig Navngivningsdag! Ifør dig denne truende og fjerklædte hjelm for at fejre Habitica. Giver ingen bonusser.",
     "headSpecialTurkeyHelmBaseText": "Kalkunhjelm",
     "headSpecialTurkeyHelmBaseNotes": "Dit Thanksgiving-look vil være fuldendt med denne næbbede hjelm! Giver ingen bonusser.",
@@ -1599,7 +1599,7 @@
     "bodySpecialSummer2015MageNotes": "Dette spænde giver ingen krafter overhovedet, men det er pænt. Giver ingen bonusser. Specielt 2015 Sommerudstyr.",
     "bodySpecialSummer2015HealerText": "Matrostørklæde",
     "bodySpecialSummer2015HealerNotes": "Hiv Ohøj? Nej nej nej! Giver ingen bonusser. Specielt 2015 Sommerudstyr.",
-    "bodySpecialNamingDay2018Text": "Royal Purple Gryphon Cloak",
+    "bodySpecialNamingDay2018Text": "Purpurfarvet grif-kappe",
     "bodySpecialNamingDay2018Notes": "Happy Naming Day! Wear this fancy and feathery cloak as you celebrate Habitica. Confers no benefit.",
     "bodyMystery201705Text": "Folded Feathered Fighter Wings",
     "bodyMystery201705Notes": "These folded wings don't just look snazzy: they will give you the speed and agility of a gryphon! Confers no benefit. May 2017 Subscriber Item.",
@@ -1873,5 +1873,6 @@
     "headSpecialNye2020Notes": "Du har modtaget en Ekstravagant Festhat! Bær den med stolthed imens du byder det nye år velkommen! Giver ingen fordele.",
     "headSpecialNye2020Text": "Ekstravagant Festhat",
     "weaponSpecialWinter2021MageNotes": "Dette mægtige våben er bestemt mere end en fase. Kanalisér din energi, fokusér på en måneds flow, og studér tid og rum. Øger Intelligens med <%= int %> og Opfattelse med <%= per %>. Begrænset 2020-2021 Vinterudstyr.",
-    "weaponSpecialWinter2021MageText": "Magisk Måne-faser"
+    "weaponSpecialWinter2021MageText": "Magisk Måne-faser",
+    "backSpecialNamingDay2020Text": "Purpurfarvet grifhale"
 }
diff --git a/website/common/locales/da/groups.json b/website/common/locales/da/groups.json
index 56ee92366f..818783f149 100644
--- a/website/common/locales/da/groups.json
+++ b/website/common/locales/da/groups.json
@@ -14,7 +14,7 @@
     "contributing": "Sådan bidrager du",
     "faq": "FAQ",
     "tutorial": "Vejledning",
-    "glossary": "<a target='_blank' href='http://habitica.fandom.com/wiki/Glossary'>Ordliste (EN)</a>",
+    "glossary": "<a target='_blank' href='https://habitica.fandom.com/wiki/Glossary'>Ordliste (EN)</a>",
     "wiki": "Wiki",
     "requestAF": "Anmod om en funktion",
     "dataTool": "Datavisningsværktøj",
@@ -324,7 +324,7 @@
     "gettingStarted": "Kom i gang",
     "congratsOnGroupPlan": "Tillykke med oprettelsen af din nye Gruppe! Her er nogle svar på flere af de mest almindelige spørgsmål.",
     "whatsIncludedGroup": "Hvad er inkluderet i abonnementet",
-    "whatsIncludedGroupDesc": "Alle medlemmer af Gruppen får alle fordele ved et abonnement, inklusiv de månedlige abonnentgenstande, evnen til at købe Ædelsten for Guld, og det Royale Lilla Jackalope-ridedyr, som er en eksklusiv belønning for medlemmer af en Gruppeplan.",
+    "whatsIncludedGroupDesc": "Alle medlemmer af Gruppen får alle fordele ved et abonnement, inklusiv de månedlige abonnentgenstande, evnen til at købe Ædelsten for Guld, og det purpur Jackalope-ridedyr, som er en eksklusiv belønning for medlemmer af en Gruppeplan.",
     "howDoesBillingWork": "Hvordan fungerer betalingen?",
     "howDoesBillingWorkDesc": "Gruppeledere faktureres baseret på antallet af gruppemedlemmer på en månedlig basis. Regningen omfatter prisen for Gruppelederens abonnement ($9 USD) plus $3 USD for hvert ekstra gruppemedlem. Fx: En gruppe af fire brugere vil koste $18 USD om måneden, da gruppen består af 1 Gruppeleder + 3 gruppemedlemmer.",
     "howToAssignTask": "Hvordan tildeler du en Opgave?",
@@ -339,5 +339,6 @@
     "recurringCompletion": "Ingen - Gruppeopgave kan ikke udføres",
     "singleCompletion": "Single - Completes when any assigned user finishes",
     "allAssignedCompletion": "All - Completes when all assigned users finish",
-    "pmReported": "Tak, fordi du rapporterede denne besked."
+    "pmReported": "Tak, fordi du rapporterede denne besked.",
+    "features": "Funktioner"
 }
diff --git a/website/common/locales/da/limited.json b/website/common/locales/da/limited.json
index 8c121779b4..954dfbf998 100644
--- a/website/common/locales/da/limited.json
+++ b/website/common/locales/da/limited.json
@@ -27,10 +27,10 @@
     "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
     "seasonalShopTitle": "<%= linkStart %>Sæson-heksen<%= linkEnd %>",
     "seasonalShopClosedText": "Sæson-markedet er lukket lige nu!! Det er kun åbent under Habiticas fire Grandiøse Gallaer.",
-    "seasonalShopSummerText": "Glædeligt Sommerplask!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 31. juli!",
-    "seasonalShopFallText": "Glædelig Efterårsfestival!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 31. oktober!",
-    "seasonalShopWinterText": "Velkommen til Vintereventyret!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 31. januar!",
-    "seasonalShopSpringText": "Glædelig Forårsfest!! Vil du købe nogle sjældne genstande? De vil kun være tilgængelige indtil 30. april!",
+    "seasonalShopSummerText": "Glædeligt Sommerplask!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
+    "seasonalShopFallText": "Glædelig Efterårsfestival!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
+    "seasonalShopWinterText": "Velkommen til Vintereventyret!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
+    "seasonalShopSpringText": "Glædelig Forårsfest!! Vil du købe nogle sjældne genstande? Sørg for at købe dem før Gallaen slutter!",
     "seasonalShopFallTextBroken": "Åh.... Velkommen til Sæson-markedet... Vi har efterårs-sæson varer, eller noget... Alting her kan købes under Efterårsfestival-eventet hvert år, men vi har kun åbent indtil den 31. oktober... Du burde nok købe ind nu, ellers vil du skulle vente... og vente... og vente... <strong>*suk*</strong>",
     "seasonalShopBrokenText": "Min pavillon!!!!!!! Mine dekorationer!!!! Åh, den Dysheartener har ødelagt det hele :( Hjælp med at bekæmpe den i Værtshuset, så jeg kan genopbygge!",
     "seasonalShopRebirth": "Hvis du har købt noget af detteudstyr før, men ikke ejer det i øjeblikket, kan du genkøbe det i Belønningskolonnen. I starten vil du kun kunne købe de ting der passer til din nuværende klasse (Kriger som standard), men frygt ej, de andre klasse-specifikke varer bliver tilgængelige hvis du skifter til den klasse.",
@@ -45,7 +45,7 @@
     "snowDaySet": "Snedagskriger (Kriger)",
     "snowboardingSet": "Snowboardende Sortkunstner (Magiker)",
     "festiveFairySet": "Festlig Fe (Helbreder)",
-    "cocoaSet": "Kakao Slyngel (Slyngel)",
+    "cocoaSet": "Kakao (Slyngel)",
     "toAndFromCard": "Til: <%= toName %>, Fra: <%= fromName %>",
     "nyeCard": "Nytårskort",
     "nyeCardExplanation": "Da I har fejret nytår sammen, modtager I begge \"Gammel Kending\"-emblemet!",
@@ -56,7 +56,7 @@
     "nye0": "Godt Nytår! Må du overvinde mange dårlige Vaner.",
     "nye1": "Godt Nytår! Må du modtage mange Belønninger.",
     "nye2": "Godt Nytår! Må du udføre mange Perfekte Dage.",
-    "nye3": "Godt Nytår! Må din To-Do-liste forblive kort og overskuelig.",
+    "nye3": "Godt nytår! Må din To-Do-liste forblive kort og overskuelig.",
     "nye4": "Godt nytår! Må du undgå at blive angrebet af vrede Hippogriffer.",
     "mightyBunnySet": "Kraftfuld Kanin (Kriger)",
     "magicMouseSet": "Magisk Mus (Magiker)",
@@ -74,11 +74,11 @@
     "magicianBunnySet": "Tryllekunstners Kanin (Magiker)",
     "comfortingKittySet": "Trøstende Kat (Helbreder)",
     "sneakySqueakerSet": "Pibende Sniger (Slyngel)",
-    "sunfishWarriorSet": "Solfiskekriger (Kriger)",
+    "sunfishWarriorSet": "Solfisk (Kriger)",
     "shipSoothsayerSet": "Skibs-sandsigerske (Magiker)",
     "strappingSailorSet": "Spændstig Sømand (Helbreder)",
     "reefRenegadeSet": "Røver på Revet (Slyngel)",
-    "scarecrowWarriorSet": "Fægtende Fugleskræmsel (Kriger)",
+    "scarecrowWarriorSet": "Fugleskræmsel (Kriger)",
     "stitchWitchSet": "Skrædderheks (Magiker)",
     "potionerSet": "Eleksirmager (Helbreder)",
     "battleRogueSet": "Flager-Fusker (Slyngel)",
@@ -86,40 +86,40 @@
     "grandMalkinSet": "Mester-malkin (Magiker)",
     "cleverDogSet": "Kløgtig Hund (Slyngel)",
     "braveMouseSet": "Modig Mus (Kriger)",
-    "summer2016SharkWarriorSet": "Hajkriger (Kriger)",
-    "summer2016DolphinMageSet": "Delfinmagiker (Magiker)",
-    "summer2016SeahorseHealerSet": "Søhesthelbreder (Helbreder)",
-    "summer2016EelSet": "Åleslyngel (Slyngel)",
+    "summer2016SharkWarriorSet": "Haj (Kriger)",
+    "summer2016DolphinMageSet": "Delfin (Magiker)",
+    "summer2016SeahorseHealerSet": "Søhest (Helbreder)",
+    "summer2016EelSet": "Ål (Slyngel)",
     "fall2016SwampThingSet": "Sump-ting (Kriger)",
     "fall2016WickedSorcererSet": "Skummel Sortkunstner (Magiker)",
-    "fall2016GorgonHealerSet": "Gorgon-helbreder (Helbreder)",
-    "fall2016BlackWidowSet": "Sort Enke-slyngel (Slyngel)",
+    "fall2016GorgonHealerSet": "Gorgon (Helbreder)",
+    "fall2016BlackWidowSet": "Sort enke (Slyngel)",
     "winter2017IceHockeySet": "Ishockey (Kriger)",
     "winter2017WinterWolfSet": "Vinterulv (Magiker)",
-    "winter2017SugarPlumSet": "Sukkerblomme-helbreder (Helbreder)",
-    "winter2017FrostyRogueSet": "Sukkerslyngel (Slyngel)",
-    "spring2017FelineWarriorSet": "Kattekriger (Kriger)",
+    "winter2017SugarPlumSet": "Sukkerblomme (Helbreder)",
+    "winter2017FrostyRogueSet": "Frost (Slyngel)",
+    "spring2017FelineWarriorSet": "Kattedyr (Kriger)",
     "spring2017CanineConjurorSet": "Hundehekser (Magiker)",
     "spring2017FloralMouseSet": "Blomstermus (Helbreder)",
     "spring2017SneakyBunnySet": "Krybende Kanin (Slyngel)",
-    "summer2017SandcastleWarriorSet": "Sandslotskriger (Kriger)",
-    "summer2017WhirlpoolMageSet": "Malstrømsmagiker (Magiker)",
+    "summer2017SandcastleWarriorSet": "Sandslot (Kriger)",
+    "summer2017WhirlpoolMageSet": "Malstrøm(Magiker)",
     "summer2017SeashellSeahealerSet": "Havmuslingehelbreder (Helbreder)",
     "summer2017SeaDragonSet": "Sødrage (Slyngel)",
-    "fall2017HabitoweenSet": "Habitoweenkriger (Kriger)",
-    "fall2017MasqueradeSet": "Maskerademagiker (Magiker)",
-    "fall2017HauntedHouseSet": "Spøgelseshuslæge (Helbreder)",
-    "fall2017TrickOrTreatSet": "Ballademagerbandit (Slyngel)",
-    "winter2018ConfettiSet": "Konfettimagiker (Magiker)",
-    "winter2018GiftWrappedSet": "Indpakket Kriger (Kriger)",
-    "winter2018MistletoeSet": "Misteltenshelbreder (Helbreder)",
-    "winter2018ReindeerSet": "Rendsdyrslyngel (Slyngel)",
-    "spring2018SunriseWarriorSet": "Solopgangskriger (Kriger)",
-    "spring2018TulipMageSet": "Tulipanmagiker (Magiker)",
-    "spring2018GarnetHealerSet": "Granatrød Helbreder (Helbreder)",
-    "spring2018DucklingRogueSet": "Ællingeslyngel (Slyngel)",
-    "summer2018BettaFishWarriorSet": "Kampfiskkriger (Kriger)",
-    "summer2018LionfishMageSet": "Dragefiskmagiker (Magiker)",
+    "fall2017HabitoweenSet": "Habitoween (Kriger)",
+    "fall2017MasqueradeSet": "Maskerade(Magiker)",
+    "fall2017HauntedHouseSet": "Spøgelseshus (Helbreder)",
+    "fall2017TrickOrTreatSet": "Ballademager (Slyngel)",
+    "winter2018ConfettiSet": "Konfetti (Magiker)",
+    "winter2018GiftWrappedSet": "Gavepapir (Kriger)",
+    "winter2018MistletoeSet": "Mistelten (Helbreder)",
+    "winter2018ReindeerSet": "Rensdyr (Slyngel)",
+    "spring2018SunriseWarriorSet": "Solopgang (Kriger)",
+    "spring2018TulipMageSet": "Tulipan (Magiker)",
+    "spring2018GarnetHealerSet": "Granatrød (Helbreder)",
+    "spring2018DucklingRogueSet": "Ælling (Slyngel)",
+    "summer2018BettaFishWarriorSet": "Kampfisk (Kriger)",
+    "summer2018LionfishMageSet": "Dragefisk (Magiker)",
     "summer2018MerfolkMonarchSet": "Havfruehertug(inde) (Helbreder)",
     "summer2018FisherRogueSet": "Fiskerslyngel (Slyngel)",
     "fall2018MinotaurWarriorSet": "Minotaur (Kriger)",
@@ -131,21 +131,98 @@
     "winter2019WinterStarSet": "Vinterstjerne (Helbreder)",
     "winter2019PoinsettiaSet": "Julestjerne (Slyngel)",
     "eventAvailability": "Tilgændelig til køb indtil <%= date(locale) %>.",
-    "dateEndMarch": "April 30",
-    "dateEndApril": "19. april",
-    "dateEndMay": "May 31",
-    "dateEndJune": "Juni 14",
-    "dateEndJuly": "July 31",
-    "dateEndAugust": "August 31",
-    "dateEndSeptember": "September 21",
-    "dateEndOctober": "October 31",
-    "dateEndNovember": "December 3",
-    "dateEndJanuary": "January 31",
-    "dateEndFebruary": "February 28",
-    "winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
-    "winterPromoGiftDetails1": "Til og med 15. januar vil du få det samme abonnement med til dig selv, når du køber et abonnement til nogen i gave!",
+    "dateEndMarch": "31. marts",
+    "dateEndApril": "30. april",
+    "dateEndMay": "31. maj",
+    "dateEndJune": "30. juni",
+    "dateEndJuly": "31. juli",
+    "dateEndAugust": "31. august",
+    "dateEndSeptember": "30. september",
+    "dateEndOctober": "31. oktober",
+    "dateEndNovember": "30. november",
+    "dateEndJanuary": "31. januar",
+    "dateEndFebruary": "28. februar",
+    "winterPromoGiftHeader": "GIV ET ABONNEMENT I GAVE, OG FÅ ET GRATIS!",
+    "winterPromoGiftDetails1": "Til og med 6. januar vil du få det samme abonnement med til dig selv, når du køber et abonnement til nogen i gave!",
     "winterPromoGiftDetails2": "Bemærk venligst, at hvis du eller modtageren af din gave allerede har et tilbagevendende abonnement, vil gave-abonnementet kun starte efter det tilbagevendende er blevet opsagt eller er udløbet. Tusind tak for din støtte! <3",
     "discountBundle": "pakke",
-    "g1g1Announcement": "<strong>Giv et abonnement, få et abonnement gratis!</strong> Tilbuddet gælder lige nu!",
-    "g1g1Details": "Send et gave-abonnement til en ven fra deres profil, og du vil få det samme abonnement til dig selv gratis!"
+    "g1g1Announcement": "<strong>Giv et abonnement og få et abonnement gratis!</strong> Tilbuddet gælder lige nu!",
+    "g1g1Details": "Send et gave-abonnement til en ven, og du vil få det samme abonnement til dig selv gratis!",
+    "g1g1": "Send et, få et",
+    "winter2020EvergreenSet": "Stedsegrøn (Kriger)",
+    "winter2020CarolOfTheMageSet": "Magisk julesang (Magiker)",
+    "winter2020WinterSpiceSet": "Vinterkrydderi (Helbreder)",
+    "spring2020IrisHealerSet": "Iris (Helbreder)",
+    "spring2019OrchidWarriorSet": "Orkidé (Kriger)",
+    "spring2019AmberMageSet": "Rav (Magiker)",
+    "summer2020OarfishMageSet": "Sildekonge (Magiker)",
+    "spring2019RobinHealerSet": "Rødhals (Helbreder)",
+    "summer2020SeaGlassHealerSet": "Havglas (Helbreder)",
+    "spring2019CloudRogueSet": "Sky (Slyngel)",
+    "fall2020DeathsHeadMothHealerSet": "Dødningehovednatsværmer (Helbreder)",
+    "summer2019SeaTurtleWarriorSet": "Havskildpadde (Kriger)",
+    "winter2021IceFishingWarriorSet": "Isfisker (Kriger)",
+    "summer2019WaterLilyMageSet": "Åkande (Magiker)",
+    "winter2021WinterMoonMageSet": "Vintermåne (Magiker)",
+    "summer2019ConchHealerSet": "Konkylie (Helbreder)",
+    "spring2021SwanMageSet": "Svane (Magiker)",
+    "summer2019HammerheadRogueSet": "Hammerhaj (Slyngel)",
+    "fall2019CyclopsSet": "Kyklop (Magiker)",
+    "summer2021NautilusMageSet": "Nautilus (Magiker)",
+    "summer2021ParrotHealerSet": "Papegøje (Helbreder)",
+    "summer2021ClownfishRogueSet": "Klovnefisk (Slyngel)",
+    "fall2020TwoHeadedRogueSet": "Tohovedet (Slyngel)",
+    "spring2020PuddleMageSet": "Vandpyt (Magiker)",
+    "fall2020WraithWarriorSet": "Genfærd (Kriger)",
+    "summer2021FlyingFishWarriorSet": "Flyvefisk (Kriger)",
+    "spring2021SunstoneWarriorSet": "Solsten (Kriger)",
+    "summer2020RainbowTroutWarriorSet": "Regnbueørred (Kriger)",
+    "fall2020ThirdEyeMageSet": "Treøjet (Magiker)",
+    "fall2019RavenSet": "Ravn (Kriger)",
+    "spring2021TwinFlowerRogueSet": "Kaprifolie (Slyngel)",
+    "spring2021WillowHealerSet": "Piletræ (Helbreder)",
+    "winter2020LanternSet": "Lanterne (Slyngel)",
+    "spring2020BeetleWarriorSet": "Næsehornsbille (Kriger)",
+    "summer2020CrocodileRogueSet": "Krokodille (Slyngel)",
+    "winter2021HollyIvyRogueSet": "Kristtjørn og vedbend (Slyngel)",
+    "winter2021ArcticExplorerHealerSet": "Arktisk udforsker (Helbreder)",
+    "spring2020LapisLazuliRogueSet": "Lapis lazuli (Slyngel)",
+    "fall2019OperaticSpecterSet": "Operaspøgelse (Slyngel)",
+    "g1g1Limitations": "Dette er et tidsbegrænset tilbud der begynder d. 16. december kl. 14:00 (UTC+1), og slutter d. 6. januar kl. 02:00 (UTC+1). Dette tilbud gælder kun, når du giver et gave-abonnement til en anden Habiticaner. Hvis du eller modtageren allerede har et abonnement, vil gave-abonnementet tilføje yderligere tid, der kun vil blive brugt så snart det nuværende abonnement opsiges eller udløber.",
+    "mayYYYY": "maj <%= year %>",
+    "limitations": "Begrænsninger",
+    "summer2022CrabRogueSet": "Krabbe (Slyngel)",
+    "summer2022WaterspoutWarriorSet": "Vandsøjle (Kriger)",
+    "summer2022MantaRayMageSet": "Djævlerokke (Magiker)",
+    "summer2022AngelfishHealerSet": "Englefisk (Helbreder)",
+    "dateEndDecember": "31. december",
+    "februaryYYYY": "februar <%= year %>",
+    "julyYYYY": "juli <%= year %>",
+    "octoberYYYY": "oktober <%= year %>",
+    "howItWorks": "Sådan virker det",
+    "noLongerAvailable": "Denne genstand er ikke længere tilgængelig.",
+    "spring2022MagpieRogueSet": "Skade (Slyngel)",
+    "spring2022RainstormWarriorSet": "Uvejr (Kriger)",
+    "spring2022ForsythiaMageSet": "Forsythia (Magiker)",
+    "g1g1HowItWorks": "Skriv brugernavnet på den konto, du vil sende gave-abonnementet til. Derefter skal du vælge længden på abonnementet, og så checke ud. Din konto vil automatisk få tildelt den samme type abonnement, du lige har givet en anden.",
+    "fall2021OozeRogueSet": "Slim (Slyngel)",
+    "fall2021HeadlessWarriorSet": "Hovedløs (Kriger)",
+    "fall2021BrainEaterMageSet": "Hjerneæder (Magiker)",
+    "fall2021FlameSummonerHealerSet": "Flammehidkalder (Helbreder)",
+    "eventAvailabilityReturning": "Kan købes indtil <%= availableDate(locale) %>. Denne eliksir var sidst tilgængelig <%= previousDate(locale) %>.",
+    "septemberYYYY": "september <%= year %>",
+    "marchYYYY": "marts <%= year %>",
+    "juneYYYY": "juni <%= year %>",
+    "novemberYYYY": "november <%= year %>",
+    "decemberYYYY": "december <%= year %>",
+    "augustYYYY": "august <%= year %>",
+    "winter2022FireworksRogueSet": "Fyrværkeri (Slyngel)",
+    "winter2022StockingWarriorSet": "Julesok (Kriger)",
+    "winter2022PomegranateMageSet": "Granatæble (Magiker)",
+    "winter2022IceCrystalHealerSet": "Iskrystal (Helbreder)",
+    "g1g1Event": "Send et, få et - tilbuddet gælder nu!",
+    "g1g1Returning": "For at fejre nytåret bringer vi et ganske særligt tilbud tilbage. Lige nu, når du køber et abonnement som gave, får du det samme abonnement selv!",
+    "januaryYYYY": "januar <%= year %>",
+    "aprilYYYY": "april <%= year %>",
+    "royalPurpleJackolantern": "Purpur Græskarlygte"
 }
diff --git a/website/common/locales/da/npc.json b/website/common/locales/da/npc.json
index c5b9bc7695..034703225f 100644
--- a/website/common/locales/da/npc.json
+++ b/website/common/locales/da/npc.json
@@ -17,9 +17,9 @@
     "mattBochText1": "Velkommen til Stalden! Jeg er Staldmesteren Matt. Hver gang du færdiggør en opgave, vil du have en chance for at modtage et tilfældigt Æg eller Udklækningseliksir til at udklække Kæledyr. Når du udruger et Kæledyr, vil det dukke op her! Klik på billedet af Kæledyret for at føje det til din Avatar. Giv dem det Dyrefoder du finder, og de vil vokse sig til kraftfulde Ridedyr.",
     "welcomeToTavern": "Velkommen til Værtshuset!",
     "sleepDescription": "Har du brug for en pause? Check ind i Daniels Værtshus for at sætte nogle af Habiticas svære elementer på pause:",
-    "sleepBullet1": "Missede Daglige vil ikke skade dig",
-    "sleepBullet2": "Opgavers stribe-præstation vil ikke blive tabt",
-    "sleepBullet3": "Bosser vil ikke skade dig på grund af dine egne missede Daglige",
+    "sleepBullet1": "Dine missede Daglige vil ikke skade dig (bosser vil stadig kunne skade dig baseret på andre Holdmedlemmers missede Daglige)",
+    "sleepBullet2": "Dagliges stribe-præstation og Vanetæller vil ikke blive nulstillet",
+    "sleepBullet3": "Den skade, du vil påføre bossen, eller dine indsamlede questgenstande, vil først tælle med i questen, når du checker ud af Værtshuset",
     "sleepBullet4": "Du vil beholde din afventende skade til bosser eller indsamlede questgenstande indtil du checker ud",
     "pauseDailies": "Sæt skade på pause",
     "unpauseDailies": "Skade er ikke længere på pause",
@@ -129,5 +129,6 @@
     "cannotUnpinItem": "Denne genstand kan ikke frigøres.",
     "nMonthsSubscriptionGift": "<%= nMonths %> Måned(ers) Abonnement (Gave)",
     "nGemsGift": "<%= nGems %> Ædelsten (Gave)",
-    "nGems": "<%= nGems %> Ædelsten"
+    "nGems": "<%= nGems %> Ædelsten",
+    "amountExp": "<%= amount %> Exp"
 }
diff --git a/website/common/locales/da/overview.json b/website/common/locales/da/overview.json
index 5d029583e5..6900d74d9c 100644
--- a/website/common/locales/da/overview.json
+++ b/website/common/locales/da/overview.json
@@ -1,10 +1,10 @@
 {
     "needTips": "Brug for noget hjælp til at starte? Her er en enkel guide!",
     "step1": "Trin 1: Indtast opgaver",
-    "webStep1Text": "Habitica er intet uden mål i det virkelige liv, så opret et par opgaver. Du kan altid tilføje flere! Alle opgaver kan tilføjes ved at klikke på den grønne 'Opret' knap.\n* **Opret [To-Dos](http://habitica.fandom.com/wiki/To-Dos):** Tilføj opgaver, du kun skal gøre én gang, eller sjældent, i kolonnen 'To-Dos', en af gangen. Du kan klikke på opgaverne for at redigere dem og tilføje checklister, forfaldsdag og mere!\n* **Opret [Daglige](http://habitica.fandom.com/wiki/Dailies):** Tilføj aktiviteter, du skal klare hver dag, eller på en bestemt dag i ugen, måneden, eller året i kolonnen 'Daglige'. Klik på en opgaver for at ændre, hvornår den skal være forfalden og/eller fastsætte en startdato. Du kan også sætte den til at være forfalden med jævne mellemrum, for eksempel hver tredje dag.\n* **Opret [Vaner](http://habitica.fandom.com/wiki/Habits):** Tilføj vaner, du gerne vil tillægge dig, i kolonnen 'Vaner'. Du kan ændre Vanen for kun at gøre den til en god vane :heavy_plus_sign: eller en dårlig vane :heavy_minus_sign:\n* **Opret [Belønninger](http://habitica.fandom.com/wiki/Rewards):** Udover de Belønninger, der tilbydes i spillet, kan du tilføje aktiviteter eller små gaver/lækkerier, du kan bruge som motivation, i kolonnen 'Belønninger'. Det er vigtigt at give dig selv en pause eller tillade en lille luksus sommetider!\n* Hvis du har brug for inspiration til dine opgaver, kan du se [eksempler på Vaner](http://habitica.fandom.com/wiki/Sample_Habits), [eksempler på Daglige](http://habitica.fandom.com/wiki/Sample_Dailies), [eksempler på To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos), og [eksempler på Belønninger](http://habitica.fandom.com/wiki/Sample_Custom_Rewards) på wiki'en (engelsk).",
+    "webStep1Text": "Habitica er intet uden mål i det virkelige liv, så opret et par opgaver. Du kan altid tilføje flere! Alle opgaver kan tilføjes ved at klikke på den grønne 'Opret' knap.\n* **Opret [To Do's](https://habitica.fandom.com/wiki/To_Do%27s):** Tilføj opgaver, du kun skal gøre én gang, eller sjældent, i kolonnen To Do's, en af gangen. Du kan klikke på opgaverne for at redigere dem og tilføje checklister, forfaldsdag og mere!\n* **Opret [Daglige](https://habitica.fandom.com/wiki/Dailies):** Tilføj aktiviteter, du skal klare hver dag, eller på en bestemt dag i ugen, måneden, eller året i kolonnen 'Daglige'. Klik på en opgaver for at ændre, hvornår den skal være forfalden og/eller fastsætte en startdato. Du kan også sætte den til at være forfalden med jævne mellemrum, for eksempel hver tredje dag.\n* **Opret [Vaner](https://habitica.fandom.com/wiki/Habits):** Tilføj vaner, du gerne vil tillægge dig, i kolonnen 'Vaner'. Du kan ændre Vanen for kun at gøre den til en god vane :heavy_plus_sign: eller en dårlig vane :heavy_minus_sign:\n* **Opret [Belønninger](https://habitica.fandom.com/wiki/Rewards):** Udover de Belønninger, der tilbydes i spillet, kan du tilføje aktiviteter eller små gaver/lækkerier, du kan bruge som motivation, i kolonnen 'Belønninger'. Det er vigtigt at give dig selv en pause eller tillade en lille luksus sommetider!\n* Hvis du har brug for inspiration til dine opgaver, kan du se [eksempler på Vaner](https://habitica.fandom.com/wiki/Sample_Habits), [eksempler på Daglige](https://habitica.fandom.com/wiki/Sample_Dailies), [eksempler på To Do's](https://habitica.fandom.com/wiki/Sample_To_Do%27s), og [eksempler på Belønninger](https://habitica.fandom.com/wiki/Sample_Custom_Rewards) på wiki'en (engelsk).",
     "step2": "Trin 2: Optjen Point ved at gøre ting i det virkelig liv",
-    "webStep2Text": "Begynd nu på dine mål fra listen! Efterhånden som du fuldfører opgaver og krydser dem af i Habitica vil du få [Erfaring](http://habitica.fandom.com/wiki/Experience_Points), som vil lade dig stige i niveau, og [Guld](http://habitica.fandom.com/wiki/Gold_Points), som du kan købe Belønninger for. Hvis du giver efter for dårlige vaner eller misser dine Daglige, vil du miste [Liv](http://habitica.fandom.com/wiki/Health_Points). På denne måde vil Habiticas Erfarings- og Helbredsbjælker være en morsom indikater for fremskridt mod dine mål. Du vil begynde at se forbedringer i dit virkelige liv mens din karakter avancerer i spillet.",
+    "webStep2Text": "Begynd nu på dine mål fra listen! Efterhånden som du fuldfører opgaver og krydser dem af i Habitica vil du få [Erfaring](https://habitica.fandom.com/wiki/Experience_Points), som vil lade dig stige i niveau, og [Guld](https://habitica.fandom.com/wiki/Gold_Points), som du kan købe Belønninger for. Hvis du giver efter for dårlige vaner eller misser dine Daglige, vil du miste [Liv](https://habitica.fandom.com/wiki/Health_Points). På denne måde vil Habiticas Erfarings- og Helbredsbjælker være en morsom indikator for fremskridt mod dine mål. Du vil begynde at se forbedringer i dit virkelige liv, mens din karakter avancerer i spillet.",
     "step3": "Trin 3: Brugerdefiner og udforsk Habitica",
-    "webStep3Text": "Når du er blevet tryg ved nøglefunktionerne, kan du få endnu mere ud af Habitica med de følgende fikse detaljer:\n * Hold styr på dine opgaver med [tags](http://habitica.fandom.com/wiki/Tags) (rediger en opgave for at tilføje dem).\n * Tilpas din [avatar](http://habitica.fandom.com/wiki/Avatar) ved at klikke på brugerikonet i øverste højre hjørne.\n * Køb [Udstyr](http://habitica.fandom.com/wiki/Equipment) under Belønninger eller fra [Butikkerne](<%= shopUrl %>), og skift det ud under [Inventar > Udstyr](<%= equipUrl %>).\n * Sig hej til andre brugere i [Værtshuset](http://habitica.fandom.com/wiki/Tavern).\n * Fra niveau 3 kan du udklække [Kæledyr](http://habitica.fandom.com/wiki/Pets) ved at samle [æg](http://habitica.fandom.com/wiki/Eggs) og [udrugningseliksirer](http://habitica.fandom.com/wiki/Hatching_Potions). [Fodr](http://habitica.fandom.com/wiki/Food) dem for at få [Ridedyr](http://habitica.fandom.com/wiki/Mounts).\n * Fra niveau 10 kan du vælge en [klasse](http://habitica.fandom.com/wiki/Class_System), og får adgang til specielle [evner](http://habitica.fandom.com/wiki/Skills) (låses op fra niveau 11 til 14).\n * Lav et hold med dine venner (ved at klikke på [Hold](<%= partyUrl %>) i navigationsbarren), for at blive holdt ansvarlig og få en Questskriftrulle.\n * Du kan besejre monstre og indsamle genstande på [quests](http://habitica.fandom.com/wiki/Quests) (du vil få en quest på niveau 15).",
+    "webStep3Text": "Når du er blevet tryg ved nøglefunktionerne, kan du få endnu mere ud af Habitica med de følgende fikse detaljer:\n * Hold styr på dine opgaver med [tags](https://habitica.fandom.com/wiki/Tags) (rediger en opgave for at tilføje dem).\n * Tilpas din [avatar](https://habitica.fandom.com/wiki/Avatar) ved at klikke på brugerikonet i øverste højre hjørne.\n * Køb [udstyr](https://habitica.fandom.com/wiki/Equipment) under Belønninger eller fra [Butikkerne](<%= shopUrl %>), og skift det ud under [Inventar > Udstyr](<%= equipUrl %>).\n * Sig hej til andre brugere i [Værtshuset](https://habitica.fandom.com/wiki/Tavern).\n * Udklæk [kæledyr](https://habitica.fandom.com/wiki/Pets) ved at samle [æg](https://habitica.fandom.com/wiki/Eggs) og [udrugningseliksirer](https://habitica.fandom.com/wiki/Hatching_Potions). [Fodr](https://habitica.fandom.com/wiki/Food) dem for at få [ridedyr](https://habitica.fandom.com/wiki/Mounts).\n * Fra niveau 10 kan du vælge en [klasse](https://habitica.fandom.com/wiki/Class_System), og får adgang til specielle [evner](https://habitica.fandom.com/wiki/Skills) (låses op fra niveau 11 til 14).\n * Lav et hold med dine venner (ved at klikke på [Hold](<%= partyUrl %>) i navigationsbarren), for at blive holdt ansvarlig og få en Questskriftrulle.\n * Du kan besejre monstre og indsamle genstande på [quests](https://habitica.fandom.com/wiki/Quests) (du vil få en quest på niveau 15).",
     "overviewQuestions": "Har du flere spørgsmål? Læs vores [FAQ](<%= faqUrl %>)! Hvis du ikke kan finde et svar der, kan du bede om hjælp i Klanen [Habitica Help](<%= helpGuildUrl %>).\n\nHeld og lykke med dine opgaver!"
 }
diff --git a/website/common/locales/da/pets.json b/website/common/locales/da/pets.json
index ac4d09f3dd..8cfd7e1079 100644
--- a/website/common/locales/da/pets.json
+++ b/website/common/locales/da/pets.json
@@ -23,12 +23,12 @@
     "mantisShrimp": "Knælerreje",
     "mammoth": "Ulden mammut",
     "orca": "Spækhugger",
-    "royalPurpleGryphon": "Royal Lilla Grif",
+    "royalPurpleGryphon": "Purpur Grif",
     "phoenix": "Føniks",
     "magicalBee": "Magisk bi",
     "hopefulHippogriffPet": "Håbefuld hippogrif",
     "hopefulHippogriffMount": "Håbefuld hippogrif",
-    "royalPurpleJackalope": "Royal Lilla Jackalope",
+    "royalPurpleJackalope": "Purpur Jackalope",
     "invisibleAether": "Usynlig æter",
     "potion": "<%= potionType %> eliksir",
     "egg": "<%= eggType %> æg",
@@ -44,8 +44,8 @@
     "noFoodAvailable": "Du har ikke noget Dyrefoder.",
     "noSaddlesAvailable": "Du har ikke nogle sadler.",
     "noFood": "Du har hverken mad eller sadler.",
-    "dropsExplanation": "Du kan få fat i disse ting hurtigere med ædelsten, hvis du ikke længere vil vente på at finde dem når du gennemfører en opgave. <a href=\"http://habitica.fandom.com/wiki/Drops\">Lær mere om drop-systemet.</a>",
-    "dropsExplanationEggs": "Brug Ædelsten for hurtigere at få æg, hvis du ikke vil vente på at få standard-æg som drops, eller gentage Quests for at vinde Quest-æg.  <a href=\"http://habitica.fandom.com/wiki/Drops\">Læs mere om dropsystemet her.</a>",
+    "dropsExplanation": "Du kan få fat i disse ting hurtigere med ædelsten, hvis du ikke længere vil vente på at finde dem når du gennemfører en opgave. <a href=\"https://habitica.fandom.com/wiki/Drops\">Lær mere om drop-systemet.</a>",
+    "dropsExplanationEggs": "Brug Ædelsten for hurtigere at få æg, hvis du ikke vil vente på at få standard-æg som drops, eller gentage Quests for at vinde Quest-æg.  <a href=\"https://habitica.fandom.com/wiki/Drops\">Læs mere om dropsystemet her.</a>",
     "premiumPotionNoDropExplanation": "Magiske udrugningseliksirer kan ikke blive brugt på æg, der er modtaget fra quests. Den eneste måde at få en magisk udrugningseliksir på, er ved at købe dem nedenfor, ikke fra tilfældige drop.",
     "beastMasterProgress": "Dyretæmmerfremskridt",
     "beastAchievement": "Du har opnået \"Dyretæmmer\"-præstationen ved at samle alle kæledyr!",
diff --git a/website/common/locales/da/quests.json b/website/common/locales/da/quests.json
index bab7a48374..dc60cca6d3 100644
--- a/website/common/locales/da/quests.json
+++ b/website/common/locales/da/quests.json
@@ -35,9 +35,9 @@
     "mustComplete": "Du skal færdiggøre <%= quest %> først.",
     "mustLvlQuest": "Du skal være niveau <%= level %> for at købe denne quest!",
     "unlockByQuesting": "For at låse op for denne quest, skal du fuldføre <%= title %>.",
-    "questConfirm": "Er du sikker? Kun <%= questmembers %> af dine <%= totalmembers %> holdmedlemmer har valgt at deltage i denne quest! Quests begynder automatisk, når alle spillere enten har accepteret eller afvist invitationen.",
-    "sureCancel": "Er du sikker på at du vil afbryde denne quest? Alle invitation-accepter vil gå tabt. Quest-lederen vil beholde quest-skriftrullen.",
-    "sureAbort": "Er du sikker på at du vil afbryde missionen? Det vil afbryde den for alle i gruppen og al fremskridt vil gå tabt. Quest-skriftrullen vil blive returneret til quest-lederen.",
+    "questConfirm": "Er du sikker på at du vil starte denne quest? Ikke alle holdmedlemmer har accepteret invitationen. Quests begynder automatisk, når alle medlemmer har svaret.",
+    "sureCancel": "Er du sikker på at du vil afbryde denne quest? Hvis du afbryder, vil alle accepterede og åbne invitationer blive afvist. Quest-lederen vil få skriftrullen igen.",
+    "sureAbort": "Er du sikker på at du vil afbryde missionen? Al fremskridt vil gå tabt. Quest-lederen vil få skriftrullen igen.",
     "doubleSureAbort": "Er du helt sikker? Tjek lige at de ikke vil hade dig for evigt!",
     "bossRageTitle": "Vrede",
     "bossRageDescription": "Når denne bar bliver fyldt vil bossen udføre et specielt angreb!",
@@ -85,5 +85,9 @@
     "questAlreadyStarted": "Questen er allerede begyndt.",
     "bossDamage": "Du har skadet bossen!",
     "questInvitationNotificationInfo": "Du har fået en invitation til at deltage i en quest",
-    "hatchingPotionQuests": "Magisk Udrugningseliksirquest"
+    "hatchingPotionQuests": "Magisk Udrugningseliksirquest",
+    "questItemsPending": "<%= amount %> genstande fundet",
+    "sureLeaveInactive": "Er du sikker på, du vil forlade questen? Du vil ikke kunne deltage igen.",
+    "selectQuest": "Vælg quest",
+    "yourPartyIsNotOnQuest": "Dit hold er ikke på en quest"
 }
diff --git a/website/common/locales/da/questscontent.json b/website/common/locales/da/questscontent.json
index 6c78636b93..ecd07ba276 100644
--- a/website/common/locales/da/questscontent.json
+++ b/website/common/locales/da/questscontent.json
@@ -4,7 +4,7 @@
     "questEvilSantaCompletion": "Pelsjægerjulemanden skriger i vrede og løber bort i natten. Den taknemmelige hunbjørn forsøger gennem brøl og knurren at fortælle dig noget. Du tager hende med tilbage til stalden hvor Matt Boch, Hviskeren, lytter til hendes historie med et rædselsslagent gisp. Hun har en unge! Han løb ud på issletterne da bjørnemor blev fanget. Hjælp med at redde hendes barn!",
     "questEvilSantaBoss": "Pelsjægerjulemand",
     "questEvilSantaDropBearCubPolarMount": "Isbjørn (Ridedyr)",
-    "questEvilSanta2Text": "Find Bjørneungen",
+    "questEvilSanta2Text": "Find bjørneungen",
     "questEvilSanta2Notes": "Da pelsjægeren fangede Isbjørneridedyret, løb hendes unge ud på issletterne. Du kan høre grene knække og sne knirke gennem den krystalklare lyd af skoven. Poteaftryk! I begynder begge at løbe for at følge sporet. Find alle sporene og de brækkede grene, og hent ungen!<br><br><strong>Bemærk</strong>: “Find isbjørneungen” belønnes med en stackable quest-præstation, men giver et sjældent Kæledyr, som kun kan tilføjes til din Stald en enkelt gang.",
     "questEvilSanta2Completion": "Du har fundet ungen! Den vil holde dig med selskab til evig tid.",
     "questEvilSanta2CollectTracks": "Spor",
diff --git a/website/common/locales/da/rebirth.json b/website/common/locales/da/rebirth.json
index 0a5900bf5a..58bcd67bc5 100644
--- a/website/common/locales/da/rebirth.json
+++ b/website/common/locales/da/rebirth.json
@@ -8,7 +8,7 @@
     "rebirthOrb": "Brugte en Genfødselskugle til at starte forfra efter at have opnået Niveau <%= level %>.",
     "rebirthOrb100": "Brugte en Genfødselskugle til at starte forfra efter at have opnået Niveau 100 eller mere.",
     "rebirthOrbNoLevel": "Brugte en Genfødselskugle til at starte forfra.",
-    "rebirthPop": "Genstart omgående din karakter som Niveau 1 Kriger, men behold præstationer, samlerobjekter og udstyr. Du vil beholde dine opgaver og deres historie, men de vil blive nulstillet til gul. Dine striber vil blive fjernet, bortset fra opgaver tilhørende aktive Udfordringer og Gruppeplaner. Dit Guld, Erfaring, Mana, og alle effekter fra Evner vil blive fjernet. Alt dette vil ske omgående. For mere information, se siden <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> på wiki'en (engelsk).",
+    "rebirthPop": "Genstart omgående din karakter som Niveau 1 Kriger, men behold præstationer, samlerobjekter og udstyr. Du vil beholde dine opgaver og deres historie, men de vil blive nulstillet til gul. Dine striber vil blive fjernet, bortset fra opgaver tilhørende aktive Udfordringer og Gruppeplaner. Dit Guld, Erfaring, Mana, og alle effekter fra Evner vil blive fjernet. Alt dette vil ske omgående. For mere information, se siden <a href='https://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> på wiki'en (engelsk).",
     "rebirthName": "Genfødselskugle",
     "rebirthComplete": "Du er blevet genfødt!",
     "nextFreeRebirth": "<strong><%= days %> dage</strong> til <strong>GRATIS</strong> Genfødselskugle"
diff --git a/website/common/locales/da/settings.json b/website/common/locales/da/settings.json
index a68541c1c3..6960f86651 100644
--- a/website/common/locales/da/settings.json
+++ b/website/common/locales/da/settings.json
@@ -42,7 +42,7 @@
     "sureChangeCustomDayStartTime": "Er du sikker på, at du vil ændre dit brugerdefinerede starttidspunkt? Dine Daglige vil blive opdateret næste gang du bruger Habitica efter <%= time %>. Vær sikker på, at du har udført dine Daglige før da!",
     "customDayStartHasChanged": "Dit brugerdefinerede starttidspunkt er ændret.",
     "nextCron": "Dine Daglige vil blive nulstillet første gang du bruger Habitica efter <%= time %>. Vær sikker på, at du har færdiggjort dine Daglige før dette tidspunkt!",
-    "customDayStartInfo1": "Som udgangspunkt vil Habitica tjekke og nulstille dine Daglige ved midnat hver dag. Du kan ændre dette her.",
+    "customDayStartInfo1": "Habitica tjekke og nulstille dine Daglige ved midnat hver dag i din egen tidszone. Du kan ændre det til et andet tidspunkt efter midnat her.",
     "misc": "Diverse",
     "showHeader": "Vis sidehoved",
     "changePass": "Skift kodeord",
@@ -55,7 +55,7 @@
     "newUsername": "Nyt brugernavn",
     "dangerZone": "Farezone",
     "resetText1": "ADVARSEL! Dette nulstiller mange dele af din konto. Vi fraråder på det kraftigste dette, men nogen finder det brugbart i begyndelsen efter at have eksperimenteret med Habitica i et kort stykke tid.",
-    "resetText2": "Du vil miste alle niveauer, Guld, og Erfaringspoint. Alle dine Opgaver (bortset fra dem fra Udfordringer) vil blive slettet permanent, og du vil miste al deres historik. Du vil miste alt dit udstyr, men du vil være i stand til at købe det hele igen, inklusiv tidsbegrænset udstyr eller Mystiske abonnentsgenstande, som du allerede ejer (du vil være nødt til at være den rigtige klasse for at kunne købe klasse-udstyr igen). Du vil beholde din nuværende klasse og dine kæle- og ridedyr. Du ville måske foretrække at bruge en Genfødselskugle i stedet. Det er en meget sikrere mulighed, og du vil beholde dine opgaver og udstyr.",
+    "resetText2": "Du vil miste alle niveauer, Guld, og Erfaringspoint. Alle dine Opgaver (bortset fra dem fra Udfordringer) vil blive slettet permanent, og du vil miste al deres historik. Du vil miste alt dit udstyr, undtagen gratis gave-udstyr eller Mystiske abonnentsgenstande. Du vil være i stand til at købe alle de mistede genstand igen, inklusiv tidsbegrænset udstyr (du skal være den korrekte klasse for at købe klasse-begrænset udstyr). Du vil beholde din nuværende klasse, præstationer og dine kæle- og ridedyr. Du ville måske foretrække at bruge en Genfødselskugle i stedet. Det er en meget sikrere mulighed, og du vil beholde dine opgaver og udstyr.",
     "deleteLocalAccountText": "Er du sikker? Dette vil slette din konto for evigt, og den kan aldrig gendannes! Du skal registrere en ny konto for at kunne bruge Habitica igen. Ædelsten du har brugt eller har på lager vil ikke blive refunderet. Hvis du er fuldstændig sikker, så skriv dit kodeord i boksen herunder.",
     "deleteSocialAccountText": "Er du sikker? Dette vil slette din brugerkonto for evigt, og den kan aldrig gendannes! Du vil være nødt til at oprette en ny konto for at bruge Habitica igen. Ædelsten i en Klanbank eller som er blevet brugt vil ikke blive refunderet. Hvis du virkelig er helt sikker, så indtast \"<%= magicWord %>\" i tekstboksen nedenunder.",
     "API": "API",
@@ -189,5 +189,7 @@
     "suggestMyUsername": "Foreslå mit brugernavn",
     "mentioning": "Nævne",
     "displaynameIssueNewline": "Displaynavne må ikke indeholde backslashes efterfulgt af bogstavet N.",
-    "bannedWordUsedInProfile": "Dit Displaynavn eller Om-tekst indeholder upassende sprog."
+    "bannedWordUsedInProfile": "Dit Displaynavn eller Om-tekst indeholder upassende sprog.",
+    "adjustment": "Tilpasning",
+    "dayStartAdjustment": "Tilpasning af starttidspunkt"
 }
diff --git a/website/common/locales/da/subscriber.json b/website/common/locales/da/subscriber.json
index 32b426ce8f..f666156b56 100644
--- a/website/common/locales/da/subscriber.json
+++ b/website/common/locales/da/subscriber.json
@@ -5,7 +5,7 @@
     "buyGemsGold": "Køb Ædelsten med Guld",
     "mustSubscribeToPurchaseGems": "Skal abonnere for at kunne købe ædelsten med GP",
     "reachedGoldToGemCap": "Du har nået Guld => Ædelstens-maksimum <%= convCap %> for denne måned. Vi har dettee for at undgå misbrug/farming. Vekselmaksimummet nulstiller inden for de tre første dage af hver måned.",
-    "reachedGoldToGemCapQuantity": "Det antal Ædelsten du har anmodet om, <%= quantity %>, overstiger Guld => Ædelstens-vekselmaksimummet <%= convCap %> for denne måned. Vi har denne begrænsning for at forhindre misbrug/farming. Begrænsningen nulstilles inden for de første tre dage i hver måned.",
+    "reachedGoldToGemCapQuantity": "Det antal Ædelsten du har anmodet om, <%= quantity %>, overstiger det antal du kan købe denne måned <%= convCap %>. Begrænsningen nulstilles inden for de første tre dage i hver måned. Tak, fordi du abonnerer!",
     "mysteryItem": "Eksklusive månedlige genstande",
     "mysteryItemText": "Hver måned modtager alle abonnenter en unik kosmetisk ting til deres avatar! Derudover vil de Mystiske Tidsrejsende give dig adgang til yderligere historisk (og futuristisk!) kosmetisk udstyr for hver tre måneders fortsat abonnement.",
     "exclusiveJackalopePet": "Eksklusivt kæledyr",
@@ -15,7 +15,7 @@
     "subscribe": "Abonnér",
     "nowSubscribed": "Du abonnerer nu på Habitica!",
     "cancelSub": "Opsig abonnement",
-    "cancelSubInfoGroupPlan": "Fordi du har fået et gratis abonnement gennem en Gruppeplan, kan du ikke opsige det. Det vil ophøre, når du ikke længere er i Gruppen. Hvis du er Gruppelederen, og vil opsige hele Gruppeplanen, kan du gøre det fra fanen 'Betalingsoplysninger' på gruppens side.",
+    "cancelSubInfoGroupPlan": "Fordi du har fået et gratis abonnement gennem en Gruppeplan, kan du ikke opsige det. Det vil ophøre, når du ikke længere er medlem af Gruppeplanen. Hvis du er Gruppelederen, og vil opsige hele Gruppeplanen, kan du gøre det fra fanen 'Betaling' på gruppens side.",
     "cancelingSubscription": "Annullerer abonnementet",
     "contactUs": "Kontakt os",
     "checkout": "Til kassen",
@@ -129,7 +129,7 @@
     "subscriptionBenefit1": "Købmanden Alexander vil sælge dig Ædelsten for 20 Guld pr. styk!",
     "subscriptionBenefit3": "Opdag flere genstande i Habitica med en fordoblet drop-cap.",
     "subscriptionBenefit4": "Unikke, dekorative genstande til din avatar hver måned.",
-    "subscriptionBenefit5": "Modtag det eksklusive royale lilla Jackalopekæledyr!",
+    "subscriptionBenefit5": "Modtag det purpur Jackalopekæledyr, når du bliver abonnenent.",
     "subscriptionBenefit6": "Optjen mystiske timeglas du kan bruge på de Tidsrejsendes marked!",
     "purchaseAll": "Køb sæt",
     "gemsRemaining": "ædelsten tilbage",
@@ -151,5 +151,13 @@
     "mysterySet201905": "Dramatisk dragesæt",
     "mysterySet201904": "Overdådigt opalsæt",
     "mysterySet201903": "Æg-cellent sæt",
-    "mysterySet201902": "Kryptisk kærlighedssæt"
+    "mysterySet201902": "Kryptisk kærlighedssæt",
+    "organization": "Organisation",
+    "howManyGemsPurchase": "Hvor mange Ædelsten vil du gerne købe?",
+    "howManyGemsSend": "Hvor mange Ædelsten vil du gerne sende?",
+    "needToPurchaseGems": "Vil du købe Ædelsten som en gave til nogen?",
+    "wantToSendOwnGems": "Vil du sende dine egne Ædelsten?",
+    "giftASubscription": "Giv et abonnement",
+    "cancelSubInfoGoogle": "Gå venligst til sektionen Konto > Abonnementer i Google Play Store app'en for at afmelde dit abonnement, eller for at se hvornår det udløber, hvis du allerede har opsagt det. Denne skærm kan ikke fortælle dig, hvorvidt dit abonnement er blevet afmeldt.",
+    "cancelSubInfoApple": "Følg venligst <a href=\"https://support.apple.com/en-us/HT202039\">Apples officielle instruktioner</a> for at opsige dit abonnement, eller for at se hvornår det udløber, hvis du allerede har afmeldt det. Denne skærm kan ikke vise dig, hvorvidt dit abonnement er blevet afmeldt."
 }
diff --git a/website/common/locales/da/tasks.json b/website/common/locales/da/tasks.json
index 57abbe230c..72199761ee 100644
--- a/website/common/locales/da/tasks.json
+++ b/website/common/locales/da/tasks.json
@@ -1,10 +1,10 @@
 {
     "clearCompleted": "Slet færdiggjorte",
-    "clearCompletedDescription": "Færdiggjorte To-Do's bliver slettet efter 30 dage for ikke-abonnenter og 90 dage for abonnenter.",
-    "clearCompletedConfirm": "Er du sikker på, du vil slette dine færdiggjorte to-dos?",
+    "clearCompletedDescription": "Færdiggjorte To Do's bliver slettet efter 30 dage for ikke-abonnenter og 90 dage for abonnenter.",
+    "clearCompletedConfirm": "Er du sikker på, du vil slette dine færdiggjorte To Do's?",
     "addMultipleTip": "<strong>Tip:</strong> For at tilføje flere <%= taskType %>, så adskil dem ved at bruge linjeskift (Shift+Enter) og tryk enter igen, når du er klar.",
     "addATask": "Tilføj en <%= type %>",
-    "editATask": "Ret en <%= type %>",
+    "editATask": "Rediger <%= type %>",
     "createTask": "Opret <%= type %>",
     "addTaskToUser": "Tilføj opgave",
     "scheduled": "Planlagt",
@@ -27,7 +27,7 @@
     "notes": "Noter",
     "advancedSettings": "Avancerede indstillinger",
     "difficulty": "Sværhedsgrad",
-    "difficultyHelp": "Sværhedsgraden beskriver, hvor udfordrende en Vane, Daglig eller To-Do er for dig at fuldføre. En højere sværhedsgrad resulterer i højere gevinster, når en opgave er fuldført, men det gør også højere skade når en Daglig opgave bliver sprunget over, eller hvis en negativ Vane udføres.",
+    "difficultyHelp": "Sværhedsgraden beskriver, hvor udfordrende en Vane, Daglig eller To Do er for dig at fuldføre. En højere sværhedsgrad resulterer i højere gevinster, når en opgave er fuldført, men det gør også højere skade når en Daglig opgave bliver sprunget over, eller hvis en negativ Vane udføres.",
     "trivial": "Triviel",
     "easy": "Let",
     "medium": "Middel",
@@ -46,9 +46,9 @@
     "days": "Dage",
     "restoreStreak": "Ret stribe",
     "resetStreak": "Nulstil stribe",
-    "todo": "To-Do",
-    "todos": "To-Dos",
-    "todosDesc": "To-Do's skal kun færdiggøres en gang. Tilføje Tjeklister til dine To-Dos for at øge deres værdi.",
+    "todo": "To Do",
+    "todos": "To Do's",
+    "todosDesc": "To Do's skal kun færdiggøres en gang. Tilføje tjeklister til dine To Do's for at øge deres værdi.",
     "dueDate": "Forfaldsdato",
     "remaining": "Aktive",
     "complete": "Færdige",
@@ -127,5 +127,11 @@
     "checkOffYesterDailies": "Markér de daglige opgaver du udførte i går:",
     "yesterDailiesCallToAction": "Start min nye dag!",
     "sessionOutdated": "Din session er forældet. Genindlæs din browser eller synkronisér.",
-    "errorTemporaryItem": "Denne genstand er midlertidig og kan ikke fastgøres."
+    "errorTemporaryItem": "Denne genstand er midlertidig og kan ikke fastgøres.",
+    "adjustCounter": "Justér tæller",
+    "addATitle": "Tilføj en titel",
+    "addNotes": "Tilføj noter",
+    "counter": "Tæller",
+    "resetCounter": "Nulstil tæller",
+    "tomorrow": "I morgen"
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index fb88fb407a..73f5f6d95a 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -162,7 +162,7 @@
     "onlyCreatorOrAdminCanDeleteChat": "Keine Berechtigung diese Nachricht zu löschen!",
     "onlyGroupLeaderCanEditTasks": "Nicht berechtigt, Aufgaben zu bearbeiten!",
     "onlyGroupTasksCanBeAssigned": "Nur Team-Aufgaben können verteilt werden",
-    "assignedTo": "Zuweisen an",
+    "assignedTo": "Zugewiesen an",
     "assignedToUser": "<strong><%- userName %></strong> zugewiesen",
     "assignedToMembers": "<strong><%= userCount %></strong> Mitgliedern zugewiesen",
     "assignedToYouAndMembers": "Dir und <strong><%= userCount %> Mitliedern</strong> zugewiesen",
diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json
index 086d3ce5a6..65b89d50b2 100644
--- a/website/common/locales/en/front.json
+++ b/website/common/locales/en/front.json
@@ -3,13 +3,13 @@
   "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",
   "chores": "Chores",
   "clearBrowserData": "Clear Browser Data",
-  "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Extensions</a>",
+  "communityExtensions": "Add-ons & Extensions",
   "communityFacebook": "Facebook",
   "communityInstagram": "Instagram",
   "companyAbout": "How It Works",
   "companyBlog": "Blog",
-  "companyContribute": "Contribute",
-  "companyDonate": "Donate",
+  "companyContribute": "Contributing to Habitica",
+  "companyDonate": "Donate to Habitica",
   "forgotPassword": "Forgot Password?",
   "emailNewPass": "Email a Password Reset Link",
   "forgotPasswordSteps": "Enter your username or the email address you used to register your Habitica account.",
@@ -18,6 +18,7 @@
   "footerCommunity": "Community",
   "footerCompany": "Company",
   "footerMobile": "Mobile",
+  "footerProduct": "Product",
   "footerSocial": "Social",
   "free": "Join for free",
   "guidanceForBlacksmiths": "Guidance for Blacksmiths",
@@ -51,8 +52,8 @@
   "marketing4Lead3-1": "Want to gamify your life?",
   "marketing4Lead3-2": "Interested in running a group in education, wellness, and more?",
   "marketing4Lead3Title": "Gamify Everything",
-  "mobileAndroid": "Android",
-  "mobileIOS": "iOS",
+  "mobileAndroid": "Android App",
+  "mobileIOS": "iOS App",
   "oldNews": "News",
   "newsArchive": "News archive on Wikia (multilingual)",
   "setNewPass": "Set New Password",
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index a9d0e6c007..443b4eb8e9 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -85,7 +85,8 @@
   "newBaileyUpdate": "New Bailey Update!",
   "tellMeLater": "Tell Me Later",
   "dismissAlert": "Dismiss This Alert",
-  "donateText3": "Habitica is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!",
+  "donateText3": "Habitica is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteers",
+  "helpSupportHabitica": "Help Support Habitica",
   "card": "Credit Card",
   "paymentMethods": "Purchase using",
   "paymentSuccessful": "Your payment was successful!",
diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json
index 92437a7f12..99143ddf3c 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -596,7 +596,7 @@
   "questHippoUnlockText": "Unlocks Hippo Eggs for purchase in the Market",
 
   "farmFriendsText": "Farm Friends Quest Bundle",
-  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until August 31.",
+  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30.",
 
   "witchyFamiliarsText": "Witchy Familiars Quest Bundle",
   "witchyFamiliarsNotes": "Contains 'The Rat King', 'The Icy Arachnid', and 'Swamp of the Clutter Frog'. Available until October 31.",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index e7cc53175a..b199612950 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -172,7 +172,7 @@
     "couponCodeRequired": "The coupon code is required.",
     "subCanceledTitle": "Subscription Canceled",
     "choosePaymentMethod": "Choose your payment method",
-    "support": "SUPPORT",
+    "support": "Support",
     "supportHabitica": "Support Habitica",
     "gemBenefitLeadin": "What can you buy with Gems?",
     "gemBenefit1": "Unique and fashionable costumes for your avatar.",
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 77f1970eef..2bc8616497 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -987,39 +987,39 @@
     "headSpecialSummer2016RogueText": "Casco de Anguila",
     "headSpecialSummer2016RogueNotes": "Espía por entre las grietas de las rocas mientras usas este sigiloso casco. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialSummer2016WarriorText": "Casco Tiburón",
-    "headSpecialSummer2016WarriorNotes": "¡Muerde esas tareas difíciles con este temible casco! Incrementa fuerza en <%= str %>. Edición Limitada 2016 Equipamiento de Verano.",
+    "headSpecialSummer2016WarriorNotes": "¡Muerde esas tareas difíciles con este temible casco! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialSummer2016MageText": "Sombrero Espiráculo",
-    "headSpecialSummer2016MageNotes": "Agua mágica rocía constantemente de este sombrero. Incrementa Percepción en <%= per %>. Edición Limitada 2016 Equipamiento de Verano.",
+    "headSpecialSummer2016MageNotes": "Agua mágica rocía constantemente de este sombrero. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialSummer2016HealerText": "Casco de Caballito de Mar",
-    "headSpecialSummer2016HealerNotes": "Este sombrero indica que su usuario fue entrenado por los Caballitos de Mar sanadores de Dilatory. Incrementa Inteligencia en <%= int %>. Edición Limitada 2016 Equipamiento de Verano.",
+    "headSpecialSummer2016HealerNotes": "Este sombrero indica que su usuario fue entrenado por los Caballitos de Mar sanadores de Dilatory. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2016.",
     "headSpecialFall2016RogueText": "Casco Viuda Negra",
-    "headSpecialFall2016RogueNotes": "Las patas en este casco están crispando constantemente. Incrementa la Percepción por <%= per %>. Equipamiento de Edición Limitada de Otoño 2016.",
+    "headSpecialFall2016RogueNotes": "Las patas en este casco están crispando constantemente. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialFall2016WarriorText": "Casco de Corteza Nudosa",
-    "headSpecialFall2016WarriorNotes": "Este casco empapado en agua de pantano está cubierto con trocitos de ciénaga. Incrementa la Fuerza en <%= str %>. Equipamiento de Otoño Edición Limitada 2016.",
+    "headSpecialFall2016WarriorNotes": "Este casco empapado en agua de pantano está cubierto con trocitos de ciénaga. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialFall2016MageText": "Capucha de Maldad",
-    "headSpecialFall2016MageNotes": "Oculta tus planes bajo esta capucha sombría. Incrementa la Percepción en <%= per %>. Equipamiento de Otoño, Edición Limitada 2016.",
+    "headSpecialFall2016MageNotes": "Oculta tus planes bajo esta capucha sombría. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialFall2016HealerText": "Corona de Medusa",
-    "headSpecialFall2016HealerNotes": "Miseria a cualquiera te mire en los ojos... Incrementa la Inteligencia por <%= int %>. Equipamiento de Otoño Edición Limitada 2016.",
+    "headSpecialFall2016HealerNotes": "Miseria a cualquiera te mire en los ojos... Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2016.",
     "headSpecialNye2016Text": "Sombrero Extravagante de Fiesta",
-    "headSpecialNye2016Notes": "¡Has recibido el Sombrero Extravagante de Fiesta! ¡Llévalo con orgullo en el Nuevo Año! No proporciona ventajas.",
+    "headSpecialNye2016Notes": "¡Has recibido el Sombrero Extravagante de Fiesta! ¡Llévalo con orgullo en el año nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2017RogueText": "Yelmo Helado",
-    "headSpecialWinter2017RogueNotes": "Hecho a partir de cristales de hielo, este yelmo te ayudará a pasar desapercibido por los paisajes invernales. Aumenta la Percepción en <%= per %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017RogueNotes": "Hecho a partir de cristales de hielo, este yelmo te ayudará a pasar desapercibido por los paisajes invernales. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialWinter2017WarriorText": "Yelmo de Hockey",
-    "headSpecialWinter2017WarriorNotes": "¡Este yelmo es duro y duradero, hecho para soportar impactos de hielo o incluso de las tareas Diarias de color rojo oscuro! Aumenta la Fuerza en <%= str %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017WarriorNotes": "¡Este yelmo es duro y duradero, hecho para soportar impactos de hielo o incluso de las tareas Diarias de color rojo oscuro! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialWinter2017MageText": "Yelmo de Lobo Invernal",
-    "headSpecialWinter2017MageNotes": "Este yelmo, hecho a imagen del legendario Lobo Invernal, mantendrá tu cabeza caliente y tu visión aguda. Aumenta la Percepción en <%= per %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017MageNotes": "Este yelmo, hecho a imagen del legendario Lobo Invernal, mantendrá tu cabeza caliente y tu visión aguda. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialWinter2017HealerText": "Yelmo de Flor Chispeante",
-    "headSpecialWinter2017HealerNotes": "¡Estos brillantes pétalos focalizan tu poder cerebral! Aumenta la Inteligencia en <%= int %>. Equipamiento Invernal Edición Limitada 2016-2017.",
+    "headSpecialWinter2017HealerNotes": "¡Estos brillantes pétalos focalizan tu poder cerebral! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de invierno 2016-2017.",
     "headSpecialSpring2017RogueText": "Yelmo de Conejo Furtivo",
-    "headSpecialSpring2017RogueNotes": "¡Esta máscara impedirá que tu monería te traicione mientras te aproximas furtivamente a tus Diarias (o a los tréboles)! Aumenta la Percepción en <%= per %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017RogueNotes": "¡Esta máscara impedirá que tu monería te traicione mientras te aproximas furtivamente a tus Diarias (o a los tréboles)! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSpring2017WarriorText": "Yelmo Felino",
-    "headSpecialSpring2017WarriorNotes": "Proteje tu adorable y confusa cabeza con este yelmo finamente decorado. Aumenta la Fuerza en <%= str %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017WarriorNotes": "Proteje tu adorable y confusa cabeza con este yelmo finamente decorado. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSpring2017MageText": "Sombrero de Hechicero Canino",
-    "headSpecialSpring2017MageNotes": "Este sombrero puede ayudarte a lanzar poderosos hechizos... O simplemente puedes usarlo para invocar pelotas de tenis. A tu elección. Aumenta la Percepción en <%= per %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017MageNotes": "Este sombrero puede ayudarte a lanzar poderosos hechizos... O simplemente puedes usarlo para invocar pelotas de tenis. A tu elección. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSpring2017HealerText": "Diadema de Pétalos",
-    "headSpecialSpring2017HealerNotes": "Esta delicada corona emite el aroma reconfortante de las nuevas flores de primavera. Aumenta la inteligencia en <%= int %>. Equipamiento de Edición Limitada de primavera de 2017.",
+    "headSpecialSpring2017HealerNotes": "Esta delicada corona emite el aroma reconfortante de las nuevas flores de primavera. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de primavera 2017.",
     "headSpecialSummer2017RogueText": "Yelmo de Dragón Marino",
-    "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017WarriorText": "Yelmo Castilloarena",
     "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipo de Edición Limitada Verano 2017.",
     "headSpecialSummer2017MageText": "Sombrero Torbellino",
diff --git a/website/common/locales/it/backgrounds.json b/website/common/locales/it/backgrounds.json
index 71088994d6..b33cb01299 100644
--- a/website/common/locales/it/backgrounds.json
+++ b/website/common/locales/it/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundRainbowEucalyptusText": "Eucalipto Arcobaleno",
     "backgroundByACampfireText": "Accanto ad un Falò",
     "backgroundRainbowEucalyptusNotes": "Ammira un boschetto di Eucalipto Arcobaleno.",
-    "backgroundMessyRoomNotes": "Riordina una Stanza Disordinata."
+    "backgroundMessyRoomNotes": "Riordina una Stanza Disordinata.",
+    "backgrounds092022": "SET 100: Rilasciato a settembre 2022",
+    "backgroundTheatreStageText": "Palcoscenico Teatrale",
+    "backgroundTheatreStageNotes": "Esibisciti su di un Palcoscenico Teatrale.",
+    "backgroundAutumnPicnicText": "Picnic Autunnale",
+    "backgroundAutumnPicnicNotes": "Goditi un Picnic Autunnale.",
+    "backgroundOldPhotoText": "Vecchia Foto",
+    "backgroundOldPhotoNotes": "Mettiti in posa in una Vecchia Foto."
 }
diff --git a/website/common/locales/it/gear.json b/website/common/locales/it/gear.json
index f37bd0f611..5cf5dd3aec 100644
--- a/website/common/locales/it/gear.json
+++ b/website/common/locales/it/gear.json
@@ -2694,5 +2694,9 @@
     "weaponMystery202209Text": "Manuale di Magia",
     "weaponMystery202209Notes": "Questo libro ti guiderà lungo il viaggio di apprendimento nella creazione di magie. Non conferisce alcun bonus. Oggetto abbonati settembre 2022.",
     "shieldMystery202209Notes": "Accrescere la tua conoscenza sulla magia richiede molto studio, ma puoi esser certo che apprezzerai la tua istruzione. Oggetto abbonati settembre 2022.",
-    "shieldMystery202209Text": "Pila di Libri Magici"
+    "shieldMystery202209Text": "Pila di Libri Magici",
+    "eyewearArmoireComedyMaskText": "Maschera della Commedia",
+    "eyewearArmoireTragedyMaskText": "Maschera della Tragedia",
+    "eyewearArmoireComedyMaskNotes": "Urrà! Ecco una maschera pittoresca per il vostro cuor contento, ludico, che esprime gaiezza ed ilarità sul palco. Aumenta la Costituzione di <%= con %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 1 di 2).",
+    "eyewearArmoireTragedyMaskNotes": "Ahimè! Ecco una maschera gravosa per il vostro povero attore, impettito, afflitto, che esprime affanno e rammarico sul palco. Aumenta l'Intelligenza di <%= int %>. Scrigno Incantato: Set Maschere Teatrali (oggetto 2 di 2)."
 }
diff --git a/website/common/locales/ja/backgrounds.json b/website/common/locales/ja/backgrounds.json
index fb7d3f7b69..3673f3db75 100644
--- a/website/common/locales/ja/backgrounds.json
+++ b/website/common/locales/ja/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundByACampfireText": "キャンプファイアのかたわらで",
     "backgroundByACampfireNotes": "キャンプファイアの火にあたりましょう。",
     "backgroundRainbowEucalyptusText": "虹のユーカリ",
-    "backgroundRainbowEucalyptusNotes": "虹のユーカリの木立を鑑賞しましょう。"
+    "backgroundRainbowEucalyptusNotes": "虹のユーカリの木立を鑑賞しましょう。",
+    "backgrounds092022": "セット100：2022年9月リリース",
+    "backgroundTheatreStageText": "劇場の大舞台",
+    "backgroundTheatreStageNotes": "劇場の大舞台でパフォーマンスしよう。",
+    "backgroundAutumnPicnicText": "秋のピクニック",
+    "backgroundAutumnPicnicNotes": "秋のピクニックを楽しもう。",
+    "backgroundOldPhotoText": "古写真",
+    "backgroundOldPhotoNotes": "古写真風にポーズを決めよう。"
 }
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index be0002b0d9..9bcf0c4211 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -2694,5 +2694,9 @@
     "weaponMystery202209Text": "魔法マニュアル",
     "weaponMystery202209Notes": "魔法使いへの道のりへと、あなたを導くのがこの本です。効果なし。2022年9月の有料会員アイテム。",
     "shieldMystery202209Notes": "魔術の知識を身につけるには多くの本を読まなければいけませんが、その過程はきっと楽しいはず。効果なし。2022年9月有料会員アイテム。",
-    "shieldMystery202209Text": "山積みの魔法書"
+    "shieldMystery202209Text": "山積みの魔法書",
+    "eyewearArmoireComedyMaskText": "喜劇の仮面",
+    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しよう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
+    "eyewearArmoireTragedyMaskText": "悲劇の仮面",
+    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しよう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
 }
diff --git a/website/common/locales/ja/generic.json b/website/common/locales/ja/generic.json
index 98738b9621..1bbaf073c2 100644
--- a/website/common/locales/ja/generic.json
+++ b/website/common/locales/ja/generic.json
@@ -175,8 +175,8 @@
     "self_care": "セルフケア",
     "habitica_official": "Habitica 公式",
     "academics": "学術分野",
-    "advocacy_causes": "主張・提言",
-    "entertainment": "エンタメ",
+    "advocacy_causes": "主義主張",
+    "entertainment": "エンターテイメント",
     "finance": "ファイナンス",
     "health_fitness": "健康・フィットネス",
     "hobbies_occupations": "ホビー・趣味",
diff --git a/website/common/locales/ja/quests.json b/website/common/locales/ja/quests.json
index fa487fc5d2..d50d61605a 100644
--- a/website/common/locales/ja/quests.json
+++ b/website/common/locales/ja/quests.json
@@ -17,7 +17,7 @@
     "invitedToQuest": "<span class=\"notification-bold-blue\"><%= quest %></span> クエストに招待されました",
     "askLater": "あとで答える",
     "buyQuest": "クエストを買う",
-    "accepted": "承認しました",
+    "accepted": "承認済み",
     "declined": "辞退済み",
     "rejected": "拒否しました",
     "pending": "保留",
diff --git a/website/common/locales/pt_BR/backgrounds.json b/website/common/locales/pt_BR/backgrounds.json
index 561ea373d3..0975219d32 100644
--- a/website/common/locales/pt_BR/backgrounds.json
+++ b/website/common/locales/pt_BR/backgrounds.json
@@ -717,5 +717,12 @@
     "backgroundByACampfireNotes": "Aqueça-se na faísca Perto de uma Fogueira.",
     "backgrounds082022": "Conjunto 99: Lançado em Agosto de 2022",
     "backgroundRainbowEucalyptusText": "Eucalipto Arco-íris",
-    "backgroundRainbowEucalyptusNotes": "Admire um bosque de Eucalipto Arco-íris."
+    "backgroundRainbowEucalyptusNotes": "Admire um bosque de Eucalipto Arco-íris.",
+    "backgrounds092022": "CONJUNTO 100: Lançado em setembro de 2022",
+    "backgroundOldPhotoNotes": "Faça uma pose em um Retrato Antigo.",
+    "backgroundOldPhotoText": "Retrato Antigo",
+    "backgroundAutumnPicnicNotes": "Aproveite um Piquenique de Outono.",
+    "backgroundAutumnPicnicText": "Piquenique de Outono",
+    "backgroundTheatreStageText": "Palco de Teatro",
+    "backgroundTheatreStageNotes": "Performe em um Palco de Teatro."
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index a3a6cad844..484b60a3e5 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -2694,5 +2694,9 @@
     "weaponMystery202209Notes": "Este livro irá te guiar durante sua jornada de mágicas. Não confere benefícios. Item de Assinante de setembro de 2022",
     "shieldMystery202209Text": "Monte dos Livros Mágicos",
     "shieldMystery202209Notes": "Construir seu conhecimento sobre feitiçaria precisa de muita leitura, mas com certeza irá aproveitar sua educação. Não confere benefícios. Item de Assinante de setembro de 2022.",
-    "weaponMystery202209Text": "Manual Mágico"
+    "weaponMystery202209Text": "Manual Mágico",
+    "eyewearArmoireComedyMaskText": "Máscara da Comédia",
+    "eyewearArmoireComedyMaskNotes": "Com alegria! Aqui está uma máscara pitoresca para seu coração feliz, tocando, anunciando e expressando alegria no palco. Aumenta Constituição em <%= con %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 1 de 2).",
+    "eyewearArmoireTragedyMaskText": "Máscara da Tragédia",
+    "eyewearArmoireTragedyMaskNotes": "Com lástima! Aqui está uma máscara pesada para seu pobre personagem, se escorando, se preocupando e expressando aflição e tristeza no palco. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto Máscaras de Teatro (Item 2 de 2)."
 }
diff --git a/website/common/locales/ru/backgrounds.json b/website/common/locales/ru/backgrounds.json
index 4b5c57780e..cef11441a8 100644
--- a/website/common/locales/ru/backgrounds.json
+++ b/website/common/locales/ru/backgrounds.json
@@ -721,5 +721,12 @@
     "backgroundMountainWaterfallNotes": "Полюбуйтесь горным водопадом.",
     "backgroundSailboatAtSunsetText": "Парусник на закате",
     "backgroundSailboatAtSunsetNotes": "Насладитесь красотой парусника на закате.",
-    "backgrounds062022": "Набор 97: Выпущен в июне 2022"
+    "backgrounds062022": "Набор 97: Выпущен в июне 2022",
+    "backgrounds092022": "Набор 100 : Выпущен в сентябре 2022",
+    "backgroundTheatreStageText": "Театральная сцена",
+    "backgroundTheatreStageNotes": "Выступайте на театральной сцене.",
+    "backgroundAutumnPicnicText": "Осенний пикник",
+    "backgroundAutumnPicnicNotes": "Насладитесь осенним пикником.",
+    "backgroundOldPhotoText": "Старая фотография",
+    "backgroundOldPhotoNotes": "Примите таинственную позу на старом фото."
 }
diff --git a/website/common/locales/ru/groups.json b/website/common/locales/ru/groups.json
index 22ab631af6..1189eb7352 100644
--- a/website/common/locales/ru/groups.json
+++ b/website/common/locales/ru/groups.json
@@ -162,11 +162,11 @@
     "onlyCreatorOrAdminCanDeleteChat": "Вы не авторизованы чтобы удаить это сообщение!",
     "onlyGroupLeaderCanEditTasks": "Вы не авторизованы, чтобы редактировать задачи!",
     "onlyGroupTasksCanBeAssigned": "Можно назначать только командные задачи",
-    "assignedTo": "Назначить",
-    "assignedToUser": "Назначено для <strong><%- userName %></strong>",
-    "assignedToMembers": "Назначено <strong><%= userCount %> участникам</strong>",
-    "assignedToYouAndMembers": "Назначено вам и <strong><%= userCount %> участникам</strong>",
-    "youAreAssigned": "Назначено вам",
+    "assignedTo": "Назначено",
+    "assignedToUser": "Назначено для: <strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %> пользователям",
+    "assignedToYouAndMembers": "<strong>Вам</strong>, <%= userCount %> пользователям",
+    "youAreAssigned": "Назначено: <strong>вам</strong>",
     "taskIsUnassigned": "Эта задача не назначена",
     "confirmUnClaim": "Вы уверены, что хотите освободить эту задачу?",
     "confirmNeedsWork": "Вы уверены, что хотите пометить эту задачу как нуждающуюся в работе?",
@@ -183,7 +183,7 @@
     "removeClaim": "Удалить претензию",
     "onlyGroupLeaderCanManageSubscription": "Только предводитель группы может управлять общей подпиской",
     "yourTaskHasBeenApproved": "Ваше задание <span class=\"notification-green notification-bold\"><%- taskText %></span> было одобрено.",
-    "taskNeedsWork": "<span class=\"notification-bold\"><%- managerName %></span> отметил <span class=\"notification-bold\"><%- taskText %></span> как требующей дополнительной работы.",
+    "taskNeedsWork": "<span class=\"notification-bold\"><%- taskText %></span> отправлено на доработку <span class=\"notification-bold\">@<%- managerName %></span>. Ваши награды за выполнение задачи были аннулированы.",
     "userHasRequestedTaskApproval": "<span class=\"notification-bold\"><%- user %></span> просит одобрить <span class=\"notification-bold\"><%- taskName %></span>",
     "approve": "Одобрить",
     "approveTask": "Одобрить задание",
@@ -361,14 +361,14 @@
     "assignedDateOnly": "Назначено на <strong><%= date %></strong>",
     "cannotRemoveQuestOwner": "Вы не можете удалить владельца активного задания. Сначала отмените задание.",
     "blockYourself": "Вы не можете заблокировать себя",
-    "assignedDateAndUser": "Назначено <strong>@<%- username %></strong> на <strong><%= date %></strong>",
+    "assignedDateAndUser": "Назначено @<%- username %> на <%= date %>",
     "bannedWordsAllowedDetail": "Выбрав эту опцию, вы разрешаете использование запрещенных слов в этой гильдии.",
     "bannedWordsAllowed": "Разрешить запрещенные слова",
     "thisTaskApproved": "Это задание было одобрено",
     "giftMessageTooLong": "Максимальная длина поздравительных сообщений <%= maxGiftMessageLength %>.",
     "onlyPrivateGuildsCanUpgrade": "Только приватные гильдии могут быть улучшены до группы.",
     "managerNotes": "Заметки менеджера",
-    "chooseTeamMember": "Выберете члена команды",
+    "chooseTeamMember": "Найдите члена команды",
     "unassigned": "Не назначено",
     "viewDetails": "Посмотреть детали",
     "upgradeToGroup": "Улучшить до группы",
@@ -390,5 +390,9 @@
     "newGroupsWelcome": "Добро пожаловать в новый общий список задач!",
     "newGroupsWhatsNew": "Посмотрите, что нового:",
     "newGroupsBullet01": "Взаимодействуйте с задачами непосредственно через общий список задач",
-    "newGroupsBullet05": "Цвет общих задач будет меняться, если они не были завершены, чтобы было легче отслеживать прогресс"
+    "newGroupsBullet05": "Цвет общих задач будет меняться, если они не были завершены, чтобы было легче отслеживать прогресс",
+    "lastCompleted": "Последнее выполненное",
+    "newGroupsBullet06": "Просмотр статуса задания позволяет быстро увидеть, кто его выполнил",
+    "newGroupsBullet07": "Включите функцию отображения общих задач на вашей персональной доске задач",
+    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач"
 }
diff --git a/website/common/locales/ru/settings.json b/website/common/locales/ru/settings.json
index 9713ee1169..1d9bc9585c 100644
--- a/website/common/locales/ru/settings.json
+++ b/website/common/locales/ru/settings.json
@@ -216,5 +216,6 @@
     "noGemTransactions": "У вас пока что нет переводов самоцветов.",
     "noHourglassTransactions": "У вас пока что нет переводов песочных часов.",
     "transaction_debug": "Действие по отладке",
-    "passwordSuccess": "Пароль успешно изменен"
+    "passwordSuccess": "Пароль успешно изменен",
+    "giftSubscriptionRateText": "<strong>$<%= price %> долларов США</strong> за <strong><%= months %> месяц(-а/-ев)</strong>"
 }
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index 1863652bfe..0346647337 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -211,5 +211,7 @@
     "mysterySet202204": "Набор виртуального искателя приключений",
     "mysterySet202205": "Набор крылатого сумеречного дракона",
     "mysterySet202206": "Набор Морской Феи",
-    "mysterySet202208": "Набор Задорный хвостик"
+    "mysterySet202208": "Набор Задорный хвостик",
+    "mysterySet202209": "Набор магического учёного",
+    "mysterySet202207": "Набор желейной медузы"
 }
diff --git a/website/common/locales/uk/backgrounds.json b/website/common/locales/uk/backgrounds.json
index ddb59fd512..7da88a1469 100644
--- a/website/common/locales/uk/backgrounds.json
+++ b/website/common/locales/uk/backgrounds.json
@@ -717,5 +717,12 @@
     "backgroundByACampfireNotes": "Грійтеся в сяйві поблизу багаття.",
     "backgrounds082022": "Набір 99: серпень 2022",
     "backgroundMessyRoomNotes": "Наведіть порядок у безладній кімнаті.",
-    "backgroundByACampfireText": "Біля багаття"
+    "backgroundByACampfireText": "Біля багаття",
+    "backgrounds092022": "Набір 100: вересень 2022",
+    "backgroundTheatreStageText": "Театральна сцена",
+    "backgroundTheatreStageNotes": "Зіграйте на театральній сцені.",
+    "backgroundAutumnPicnicText": "Осінній пікнік",
+    "backgroundAutumnPicnicNotes": "З'їздіть на осінній пікнік.",
+    "backgroundOldPhotoText": "Старе фото",
+    "backgroundOldPhotoNotes": "Прийміть загадкову позу на старому фото."
 }
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index effd40ceaf..c729b05ddd 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -3,7 +3,7 @@
     "equipmentType": "Тип",
     "klass": "Клас",
     "groupBy": "Групувати по <%= type %>",
-    "classBonus": "",
+    "classBonus": "(Цей предмет відповідає вашому класу, тому він отримує додатковий множник характеристик 1.5)",
     "classArmor": "Класова броня",
     "featuredset": "Рекомандований комплект <%= name %>",
     "mysterySets": "Містичний комплект",
@@ -11,7 +11,7 @@
     "noGearItemsOfType": "Ви не володієте жодним з цих предметів.",
     "noGearItemsOfClass": "Ви вже зібрали все спорядження для свого класу! Більше буде випущено до Великих Свят, під час сонцестояння та рівнодення.",
     "classLockedItem": "This item is only available to a specific class. Change your class under the User icon > Settings > Character Build!",
-    "tierLockedItem": "",
+    "tierLockedItem": "Цей товар доступний лише після того, як ви купите попередні товари з послідовності. Продовжуйте працювати!",
     "sortByType": "Тип",
     "sortByPrice": "Ціна",
     "sortByCon": "ВИТ",
@@ -79,19 +79,19 @@
     "weaponHealer6Text": "Золотий скіпетр",
     "weaponHealer6Notes": "Заспокоює біль тих, хто дивиться на нього. Збільшує Інтеллект на <%= int %>.",
     "weaponSpecial0Text": "Клинок чорних душ",
-    "weaponSpecial0Notes": "",
+    "weaponSpecial0Notes": "Поїдає життєву силу ворогів, щоб посилити свої злі удари. Збільшує силу на <%= str %>.",
     "weaponSpecial1Text": "Кришталевий клинок",
-    "weaponSpecial1Notes": "",
+    "weaponSpecial1Notes": "Його блискучі грані розповідають про героя. Збільшує всі характеристики на <%= attrs %>.",
     "weaponSpecial2Text": "Патериця дракона Стефана Вебера",
     "weaponSpecial2Notes": "Відчуйте могутність сили дракона! Збільшує силу та спритність на <%= attrs %>.",
     "weaponSpecial3Text": "Моргенштерн неперевної послідовності",
-    "weaponSpecial3Notes": "",
+    "weaponSpecial3Notes": "Із зустрічами, монстрами, нездужанням - покінчено! Стерто в пил! Збільшує силу, інтелект та витривалість на <%= attrs %>.",
     "weaponSpecialCriticalText": "Убивчий молот Баґо-руба",
-    "weaponSpecialCriticalNotes": "",
+    "weaponSpecialCriticalNotes": "Цей чемпіон убив критичного ворога GitHub, де полягло багато воїнів. Цей молот, виготовлений із кісток Жука, завдає потужного критичного удару. Збільшує силу та спритність на <%= attrs %>.",
     "weaponSpecialTakeThisText": "Візьміть Цей Меч",
-    "weaponSpecialTakeThisNotes": "",
-    "weaponSpecialTridentOfCrashingTidesText": "",
-    "weaponSpecialTridentOfCrashingTidesNotes": "",
+    "weaponSpecialTakeThisNotes": "Цей меч було отримано за участь у випробуванні, спонсорованому кампанією Take This. Щиро вітаємо! Збільшує всі характеристики на <%= attrs %>.",
+    "weaponSpecialTridentOfCrashingTidesText": "Тризуб руйнівних приливів",
+    "weaponSpecialTridentOfCrashingTidesNotes": "Дає вам можливість керувати рибами, а також наносити кілька могутніх ударів під час ваших завдань. Збільшує інтелект на <%= int %>.",
     "weaponSpecialTaskwoodsLanternText": "",
     "weaponSpecialTaskwoodsLanternNotes": "",
     "weaponSpecialBardInstrumentText": "Лютня Барда",
diff --git a/website/common/locales/uk/questscontent.json b/website/common/locales/uk/questscontent.json
index 6123039e96..a15e9888c7 100644
--- a/website/common/locales/uk/questscontent.json
+++ b/website/common/locales/uk/questscontent.json
@@ -1,5 +1,5 @@
 {
-    "questEvilSantaText": "Санта-Звіролов",
+    "questEvilSantaText": "Санта-Мисливець",
     "questEvilSantaNotes": "Ви чуєте агонізований рев глибоко в крижаних полях. Ви слідуєте за гарчанням, перерваним гудінням, - до галявини в лісі, де ви бачите повністю дорослого білого ведмедя. Він перебуває в клітках і в кайданах, бореться за своє життя. Танцює на верхній частині клітини злісний маленький чорт, одягнений у порваний костюм. Переможіть Санта-звіролова та рятуйте звіра! <br><br> <strong> Примітка </strong>: „Санта-звіролов” нагороджує досягнення, яке можна скласти, але дає рідкісне кріплення, яке можна додати до вашої стайні лише один раз.",
     "questEvilSantaCompletion": "Санта-звіролов сердито кричить і тікає в ніч. Вдячна ведмедиця крізь рев і гарчання намагається вам щось сказати. Ви повертаєте її до стайні, де Матвей, доглядач тварин, слухає її розповідь, зітхнувши від жаху. У неї є дитинча! Воно втекло на крижані поля, коли маму-ведмедицю схопили.",
     "questEvilSantaBoss": "Санта Звіролов",
@@ -17,7 +17,7 @@
     "questGryphonDropGryphonEgg": "Яйце ґрифона",
     "questGryphonUnlockText": "Відкриває покупні яйця грифона на ринку",
     "questHedgehogText": "Тинозвір",
-    "questHedgehogNotes": "",
+    "questHedgehogNotes": "Їжаки - веселі тваринки. Вони є одними з найбільш ласкавих домашніх улюбленців, які можуть бути у габітиканців. Але подейкують, якщо погодувати їх молоком після опівночі, вони стають досить дратівливими. І в п’ятдесят разів більшими. На жаль, <strong>InspectorCaracal</strong> зробив саме це. Ой-йой.",
     "questHedgehogCompletion": "Ваш гурт успішно заспокоїв Їжачиху! Вона зменшилася до нормального розміру та пошкутильгала до своїх яєць. Вона щось пищить та викочує деякі свої яйця до Вашого гурту. Будемо сподіватися, що ці їжачки полюблять молочко!",
     "questHedgehogBoss": "Тинозвір",
     "questHedgehogDropHedgehogEgg": "Яйце їжака",
@@ -29,14 +29,14 @@
     "questGhostStagDropDeerEgg": "Яйце оленя",
     "questGhostStagUnlockText": "Розблоковує оленячі яйця для придбання на ринку",
     "questRatText": "Щурячий король",
-    "questRatNotes": "",
-    "questRatCompletion": "",
+    "questRatNotes": "Сміття! Величезні купи невиконаних щоденок лежать по всій Габітиці. Проблема стала настільки серйозною, що натовпи пацюків тепер можна побачити повсюди. Ви помітили, як @Pandah ніжно гладить одного з них. Вона пояснює, що щури — це ніжні істоти, які харчуються невиконаними щоденками. Справжня проблема полягає в тому, що щоденки впали в каналізацію, утворивши небезпечний затор, який потрібно розчистити. Коли ви спускаєтесь у каналізацію, величезний щур із криваво-червоними очима та кривими жовтими зубами нападає на вас, захищаючи свою гору сміття. Чи вистачить вам сміливості, щоб зіткнутись з легендарним Щурячим королем?",
+    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька щурячих яєць. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні тварини».",
     "questRatBoss": "Щурячий король",
     "questRatDropRatEgg": "Яйце щура",
     "questRatUnlockText": "Розблоковує щурячі яйця для придбання на ринку",
     "questOctopusText": "Поклик Октотулу",
     "questOctopusNotes": "@Urse, банькатий молодий писар, попрохав вас допомогти з оглядом таємничої печери на морському узбережжі. Серед напівтемних припливних озерцят стоїть величезна брама зі сталактитів та сталагмітів. Коли ви підходите ближче, унизу воріт починає кружляти темний вир. Ви з подивом дивитесь, як звідти вилазить спрутоподібний дракон. „Липке чадо зірок прокинулося“, — несамовито реве @Urse. „Через вігинтильйони років великий Октотулу знову вільний і спраглий до насолод!“",
-    "questOctopusCompletion": "",
+    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця восьминога», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
     "questOctopusBoss": "Октотулу",
     "questOctopusDropOctopusEgg": "Яйце спрута",
     "questOctopusUnlockText": "Відкриває покупні яйця восьминогів на ринку",
@@ -47,14 +47,14 @@
     "questHarpyDropParrotEgg": "Яйце папуги",
     "questHarpyUnlockText": "Розблоковує яйця папуг для придбання на ринку",
     "questRoosterText": "Півняче шаленство",
-    "questRoosterNotes": "",
+    "questRoosterNotes": "Протягом багатьох років фермер @extrajordanary використовував півнів як будильник. Але тепер з’явився гігантський когут, який кукурікає голосніше, ніж будь-хто раніше – і будить усіх в Габітиці! Позбавлені сну габітиканці важко справляються зі своїми повсякденними завданнями. @Pandoro вирішує, що настав час покласти цьому край. — Будь ласка, чи є хтось, хто навчить того Півника тихо кукурікати? Одного ранку ви вирушаєте добровольцем, щоб вгомонити півня, але він обертається, змахуючи гігантськими крилами й показуючи гострі пазурі, і кричить бойовий клич.",
     "questRoosterCompletion": "Силою та вправністю вам вдалося приборкати цю знавіснілу тварину. Вуха півня були забиті пір'ям та напівзабутими завданнями, але тепер вони чисті, як віночок. Він тихенько до вас сокоче, притулившись дзьобом до вашого плеча. Наступного дня ви якраз були зібралися в дорогу, аж підбігає до вас @EmeraldOx з укритим кошичком. „Стривайте! Сьогодні вранці півень припхав оце до дверей, де ви спали. Гадаю, він хоче, аби ви їх узяли.“ Ви розкриваєте кошик і бачите три охайні яєчка.",
     "questRoosterBoss": "Півень",
     "questRoosterDropRoosterEgg": "Яйце півня",
     "questRoosterUnlockText": "Розблоковує купівлю півнячих яєць на ринку",
     "questSpiderText": "Льодяний Арахнід",
     "questSpiderNotes": "Як тільки наступили холода, легенький іній почав з'являтись у хабітчанських вікнах у вигляді кружева павутинь... окрім Аркосінових, чиї вікна є повністю заморожені Морозяним Павуком, який зараз вирішує поселитись в його домі.",
-    "questSpiderCompletion": "",
+    "questSpiderCompletion": "Морозний павук падає, залишаючи за собою невелику купу інею та кілька зачарованих яєць. @Arcosine пропонує їх вам як нагороду — можливо, ви можете виростити небезпечних павуків як домашніх тварин?",
     "questSpiderBoss": "Павук",
     "questSpiderDropSpiderEgg": "Яйце павука",
     "questSpiderUnlockText": "Розблоковує купівлю павука в яйці на ринку",
@@ -97,7 +97,7 @@
     "questGoldenknight1Text": "Золотий лицар (частина 1): Сувора догана",
     "questGoldenknight1Notes": "Золотий Лицар завжди незадоволена бідними жителями Габітики. Не впоралися з усіма щоденними завданнями? Піддалися негативній звичці? Для неї це привід нагадати Вам, що Ви повинні наслідувати її. Вона – яскравий приклад ідеального габітиканця, а Ви - невдаха. Що ж, це зовсім не чемно! Усі роблять помилки, тому ви не повинні терпіти подібних обвинувачень. Напевно, настав час Вам зібрати скарги скривджених жителів країни Габітика і винести Золотому Лицареві сувору догану!",
     "questGoldenknight1CollectTestimony": "Скарги",
-    "questGoldenknight1Completion": "",
+    "questGoldenknight1Completion": "Подивіться на всі ці догани! Напевно, цього буде достатньо, щоб переконати Золотого Лицаря. Тепер все, що вам потрібно зробити, це знайти її.",
     "questGoldenknight1DropGoldenknight2Quest": "Золотий лицар (частина 2): Золотий лицар (сувій)",
     "questGoldenknight2Text": "Золотий лицар (частина 2): Золотий лицар",
     "questGoldenknight2Notes": "Озброївшись десятками скарг від габітиканців, Ви нарешті стоїте навпроти Золотого лицаря. Ви починаєте декламувати їй скарги жителів Габітики, одну за одною. «І @Pfeffernusse каже про твої постійні хвастощі…» Лицар піднімає руку, щоб змусити Вас замовкнути, і насміхається: «Будь ласка, ці люди просто заздрять моїм успіхам. Замість того, щоб скаржитися, вони повинні просто працювати так само наполегливо, як я! Можливо, мені варто показати вам силу, яку ви можете отримати завдяки працьовитості, як у мене!» Вона піднімає свій моргенштерн і готується напасти на Вас!",
@@ -114,11 +114,11 @@
     "questGroupEarnable": "Зароблені квести",
     "questBasilistText": "Спискозмій",
     "questBasilistNotes": "На ринку панує переполох — такий, що мав би змусити Вас тікати. Однак будучи сміливим шукачем пригод, Ви замість цього біжите назустріч і зустрічаєте Спискозмія, що утворений зі списків невиконаних справ! Габітиканці, що знаходяться поруч, паралізовані від страху довжиною Спискозмія. Вони не можуть почати працювати. Звідкись неподалік ви чуєте, як @Arcosine кричить: \"Швидко! Виконуйте свої завдання та щоденки, щоб знешкодити монстра, перш ніж він встигне порізати когось папером!\". Бийте швидко, шукачу пригод, і викреслюйте завдання, але будьте обережні - якщо Ви не виконаєте які-небудь щоденки, Спискозмій атакуватиме Вас і Вашу групу!",
-    "questBasilistCompletion": "",
+    "questBasilistCompletion": "Спискозмій розсипався на папірці всіх кольорів веселки. \"Вау!\" каже @Arcosine. — Добре, що ви були тут!\" Відчуваючи себе більш досвідченим, ніж раніше, ви знаходите трохи золота серед паперів.",
     "questBasilistBoss": "Спискозмій",
     "questEggHuntText": "Яйцелови",
     "questEggHuntNotes": "За ніч дивні яйця з’явилися скрізь: у стайні у Матвея, за прилавком у таверні і навіть серед яєць домашніх тварин на Ринку! Яка неприємність! \"Ніхто не знає, звідки вони з'явилися і що з них може вилупитися, - каже Меган, - але ми не можемо просто залишити їх валятися ось так! Наполегливо працюйте і шукайте, щоб допомогти мені зібрати ці таємничі яйця. Можливо, якщо Ви зберете достатньо, то щось знайдеться і для Вас...\"",
-    "questEggHuntCompletion": "",
+    "questEggHuntCompletion": "Ви зробили це! На знак подяки <strong>Меган</strong> дарує вам десять яєць. «Б’юся об заклад, що зілля вилуплення пофарбує їх у прекрасні кольори! І мені цікаво, що станеться, коли вони перетворяться на верхових тварин…»",
     "questEggHuntCollectPlainEgg": "Прості яйця",
     "questEggHuntDropPlainEgg": "Просте яйце",
     "questDilatoryText": "Жахливий Драк'он Неквапливості",
@@ -143,7 +143,7 @@
     "questAtom1Notes": "Ви добралися до берегів Чистого озера, щоб заслужено відпочити... Але озеро забруднене немитим посудом! Як таке могло трапитись? Що ж, Ви просто не дозволите, щоб озеро було у такому стані. Існує лише один вихід: помити посуд і врятувати це місце відпочинку! Варто пошукати якогось мила, щоб усе це перемити. Багато мила...",
     "questAtom1CollectSoapBars": "Брусочки мила",
     "questAtom1Drop": "Чудовисько озера Недої-Десс (сувій)",
-    "questAtom1Completion": "",
+    "questAtom1Completion": "Після ретельного миття весь посуд безпечно складений на березі! Ви стоїте осторонь і з гордістю оглядаєте свою важку роботу.",
     "questAtom2Text": "Битва з Буденністю (частина 2): Чудовисько озера Недої-Десс",
     "questAtom2Notes": "Хух, тут значно краще, коли увесь посуд чистий. Може, нарешті Ви можете трохи розважитися. Гей, по озері, здається, плаває коробка від піци. Залишилось прибрати ще її, еге ж? Однак, це не проста коробка від піци! Раптом коробка швидко підіймається і виявляється, що це голова чудовиська. Неймовірно! Легендарне чудовисько Недоїдессі?! Кажуть, начебто воно переховується в озері з прадавніх часів: істота, яка виникла із залишків їжі та сміття давніх габітиканців. Фе!",
     "questAtom2Boss": "Чудовисько Недоїдессі",
@@ -222,10 +222,10 @@
     "questKrakenCompletion": "",
     "questKrakenDropCuttlefishEgg": "Яйце каракатиці",
     "questKrakenUnlockText": "Яйця каракатиць розблоковуються для придбання на ринку",
-    "questWhaleText": "",
-    "questWhaleNotes": "",
+    "questWhaleText": "Стогін кита",
+    "questWhaleNotes": "Ви прибуваєте в Diligent Docks, сподіваючись сісти на підводний човен, щоб подивитися «Повільне дербі». Раптом оглушливий стогін змушує вас зупинитися й затулити вуха. \"Так вона голосить!\" — кричить капітан @krazjega, вказуючи на величезного кита, що ридає. «Небезпечно відправляти підводні човни, поки вона там!»<br><br>«Швидко», закликає @UncommonCriminal. «Допоможи мені заспокоїти бідолашну істоту, щоб ми могли зрозуміти, чому вона так шумить!»",
     "questWhaleBoss": "Плач Кита",
-    "questWhaleCompletion": "",
+    "questWhaleCompletion": "Після важкої праці кит нарешті припинила свій громовий рев. «Схоже, вона потонула у хвилях негативних звичок», — пояснює @zoebeagle. «Завдяки вашим послідовним зусиллям ми змогли переламати ситуацію!» Коли ви входите в підводний човен, кілька китових яєць підкочуються до вас, і ви їх підіймаєте.",
     "questWhaleDropWhaleEgg": "Яйце кита",
     "questWhaleUnlockText": "Розблоковує китові яйця для придбання на ринку",
     "questGroupDilatoryDistress": "Затяжна біда",
@@ -258,10 +258,10 @@
     "questCheetahBoss": "Гепард",
     "questCheetahDropCheetahEgg": "Яйце гепарда",
     "questCheetahUnlockText": "Відкриває яйця гепардів для придбання на ринку",
-    "questHorseText": "",
-    "questHorseNotes": "",
-    "questHorseCompletion": "",
-    "questHorseBoss": "",
+    "questHorseText": "КІНецЬ світу",
+    "questHorseNotes": "Під час відпочинку в таверні з @beffymaroo та @JessicaChase розмова перетворюється на добродушне вихваляння вашими пригодницькими досягненнями. Пишаючись своїми вчинками, і, можливо, трохи захопившись, ви хвалитеся тим, що можете приборкати будь-яке завдання. Незнайомець повертається до вас і посміхається. Одне око блищить, коли він запрошує вас довести свої слова, осідлавши його коня.\nКоли ви всі прямуєте до хліву, @UncommonCriminal шепоче: «Можливо, ви відкусили більше, ніж можете проковтнути. Це не кінь, а справжній КІН-ец-Ь!» Чуючи його тупіт копит, ви починаєте шкодувати про свої слова...",
+    "questHorseCompletion": "Від вас потрібні були всі ваші навички, але нарешті кінь тупоче своїми копитами і тикає вас носом у плече, перш ніж дозволити вам сісти верхи. Ви коротко, але гордо катаєтеся по території поблизу таверни, поки ваші друзі споглядають за вами. Незнайомець широко посміхається.\n«Я бачу, що це не було пустим вихвалянням! Ваша рішучість справді вражає. Візьміть ці яйця, щоб мати змогу виростити своїх коней, і, можливо, ми одного разу зустрінемося». Ви берете яйця, незнайомець знімає капелюх в знак пошани... і зникає.",
+    "questHorseBoss": "КІНецЬ",
     "questHorseDropHorseEgg": "Яйце коня",
     "questHorseUnlockText": "Розблоковує коні яйця для придбання на ринку",
     "questBurnoutText": "",
@@ -347,7 +347,7 @@
     "questTurtleText": "",
     "questTurtleNotes": "",
     "questTurtleCompletion": "",
-    "questTurtleBoss": "",
+    "questTurtleBoss": "Засмічене море",
     "questTurtleDropTurtleEgg": "Яйце черпахи",
     "questTurtleUnlockText": "Розблоковує купівлю черепахи в яйці на ринку",
     "questArmadilloText": "",
diff --git a/website/common/locales/zh/backgrounds.json b/website/common/locales/zh/backgrounds.json
index 751e9ab8dd..b2d57c860c 100644
--- a/website/common/locales/zh/backgrounds.json
+++ b/website/common/locales/zh/backgrounds.json
@@ -717,5 +717,12 @@
     "backgroundMessyRoomNotes": "收拾一间散乱房间。",
     "backgroundByACampfireText": "在硬货旁边",
     "backgrounds082022": "第99组：2022年8月推出",
-    "backgroundByACampfireNotes": "晒营火旁边的光。"
+    "backgroundByACampfireNotes": "晒营火旁边的光。",
+    "backgrounds092022": "第100组：2022年9月推出",
+    "backgroundTheatreStageText": "剧场舞台",
+    "backgroundTheatreStageNotes": "在剧场舞台上表演。",
+    "backgroundAutumnPicnicText": "秋季野餐",
+    "backgroundAutumnPicnicNotes": "享受秋季野餐。",
+    "backgroundOldPhotoText": "老照片",
+    "backgroundOldPhotoNotes": "在老照片里摆好姿势。"
 }
diff --git a/website/common/locales/zh/faq.json b/website/common/locales/zh/faq.json
index 0482a41ee6..d0085ede89 100644
--- a/website/common/locales/zh/faq.json
+++ b/website/common/locales/zh/faq.json
@@ -54,5 +54,6 @@
     "webFaqAnswer12": "世界Boss是出现在酒馆的特殊怪物。所有活跃的玩家都会自动参战，玩家们的完成的任务和技能都会对Boss造成伤害。你可以同时像平时那样开副本。你完成的任务和放的技能会同时被算入世界Boss以及你队伍副本的进度当中。世界Boss并不会对你或者你的号造成伤害。它会有一个怒气值，随着用户没完成的日常任务数量而增加。如果怒气槽满了，它会攻击一个本站的NPC并使这个NPC的形象发生变化。你可以前往维基了解更多关于[过去的世界Boss](https://habitica.fandom.com/zh/wiki/世界Boss)的信息。",
     "iosFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
     "androidFaqStillNeedHelp": "如果[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在酒馆聊天中咨询。进入方式：菜单 > 酒馆！我们很乐意为你提供帮助。",
-    "webFaqStillNeedHelp": "如果问题列表和[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在[Habitica 帮助公会](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)中咨询。我们很乐意为你提供帮助。"
+    "webFaqStillNeedHelp": "如果问题列表和[Wiki FAQ](https://habitica.fandom.com/zh/wiki/FAQ)不能解决你的问题，请在[Habitica 帮助公会](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)中咨询。我们很乐意为你提供帮助。",
+    "faqQuestion13": "什么是团体计划？"
 }
diff --git a/website/common/locales/zh/gear.json b/website/common/locales/zh/gear.json
index fa43fa4040..6db98d4f82 100644
--- a/website/common/locales/zh/gear.json
+++ b/website/common/locales/zh/gear.json
@@ -2690,5 +2690,13 @@
     "eyewearMystery202208Text": "闪亮眼睛",
     "headMystery202208Text": "活泼马尾",
     "headMystery202208Notes": "享受炫耀这丰盈蓬松的头发 — 迫不得已的时候也可以是一根鞭子！没有属性加成。2022年8月订阅者物品。",
-    "eyewearMystery202208Notes": "用这双可爱到令人发指的眼睛让你的敌人产生一种虚假的安全感。没有属性加成。2022年8月订阅者物品。"
+    "eyewearMystery202208Notes": "用这双可爱到令人发指的眼睛让你的敌人产生一种虚假的安全感。没有属性加成。2022年8月订阅者物品。",
+    "weaponMystery202209Text": "魔法手册",
+    "weaponMystery202209Notes": "这本书将会指导你完成魔术的制作。没有属性加成。2022年9月订阅者物品。",
+    "shieldMystery202209Notes": "你必须大量的阅读书籍才能完成魔法的学习，但这个你会享受这个过程。没有属性加成。2022年9月订阅者物品。",
+    "eyewearArmoireComedyMaskNotes": "哦呼！这是一个为快乐心灵制作的古朴面具，让我们在舞台上表演，玩乐，表现出快乐和欢笑吧！增加<%= con %>点体质。魔法衣橱：剧院面具套装（1/2）。",
+    "eyewearArmoireTragedyMaskText": "悲剧面具",
+    "eyewearArmoireTragedyMaskNotes": "呜啊！为可怜的表演者戴上沉重的面具，在舞台上昂首阔步，痛苦，悲伤，表达出所有的难过吧。增加<%= int %>点智力。魔法衣橱：剧院面具套装（2/2）。",
+    "shieldMystery202209Text": "山脉魔法书",
+    "eyewearArmoireComedyMaskText": "喜剧面具"
 }
diff --git a/website/common/locales/zh/npc.json b/website/common/locales/zh/npc.json
index 1351abd14c..aa248fc071 100644
--- a/website/common/locales/zh/npc.json
+++ b/website/common/locales/zh/npc.json
@@ -18,8 +18,8 @@
     "welcomeToTavern": "欢迎来到酒馆！",
     "sleepDescription": "需要休息吗？来逛逛Daniel的客栈，当你遇到困难时，能暂停Habitica的游戏机制：",
     "sleepBullet1": "错过每日任务不会对你造成伤害",
-    "sleepBullet2": "任务不会失去连击数",
-    "sleepBullet3": "Boss不会因你错过每日任务而造成伤害",
+    "sleepBullet2": "您的任务连胜和习惯计数器不会重置",
+    "sleepBullet3": "在您退出客栈之前，您对副本boss的伤害和找到的手机项目将会一直保持等待状态",
     "sleepBullet4": "结算前这里会预测你对boss造成的伤害以及收集到的物品数量",
     "pauseDailies": "暂停伤害",
     "unpauseDailies": "解除暂停",
diff --git a/website/common/script/constants.js b/website/common/script/constants.js
index f2eb56a4c0..4e34c0ab0f 100644
--- a/website/common/script/constants.js
+++ b/website/common/script/constants.js
@@ -21,7 +21,6 @@ export const CHAT_FLAG_FROM_SHADOW_MUTE = 10;
 // @TODO use those constants to replace hard-coded numbers
 
 export const SUPPORTED_SOCIAL_NETWORKS = [
-  { key: 'facebook', name: 'Facebook' },
   { key: 'google', name: 'Google' },
   { key: 'apple', name: 'Apple' },
 ];
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 42357c24d6..6f9e97ac26 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -52,8 +52,9 @@ const bundles = {
       'horse',
       'sheep',
     ],
+    event: EVENTS.bundle202209,
     canBuy () {
-      return moment().isBetween('2019-08-08', '2019-09-02');
+      return moment().isBetween(EVENTS.bundle202209.start, EVENTS.bundle202209.end);
     },
     type: 'quests',
     value: 7,
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index b1dfaeff63..49cb72cac6 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -15,6 +15,12 @@ export const EVENTS = {
     season: 'normal',
     npcImageSuffix: '',
   },
+  bundle202209: {
+    start: '2022-09-13T08:00-04:00',
+    end: '2022-09-30T20:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   potions202208: {
     start: '2022-08-16T08:00-04:00',
     end: '2022-08-31T20:00-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index b6e4e0705d..f79f352b6e 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -32,11 +32,11 @@ const featuredItems = {
       },
       {
         type: 'food',
-        path: 'food.RottenMeat',
+        path: 'food.Potatoe',
       },
       {
         type: 'hatchingPotions',
-        path: 'hatchingPotions.Zombie',
+        path: 'hatchingPotions.Desert',
       },
       {
         type: 'eggs',
@@ -45,26 +45,26 @@ const featuredItems = {
     ];
   },
   quests () {
-    if (moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202208.end)) {
+    if (moment().isBetween(EVENTS.bundle202208.start, EVENTS.bundle202209.end)) {
       return [
         {
           type: 'bundles',
           path: 'bundles.forestFriends',
         },
         {
-          type: 'quests',
-          path: 'quests.owl',
+          type: 'bundles',
+          path: 'bundles.farmFriends',
         },
         {
           type: 'quests',
-          path: 'quests.snail',
+          path: 'quests.ferret',
         },
       ];
     }
     return [
       {
         type: 'quests',
-        path: 'quests.badger',
+        path: 'quests.guineapig',
       },
       {
         type: 'quests',
diff --git a/website/server/libs/auth/index.js b/website/server/libs/auth/index.js
index 30a5e70b15..bd5248c3f7 100644
--- a/website/server/libs/auth/index.js
+++ b/website/server/libs/auth/index.js
@@ -161,13 +161,16 @@ async function registerLocal (req, res, { isV3 = false }) {
   };
 
   if (existingUser) {
-    const hasSocialAuth = common.constants.SUPPORTED_SOCIAL_NETWORKS.find(network => {
+    const networks = common.constants.SUPPORTED_SOCIAL_NETWORKS;
+    // need to insert FB here to allow users who only have FB auth to connect local auth.
+    networks.push({ key: 'facebook', name: 'Facebook' });
+    const hasSocialAuth = networks.find(network => {
       if (existingUser.auth.hasOwnProperty(network.key)) { // eslint-disable-line no-prototype-builtins, max-len
         return existingUser.auth[network.key].id;
       }
       return false;
     });
-    if (!hasSocialAuth) throw new NotAuthorized(res.t('onlySocialAttachLocal'));
+    if (!hasSocialAuth && existingUser.auth.local.hashed_password) throw new NotAuthorized(res.t('onlySocialAttachLocal'));
     existingUser.auth.local = newUser.auth.local;
     newUser = existingUser;
   } else {
diff --git a/website/server/libs/auth/social.js b/website/server/libs/auth/social.js
index ec018f4893..36a0d8301d 100644
--- a/website/server/libs/auth/social.js
+++ b/website/server/libs/auth/social.js
@@ -60,11 +60,6 @@ export async function loginSocial (req, res) { // eslint-disable-line import/pre
     [`auth.${network}.id`]: profile.id,
   }, { _id: 1, apiToken: 1, auth: 1 }).exec();
 
-  let email;
-  if (profile.emails && profile.emails[0] && profile.emails[0].value) {
-    email = profile.emails[0].value.toLowerCase();
-  }
-
   // User already signed up
   if (user) {
     if (existingUser) {
@@ -79,6 +74,11 @@ export async function loginSocial (req, res) { // eslint-disable-line import/pre
     return loginRes(user, req, res);
   }
 
+  let email;
+  if (profile.emails && profile.emails[0] && profile.emails[0].value) {
+    email = profile.emails[0].value.toLowerCase();
+  }
+
   if (!existingUser && email) {
     existingUser = await User.findOne({ 'auth.local.email': email }).exec();
   }
diff --git a/website/server/libs/setupPassport.js b/website/server/libs/setupPassport.js
index 6520d07df8..69a776625f 100644
--- a/website/server/libs/setupPassport.js
+++ b/website/server/libs/setupPassport.js
@@ -1,6 +1,5 @@
 import passport from 'passport';
 import nconf from 'nconf';
-import { Strategy as FacebookStrategy } from 'passport-facebook';
 import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
 
 // Passport session setup.
@@ -13,20 +12,6 @@ import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
 passport.serializeUser((user, done) => done(null, user));
 passport.deserializeUser((obj, done) => done(null, obj));
 
-// TODO remove?
-// This auth strategy is no longer used.
-// It's just kept around for auth.js#loginFacebook() (passport._strategies.facebook.userProfile)
-// The proper fix would be to move to a general OAuth module simply to verify accessTokens
-passport.use(new FacebookStrategy({
-  clientID: nconf.get('FACEBOOK_KEY'),
-  clientSecret: nconf.get('FACEBOOK_SECRET'),
-  profileFields: ['id', 'email', 'displayName'],
-  profileURL: 'https://graph.facebook.com/v2.8/me',
-  authorizationURL: 'https://www.facebook.com/v2.8/dialog/oauth',
-  tokenURL: 'https://graph.facebook.com/v2.8/oauth/access_token',
-  // callbackURL: nconf.get("BASE_URL") + "/auth/facebook/callback"
-}, (accessToken, refreshToken, profile, done) => done(null, profile)));
-
 passport.use(new GoogleStrategy({
   clientID: nconf.get('GOOGLE_CLIENT_ID'),
   clientSecret: nconf.get('GOOGLE_CLIENT_SECRET'),

From 13eef6e4cf78ff3fc2d42f7fc905736ac2793751 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 19 Sep 2022 15:10:11 -0400
Subject: [PATCH 32/36] chore: merge develop

---
 package-lock.json                | 1091 +++++++++++++++++++++---------
 package.json                     |    6 +-
 website/client/package-lock.json |   75 +-
 website/client/package.json      |   10 +-
 4 files changed, 838 insertions(+), 344 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54b6165b1d..a8df13057e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -205,14 +205,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -240,32 +240,101 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz",
-      "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-member-expression-to-functions": "^7.18.9",
         "@babel/helper-optimise-call-expression": "^7.18.6",
         "@babel/helper-replace-supers": "^7.18.9",
         "@babel/helper-split-export-declaration": "^7.18.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/types": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
-      "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "regexpu-core": "^5.1.0"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
-      "integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "requires": {
         "@babel/helper-compilation-targets": "^7.17.7",
         "@babel/helper-plugin-utils": "^7.16.7",
@@ -338,14 +407,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -403,9 +472,9 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
-      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.18.9",
@@ -419,14 +488,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -436,31 +505,120 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz",
-      "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-member-expression-to-functions": "^7.18.9",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
+        "@babel/code-frame": {
           "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+          "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+          "requires": {
+            "@babel/types": "^7.19.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+          "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.0",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.1",
+            "@babel/types": "^7.19.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
             "to-fast-properties": "^2.0.0"
           }
+        },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         }
       }
     },
@@ -481,14 +639,14 @@
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
@@ -521,14 +679,14 @@
       "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.18.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz",
-      "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
       "requires": {
-        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.18.11",
-        "@babel/types": "^7.18.10"
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -539,10 +697,29 @@
             "@babel/highlight": "^7.18.6"
           }
         },
+        "@babel/generator": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+          "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+          "requires": {
+            "@babel/types": "^7.19.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/highlight": {
           "version": "7.18.6",
@@ -555,9 +732,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.18.11",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
-          "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
         },
         "@babel/template": {
           "version": "7.18.10",
@@ -569,16 +746,43 @@
             "@babel/types": "^7.18.10"
           }
         },
+        "@babel/traverse": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+          "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.0",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.1",
+            "@babel/types": "^7.19.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
             "to-fast-properties": "^2.0.0"
           }
         },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -664,12 +868,12 @@
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
-      "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
+      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-remap-async-to-generator": "^7.18.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
@@ -962,18 +1166,134 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz",
-      "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-replace-supers": "^7.18.9",
         "@babel/helper-split-export-declaration": "^7.18.6",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/compat-data": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
+          "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="
+        },
+        "@babel/helper-compilation-targets": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
+          "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
+          "requires": {
+            "@babel/compat-data": "^7.19.1",
+            "@babel/helper-validator-option": "^7.18.6",
+            "browserslist": "^4.21.3",
+            "semver": "^6.3.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/types": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "browserslist": {
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
+            "node-releases": "^2.0.6",
+            "update-browserslist-db": "^1.0.9"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001405",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001405.tgz",
+          "integrity": "sha512-lbm+F6HaYFGfjejrTlgB6IZQSZjpA1qcrjGsuvecatP93emI66a41hmQJIW+KNMhcuusgQW0R0E9qvP+Hq7eLg=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "update-browserslist-db": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+          "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+          "requires": {
+            "escalade": "^3.1.1",
+            "picocolors": "^1.0.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -985,9 +1305,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz",
-      "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==",
+      "version": "7.18.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
+      "integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.18.9"
       }
@@ -1074,21 +1394,135 @@
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz",
-      "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
+      "integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
       "requires": {
         "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-validator-identifier": "^7.18.6",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
+        "@babel/code-frame": {
           "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "requires": {
+            "@babel/highlight": "^7.18.6"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+          "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+          "requires": {
+            "@babel/types": "^7.19.0",
+            "@jridgewell/gen-mapping": "^0.3.2",
+            "jsesc": "^2.5.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+          "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+          "requires": {
+            "@babel/template": "^7.18.10",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+          "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-module-imports": "^7.18.6",
+            "@babel/helper-simple-access": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "@babel/template": "^7.18.10",
+            "@babel/traverse": "^7.19.0",
+            "@babel/types": "^7.19.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/highlight": {
+          "version": "7.18.6",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+          "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+          "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
+        },
+        "@babel/template": {
+          "version": "7.18.10",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+          "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/parser": "^7.18.10",
+            "@babel/types": "^7.18.10"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+          "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+          "requires": {
+            "@babel/code-frame": "^7.18.6",
+            "@babel/generator": "^7.19.0",
+            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/helper-function-name": "^7.19.0",
+            "@babel/helper-hoist-variables": "^7.18.6",
+            "@babel/helper-split-export-declaration": "^7.18.6",
+            "@babel/parser": "^7.19.1",
+            "@babel/types": "^7.19.0",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0"
+          }
+        },
+        "@babel/types": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.18.10",
+            "@babel/helper-validator-identifier": "^7.18.6",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
         }
       }
     },
@@ -1102,12 +1536,12 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
-      "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -1169,11 +1603,11 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz",
-      "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
       }
     },
@@ -1219,17 +1653,17 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
-      "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
+      "integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
       "requires": {
-        "@babel/compat-data": "^7.18.8",
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/compat-data": "^7.19.1",
+        "@babel/helper-compilation-targets": "^7.19.1",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/helper-validator-option": "^7.18.6",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
         "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
         "@babel/plugin-proposal-class-static-block": "^7.18.6",
         "@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -1263,9 +1697,9 @@
         "@babel/plugin-transform-async-to-generator": "^7.18.6",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
         "@babel/plugin-transform-block-scoping": "^7.18.9",
-        "@babel/plugin-transform-classes": "^7.18.9",
+        "@babel/plugin-transform-classes": "^7.19.0",
         "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.18.13",
         "@babel/plugin-transform-dotall-regex": "^7.18.6",
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
@@ -1275,9 +1709,9 @@
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
         "@babel/plugin-transform-modules-amd": "^7.18.6",
         "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
         "@babel/plugin-transform-new-target": "^7.18.6",
         "@babel/plugin-transform-object-super": "^7.18.6",
         "@babel/plugin-transform-parameters": "^7.18.8",
@@ -1285,40 +1719,81 @@
         "@babel/plugin-transform-regenerator": "^7.18.6",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
         "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.18.9",
+        "@babel/plugin-transform-spread": "^7.19.0",
         "@babel/plugin-transform-sticky-regex": "^7.18.6",
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
         "@babel/plugin-transform-unicode-escapes": "^7.18.10",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.18.10",
-        "babel-plugin-polyfill-corejs2": "^0.3.2",
-        "babel-plugin-polyfill-corejs3": "^0.5.3",
-        "babel-plugin-polyfill-regenerator": "^0.4.0",
-        "core-js-compat": "^3.22.1",
+        "@babel/types": "^7.19.0",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
         "semver": "^6.3.0"
       },
       "dependencies": {
+        "@babel/compat-data": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
+          "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="
+        },
+        "@babel/helper-compilation-targets": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
+          "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
+          "requires": {
+            "@babel/compat-data": "^7.19.1",
+            "@babel/helper-validator-option": "^7.18.6",
+            "browserslist": "^4.21.3",
+            "semver": "^6.3.0"
+          }
+        },
         "@babel/helper-validator-identifier": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-          "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.18.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
-          "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+          "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
           "requires": {
             "@babel/helper-string-parser": "^7.18.10",
             "@babel/helper-validator-identifier": "^7.18.6",
             "to-fast-properties": "^2.0.0"
           }
         },
+        "browserslist": {
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
+            "node-releases": "^2.0.6",
+            "update-browserslist-db": "^1.0.9"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001405",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001405.tgz",
+          "integrity": "sha512-lbm+F6HaYFGfjejrTlgB6IZQSZjpA1qcrjGsuvecatP93emI66a41hmQJIW+KNMhcuusgQW0R0E9qvP+Hq7eLg=="
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "update-browserslist-db": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+          "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+          "requires": {
+            "escalade": "^3.1.1",
+            "picocolors": "^1.0.0"
+          }
         }
       }
     },
@@ -1347,9 +1822,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
-      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
+      "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -1502,6 +1977,12 @@
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
     },
+    "@esbuild/linux-loong64": {
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz",
+      "integrity": "sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw==",
+      "optional": true
+    },
     "@google-cloud/common": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.8.1.tgz",
@@ -1880,9 +2361,9 @@
       }
     },
     "@types/eslint": {
-      "version": "8.4.5",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
-      "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+      "version": "8.4.6",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
+      "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -2377,9 +2858,9 @@
       }
     },
     "apidoc": {
-      "version": "0.52.0",
-      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.52.0.tgz",
-      "integrity": "sha512-k0gaMI7LWxaqKt2D+twC6XpI8X5SHkJalfo8TmF72d2TSNABquqB8LyIrVYzLcadcHuLMRFDaDibOK271gD67w==",
+      "version": "0.53.0",
+      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.53.0.tgz",
+      "integrity": "sha512-H4hYToCrI6TgSksdVHxS7h5/Xoqr/rR9m9/IOQaYqXbX07cPVbg0O3RM4+bR4tJKG1aqBWKKm+xojQ8+4i7O5A==",
       "requires": {
         "bootstrap": "3.4.1",
         "commander": "^8.3.0",
@@ -3008,12 +3489,12 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
-      "integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
       "requires": {
         "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.2",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
         "semver": "^6.1.1"
       },
       "dependencies": {
@@ -3025,20 +3506,20 @@
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
-      "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.2",
-        "core-js-compat": "^3.21.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
-      "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.2"
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
       }
     },
     "babel-runtime": {
@@ -4738,39 +5219,33 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.24.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz",
-      "integrity": "sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==",
+      "version": "3.25.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
+      "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
       "requires": {
-        "browserslist": "^4.21.3",
-        "semver": "7.0.0"
+        "browserslist": "^4.21.4"
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.21.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
-          "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+          "version": "4.21.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
           "requires": {
-            "caniuse-lite": "^1.0.30001370",
-            "electron-to-chromium": "^1.4.202",
+            "caniuse-lite": "^1.0.30001400",
+            "electron-to-chromium": "^1.4.251",
             "node-releases": "^2.0.6",
-            "update-browserslist-db": "^1.0.5"
+            "update-browserslist-db": "^1.0.9"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001376",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001376.tgz",
-          "integrity": "sha512-I27WhtOQ3X3v3it9gNs/oTpoE5KpwmqKR5oKPA8M0G7uMXh9Ty81Q904HpKUrM30ei7zfcL5jE7AXefgbOfMig=="
-        },
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
+          "version": "1.0.30001405",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001405.tgz",
+          "integrity": "sha512-lbm+F6HaYFGfjejrTlgB6IZQSZjpA1qcrjGsuvecatP93emI66a41hmQJIW+KNMhcuusgQW0R0E9qvP+Hq7eLg=="
         },
         "update-browserslist-db": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
-          "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+          "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
           "requires": {
             "escalade": "^3.1.1",
             "picocolors": "^1.0.0"
@@ -5534,9 +6009,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.4.219",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.219.tgz",
-      "integrity": "sha512-zoQJsXOUw0ZA0YxbjkmzBumAJRtr6je5JySuL/bAoFs0DuLiLJ+5FzRF7/ZayihxR2QcewlRZVm5QZdUhwjOgA=="
+      "version": "1.4.254",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz",
+      "integrity": "sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="
     },
     "emitter-listener": {
       "version": "1.1.2",
@@ -5687,122 +6162,123 @@
       }
     },
     "esbuild": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.49.tgz",
-      "integrity": "sha512-/TlVHhOaq7Yz8N1OJrjqM3Auzo5wjvHFLk+T8pIue+fhnhIMpfAzsG6PLVMbFveVxqD2WOp3QHei+52IMUNmCw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.7.tgz",
+      "integrity": "sha512-7V8tzllIbAQV1M4QoE52ImKu8hT/NLGlGXkiDsbEU5PS6K8Mn09ZnYoS+dcmHxOS9CRsV4IRAMdT3I67IyUNXw==",
       "requires": {
-        "esbuild-android-64": "0.14.49",
-        "esbuild-android-arm64": "0.14.49",
-        "esbuild-darwin-64": "0.14.49",
-        "esbuild-darwin-arm64": "0.14.49",
-        "esbuild-freebsd-64": "0.14.49",
-        "esbuild-freebsd-arm64": "0.14.49",
-        "esbuild-linux-32": "0.14.49",
-        "esbuild-linux-64": "0.14.49",
-        "esbuild-linux-arm": "0.14.49",
-        "esbuild-linux-arm64": "0.14.49",
-        "esbuild-linux-mips64le": "0.14.49",
-        "esbuild-linux-ppc64le": "0.14.49",
-        "esbuild-linux-riscv64": "0.14.49",
-        "esbuild-linux-s390x": "0.14.49",
-        "esbuild-netbsd-64": "0.14.49",
-        "esbuild-openbsd-64": "0.14.49",
-        "esbuild-sunos-64": "0.14.49",
-        "esbuild-windows-32": "0.14.49",
-        "esbuild-windows-64": "0.14.49",
-        "esbuild-windows-arm64": "0.14.49"
+        "@esbuild/linux-loong64": "0.15.7",
+        "esbuild-android-64": "0.15.7",
+        "esbuild-android-arm64": "0.15.7",
+        "esbuild-darwin-64": "0.15.7",
+        "esbuild-darwin-arm64": "0.15.7",
+        "esbuild-freebsd-64": "0.15.7",
+        "esbuild-freebsd-arm64": "0.15.7",
+        "esbuild-linux-32": "0.15.7",
+        "esbuild-linux-64": "0.15.7",
+        "esbuild-linux-arm": "0.15.7",
+        "esbuild-linux-arm64": "0.15.7",
+        "esbuild-linux-mips64le": "0.15.7",
+        "esbuild-linux-ppc64le": "0.15.7",
+        "esbuild-linux-riscv64": "0.15.7",
+        "esbuild-linux-s390x": "0.15.7",
+        "esbuild-netbsd-64": "0.15.7",
+        "esbuild-openbsd-64": "0.15.7",
+        "esbuild-sunos-64": "0.15.7",
+        "esbuild-windows-32": "0.15.7",
+        "esbuild-windows-64": "0.15.7",
+        "esbuild-windows-arm64": "0.15.7"
       }
     },
     "esbuild-android-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.49.tgz",
-      "integrity": "sha512-vYsdOTD+yi+kquhBiFWl3tyxnj2qZJsl4tAqwhT90ktUdnyTizgle7TjNx6Ar1bN7wcwWqZ9QInfdk2WVagSww==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.7.tgz",
+      "integrity": "sha512-p7rCvdsldhxQr3YHxptf1Jcd86dlhvc3EQmQJaZzzuAxefO9PvcI0GLOa5nCWem1AJ8iMRu9w0r5TG8pHmbi9w==",
       "optional": true
     },
     "esbuild-android-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.49.tgz",
-      "integrity": "sha512-g2HGr/hjOXCgSsvQZ1nK4nW/ei8JUx04Li74qub9qWrStlysaVmadRyTVuW32FGIpLQyc5sUjjZopj49eGGM2g==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.7.tgz",
+      "integrity": "sha512-L775l9ynJT7rVqRM5vo+9w5g2ysbOCfsdLV4CWanTZ1k/9Jb3IYlQ06VCI1edhcosTYJRECQFJa3eAvkx72eyQ==",
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.49.tgz",
-      "integrity": "sha512-3rvqnBCtX9ywso5fCHixt2GBCUsogNp9DjGmvbBohh31Ces34BVzFltMSxJpacNki96+WIcX5s/vum+ckXiLYg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.7.tgz",
+      "integrity": "sha512-KGPt3r1c9ww009t2xLB6Vk0YyNOXh7hbjZ3EecHoVDxgtbUlYstMPDaReimKe6eOEfyY4hBEEeTvKwPsiH5WZg==",
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.49.tgz",
-      "integrity": "sha512-XMaqDxO846srnGlUSJnwbijV29MTKUATmOLyQSfswbK/2X5Uv28M9tTLUJcKKxzoo9lnkYPsx2o8EJcTYwCs/A==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.7.tgz",
+      "integrity": "sha512-kBIHvtVqbSGajN88lYMnR3aIleH3ABZLLFLxwL2stiuIGAjGlQW741NxVTpUHQXUmPzxi6POqc9npkXa8AcSZQ==",
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.49.tgz",
-      "integrity": "sha512-NJ5Q6AjV879mOHFri+5lZLTp5XsO2hQ+KSJYLbfY9DgCu8s6/Zl2prWXVANYTeCDLlrIlNNYw8y34xqyLDKOmQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.7.tgz",
+      "integrity": "sha512-hESZB91qDLV5MEwNxzMxPfbjAhOmtfsr9Wnuci7pY6TtEh4UDuevmGmkUIjX/b+e/k4tcNBMf7SRQ2mdNuK/HQ==",
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.49.tgz",
-      "integrity": "sha512-lFLtgXnAc3eXYqj5koPlBZvEbBSOSUbWO3gyY/0+4lBdRqELyz4bAuamHvmvHW5swJYL7kngzIZw6kdu25KGOA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.7.tgz",
+      "integrity": "sha512-dLFR0ChH5t+b3J8w0fVKGvtwSLWCv7GYT2Y2jFGulF1L5HftQLzVGN+6pi1SivuiVSmTh28FwUhi9PwQicXI6Q==",
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.49.tgz",
-      "integrity": "sha512-zTTH4gr2Kb8u4QcOpTDVn7Z8q7QEIvFl/+vHrI3cF6XOJS7iEI1FWslTo3uofB2+mn6sIJEQD9PrNZKoAAMDiA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.7.tgz",
+      "integrity": "sha512-v3gT/LsONGUZcjbt2swrMjwxo32NJzk+7sAgtxhGx1+ZmOFaTRXBAi1PPfgpeo/J//Un2jIKm/I+qqeo4caJvg==",
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.49.tgz",
-      "integrity": "sha512-hYmzRIDzFfLrB5c1SknkxzM8LdEUOusp6M2TnuQZJLRtxTgyPnZZVtyMeCLki0wKgYPXkFsAVhi8vzo2mBNeTg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.7.tgz",
+      "integrity": "sha512-LxXEfLAKwOVmm1yecpMmWERBshl+Kv5YJ/1KnyAr6HRHFW8cxOEsEfisD3sVl/RvHyW//lhYUVSuy9jGEfIRAQ==",
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.49.tgz",
-      "integrity": "sha512-iE3e+ZVv1Qz1Sy0gifIsarJMQ89Rpm9mtLSRtG3AH0FPgAzQ5Z5oU6vYzhc/3gSPi2UxdCOfRhw2onXuFw/0lg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.7.tgz",
+      "integrity": "sha512-JKgAHtMR5f75wJTeuNQbyznZZa+pjiUHV7sRZp42UNdyXC6TiUYMW/8z8yIBAr2Fpad8hM1royZKQisqPABPvQ==",
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.49.tgz",
-      "integrity": "sha512-KLQ+WpeuY+7bxukxLz5VgkAAVQxUv67Ft4DmHIPIW+2w3ObBPQhqNoeQUHxopoW/aiOn3m99NSmSV+bs4BSsdA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.7.tgz",
+      "integrity": "sha512-P3cfhudpzWDkglutWgXcT2S7Ft7o2e3YDMrP1n0z2dlbUZghUkKCyaWw0zhp4KxEEzt/E7lmrtRu/pGWnwb9vw==",
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.49.tgz",
-      "integrity": "sha512-n+rGODfm8RSum5pFIqFQVQpYBw+AztL8s6o9kfx7tjfK0yIGF6tm5HlG6aRjodiiKkH2xAiIM+U4xtQVZYU4rA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.7.tgz",
+      "integrity": "sha512-T7XKuxl0VpeFLCJXub6U+iybiqh0kM/bWOTb4qcPyDDwNVhLUiPcGdG2/0S7F93czUZOKP57YiLV8YQewgLHKw==",
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.49.tgz",
-      "integrity": "sha512-WP9zR4HX6iCBmMFH+XHHng2LmdoIeUmBpL4aL2TR8ruzXyT4dWrJ5BSbT8iNo6THN8lod6GOmYDLq/dgZLalGw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.7.tgz",
+      "integrity": "sha512-6mGuC19WpFN7NYbecMIJjeQgvDb5aMuvyk0PDYBJrqAEMkTwg3Z98kEKuCm6THHRnrgsdr7bp4SruSAxEM4eJw==",
       "optional": true
     },
     "esbuild-linux-riscv64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.49.tgz",
-      "integrity": "sha512-h66ORBz+Dg+1KgLvzTVQEA1LX4XBd1SK0Fgbhhw4akpG/YkN8pS6OzYI/7SGENiN6ao5hETRDSkVcvU9NRtkMQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.7.tgz",
+      "integrity": "sha512-uUJsezbswAYo/X7OU/P+PuL/EI9WzxsEQXDekfwpQ23uGiooxqoLFAPmXPcRAt941vjlY9jtITEEikWMBr+F/g==",
       "optional": true
     },
     "esbuild-linux-s390x": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.49.tgz",
-      "integrity": "sha512-DhrUoFVWD+XmKO1y7e4kNCqQHPs6twz6VV6Uezl/XHYGzM60rBewBF5jlZjG0nCk5W/Xy6y1xWeopkrhFFM0sQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.7.tgz",
+      "integrity": "sha512-+tO+xOyTNMc34rXlSxK7aCwJgvQyffqEM5MMdNDEeMU3ss0S6wKvbBOQfgd5jRPblfwJ6b+bKiz0g5nABpY0QQ==",
       "optional": true
     },
     "esbuild-loader": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.19.0.tgz",
-      "integrity": "sha512-urGNVE6Tl2rqx92ElKi/LiExXjGvcH6HfDBFzJ9Ppwqh4n6Jmx8x7RKAyMzSM78b6CAaJLhDncG5sPrL0ROh5Q==",
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
+      "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
       "requires": {
-        "esbuild": "^0.14.39",
+        "esbuild": "^0.15.6",
         "joycon": "^3.0.1",
         "json5": "^2.2.0",
         "loader-utils": "^2.0.0",
@@ -5811,39 +6287,39 @@
       }
     },
     "esbuild-netbsd-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.49.tgz",
-      "integrity": "sha512-BXaUwFOfCy2T+hABtiPUIpWjAeWK9P8O41gR4Pg73hpzoygVGnj0nI3YK4SJhe52ELgtdgWP/ckIkbn2XaTxjQ==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.7.tgz",
+      "integrity": "sha512-yVc4Wz+Pu3cP5hzm5kIygNPrjar/v5WCSoRmIjCPWfBVJkZNb5brEGKUlf+0Y759D48BCWa0WHrWXaNy0DULTQ==",
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.49.tgz",
-      "integrity": "sha512-lP06UQeLDGmVPw9Rg437Btu6J9/BmyhdoefnQ4gDEJTtJvKtQaUcOQrhjTq455ouZN4EHFH1h28WOJVANK41kA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.7.tgz",
+      "integrity": "sha512-GsimbwC4FSR4lN3wf8XmTQ+r8/0YSQo21rWDL0XFFhLHKlzEA4SsT1Tl8bPYu00IU6UWSJ+b3fG/8SB69rcuEQ==",
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.49.tgz",
-      "integrity": "sha512-4c8Zowp+V3zIWje329BeLbGh6XI9c/rqARNaj5yPHdC61pHI9UNdDxT3rePPJeWcEZVKjkiAS6AP6kiITp7FSw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.7.tgz",
+      "integrity": "sha512-8CDI1aL/ts0mDGbWzjEOGKXnU7p3rDzggHSBtVryQzkSOsjCHRVe0iFYUuhczlxU1R3LN/E7HgUO4NXzGGP/Ag==",
       "optional": true
     },
     "esbuild-windows-32": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.49.tgz",
-      "integrity": "sha512-q7Rb+J9yHTeKr9QTPDYkqfkEj8/kcKz9lOabDuvEXpXuIcosWCJgo5Z7h/L4r7rbtTH4a8U2FGKb6s1eeOHmJA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.7.tgz",
+      "integrity": "sha512-cOnKXUEPS8EGCzRSFa1x6NQjGhGsFlVgjhqGEbLTPsA7x4RRYiy2RKoArNUU4iR2vHmzqS5Gr84MEumO/wxYKA==",
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.49.tgz",
-      "integrity": "sha512-+Cme7Ongv0UIUTniPqfTX6mJ8Deo7VXw9xN0yJEN1lQMHDppTNmKwAM3oGbD/Vqff+07K2gN0WfNkMohmG+dVw==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.7.tgz",
+      "integrity": "sha512-7MI08Ec2sTIDv+zH6StNBKO+2hGUYIT42GmFyW6MBBWWtJhTcQLinKS6ldIN1d52MXIbiJ6nXyCJ+LpL4jBm3Q==",
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.14.49",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.49.tgz",
-      "integrity": "sha512-v+HYNAXzuANrCbbLFJ5nmO3m5y2PGZWLe3uloAkLt87aXiO2mZr3BTmacZdjwNkNEHuH3bNtN8cak+mzVjVPfA==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.7.tgz",
+      "integrity": "sha512-R06nmqBlWjKHddhRJYlqDd3Fabx9LFdKcjoOy08YLimwmsswlFBJV4rXzZCxz/b7ZJXvrZgj8DDv1ewE9+StMw==",
       "optional": true
     },
     "escalade": {
@@ -6798,9 +7274,9 @@
       "optional": 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=="
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="
     },
     "fastq": {
       "version": "1.8.0",
@@ -9420,9 +9896,9 @@
       }
     },
     "jose": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz",
-      "integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-2.0.6.tgz",
+      "integrity": "sha512-FVoPY7SflDodE4lknJmbAHSUjLCzE2H1F6MS0RYKMQ8SR+lNccpMf8R4eqkNYyyUjR5qZReOzZo5C5YiHOCjjg==",
       "requires": {
         "@panva/asn1.js": "^1.0.0"
       }
@@ -9438,9 +9914,9 @@
       "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
     },
     "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
     },
     "js-tokens": {
       "version": "4.0.0",
@@ -12127,9 +12603,9 @@
       }
     },
     "prismjs": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.28.0.tgz",
-      "integrity": "sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw=="
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
+      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -12309,9 +12785,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "rate-limiter-flexible": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.7.tgz",
-      "integrity": "sha512-dmc+J/IffVBvHlqq5/XClsdLdkOdQV/tjrz00cwneHUbEDYVrf4aUDAyR4Jybcf2+Vpn4NwoVrnnAyt/D0ciWw=="
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.10.tgz",
+      "integrity": "sha512-bXqRBBb85WmnJemw9+xLdA7ezLXwZ+hXcOD8ZzfGMhbus4jHRrjTMXZ1kJqpKnpGu34scZc6f0qYNSxBwO7yrg=="
     },
     "raw-body": {
       "version": "2.5.1",
@@ -12504,9 +12980,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "requires": {
         "regenerate": "^1.4.2"
       }
@@ -12544,14 +13020,14 @@
       "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
     },
     "regexpu-core": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
-      "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
       "requires": {
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.0.0"
       }
@@ -12573,14 +13049,14 @@
       }
     },
     "regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
     },
     "regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "requires": {
         "jsesc": "~0.5.0"
       },
@@ -14277,9 +14753,9 @@
       "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
     },
     "terser": {
-      "version": "5.14.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+      "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
       "requires": {
         "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
@@ -14288,9 +14764,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-          "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+          "version": "8.8.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+          "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
         },
         "commander": {
           "version": "2.20.3",
@@ -14314,15 +14790,26 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz",
-      "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.7",
+        "@jridgewell/trace-mapping": "^0.3.14",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
-        "terser": "^5.7.2"
+        "terser": "^5.14.1"
+      },
+      "dependencies": {
+        "@jridgewell/trace-mapping": {
+          "version": "0.3.15",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
+          "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+          "requires": {
+            "@jridgewell/resolve-uri": "^3.0.3",
+            "@jridgewell/sourcemap-codec": "^1.4.10"
+          }
+        }
       }
     },
     "text-hex": {
@@ -14842,9 +15329,9 @@
       "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
     },
     "union-value": {
       "version": "1.0.1",
@@ -15428,20 +15915,20 @@
       "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
     },
     "webpack": {
-      "version": "5.73.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz",
-      "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==",
+      "version": "5.74.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
+        "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.3",
+        "enhanced-resolve": "^5.10.0",
         "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -15454,14 +15941,14 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
+        "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-          "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+          "version": "8.8.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+          "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
         },
         "eslint-scope": {
           "version": "5.1.1",
diff --git a/package.json b/package.json
index b32ca0a27a..3e65e3feac 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.13",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-env": "^7.19.1",
     "@babel/register": "^7.18.9",
     "@google-cloud/trace-agent": "^5.1.6",
     "@parse/node-apn": "^5.1.3",
@@ -13,7 +13,7 @@
     "accepts": "^1.3.8",
     "amazon-payments": "^0.2.9",
     "amplitude": "^6.0.0",
-    "apidoc": "^0.52.0",
+    "apidoc": "^0.53.0",
     "apple-auth": "^1.0.7",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.20.0",
@@ -61,7 +61,7 @@
     "paypal-rest-sdk": "^1.8.1",
     "pp-ipn": "^1.1.0",
     "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.3.7",
+    "rate-limiter-flexible": "^2.3.10",
     "redis": "^3.1.2",
     "regenerator-runtime": "^0.13.9",
     "remove-markdown": "^0.5.0",
diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 0f25f93dfb..949372df0d 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -30,9 +30,9 @@
       }
     },
     "@amplitude/types": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.10.0.tgz",
-      "integrity": "sha512-xN0gnhutztv6kqHaZ2bre18anQV5GDmMXOeipTvI670g2VjNbPfOzMwu1LN4p1NadYq+GqYI223UcZrXR+R4Pw=="
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.10.2.tgz",
+      "integrity": "sha512-I8qenRI7uU6wKNb9LiZrAosSHVoNHziXouKY81CrqxH9xhVTEIJFXeuCV0hbtBr0Al/8ejnGjQRx+S2SvU/pPg=="
     },
     "@amplitude/ua-parser-js": {
       "version": "0.7.31",
@@ -40,12 +40,19 @@
       "integrity": "sha512-+z8UGRaj13Pt5NDzOnkTBy49HE2CX64jeL0ArB86HAtilpnfkPB7oqkigN7Lf2LxscMg4QhFD7mmCfedh3rqTg=="
     },
     "@amplitude/utils": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.10.0.tgz",
-      "integrity": "sha512-/R8j8IzFH0GYfA6ehQDm5IEzt71gIeMdiYYFIzZp6grERQlgJcwNJMAiza0o2JwwTDIruzqdB3c/vLVjuakp+w==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.10.2.tgz",
+      "integrity": "sha512-tVsHXu61jITEtRjB7NugQ5cVDd4QDzne8T3ifmZye7TiJeUfVRvqe44gDtf55A+7VqhDhyEIIXTA1iVcDGqlEw==",
       "requires": {
-        "@amplitude/types": "^1.10.0",
-        "tslib": "^1.9.3"
+        "@amplitude/types": "^1.10.2",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
       }
     },
     "@babel/code-frame": {
@@ -13127,13 +13134,13 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
     },
     "amplitude-js": {
-      "version": "8.18.5",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.18.5.tgz",
-      "integrity": "sha512-s43q4qKd7kvhYESQhYvyKDKUM1PpyAyoOFFlyMuFfQHRxyeDmZRhcfzrKnOhbrLhFxSWtPc0VEeh9tajJRNe5Q==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.0.tgz",
+      "integrity": "sha512-kC01TmmCdDrtms8LhvC/r65FtbmCbNHZ1/jiezXmTH82TsWI/SkN47jKs8CCwjZNakqTBN/hmficiZBUKv4myw==",
       "requires": {
         "@amplitude/analytics-connector": "1.4.4",
         "@amplitude/ua-parser-js": "0.7.31",
-        "@amplitude/utils": "^1.0.5",
+        "@amplitude/utils": "^1.10.1",
         "@babel/runtime": "^7.3.4",
         "blueimp-md5": "^2.10.0",
         "query-string": "5"
@@ -16812,9 +16819,9 @@
       }
     },
     "dompurify": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.10.tgz",
-      "integrity": "sha512-o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g=="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="
     },
     "domutils": {
       "version": "1.7.0",
@@ -20668,9 +20675,9 @@
       }
     },
     "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
     },
     "js-message": {
       "version": "1.0.5",
@@ -28306,23 +28313,23 @@
       "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk="
     },
     "vue": {
-      "version": "2.7.8",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz",
-      "integrity": "sha512-ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ==",
+      "version": "2.7.10",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
+      "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
       "requires": {
-        "@vue/compiler-sfc": "2.7.8",
+        "@vue/compiler-sfc": "2.7.10",
         "csstype": "^3.1.0"
       },
       "dependencies": {
         "@babel/parser": {
-          "version": "7.18.9",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz",
-          "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="
+          "version": "7.18.13",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz",
+          "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="
         },
         "@vue/compiler-sfc": {
-          "version": "2.7.8",
-          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz",
-          "integrity": "sha512-2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q==",
+          "version": "2.7.10",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
+          "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
           "requires": {
             "@babel/parser": "^7.18.4",
             "postcss": "^8.4.14",
@@ -28340,9 +28347,9 @@
           "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
         },
         "postcss": {
-          "version": "8.4.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+          "version": "8.4.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
+          "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
           "requires": {
             "nanoid": "^3.3.4",
             "picocolors": "^1.0.0",
@@ -28676,9 +28683,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.7.8",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz",
-      "integrity": "sha512-eQqdcUpJKJpBRPDdxCNsqUoT0edNvdt1jFjtVnVS/LPPmr0BU2jWzXlrf6BVMeODtdLewB3j8j3WjNiB+V+giw==",
+      "version": "2.7.10",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
+      "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"
diff --git a/website/client/package.json b/website/client/package.json
index de0c012ae1..640a0b4d41 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -25,7 +25,7 @@
     "@vue/cli-plugin-unit-mocha": "^4.5.15",
     "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^8.18.5",
+    "amplitude-js": "^8.21.0",
     "axios": "^0.25.0",
     "axios-progress-bar": "^1.2.0",
     "babel-eslint": "^10.1.0",
@@ -33,7 +33,7 @@
     "bootstrap-vue": "^2.22.0",
     "chai": "^4.3.6",
     "core-js": "^3.24.1",
-    "dompurify": "^2.3.10",
+    "dompurify": "^2.4.0",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.3.0",
@@ -42,7 +42,7 @@
     "hellojs": "^1.19.5",
     "inspectpack": "^4.7.1",
     "intro.js": "^5.1.0",
-    "jquery": "^3.6.0",
+    "jquery": "^3.6.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
@@ -55,11 +55,11 @@
     "svgo-loader": "^2.2.1",
     "uuid": "^8.3.2",
     "validator": "^13.7.0",
-    "vue": "^2.7.8",
+    "vue": "^2.7.10",
     "vue-cli-plugin-storybook": "2.1.0",
     "vue-mugen-scroll": "^0.2.6",
     "vue-router": "^3.5.4",
-    "vue-template-compiler": "^2.7.8",
+    "vue-template-compiler": "^2.7.10",
     "vuedraggable": "^2.24.3",
     "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#153d339e4dbebb73733658aeda1d5b7fcc55b0a0",
     "webpack": "^4.46.0"

From 8e9b469d8db93c7188c8f81ba3f07d1546c4dab9 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 20 Sep 2022 13:11:43 -0400
Subject: [PATCH 33/36] chore: merge develop

---
 .../assets/css/sprites/spritesmith-main.css   | 170 +++++++++++++++
 .../src/components/groups/groupPlan.vue       | 200 +++++++++++++-----
 .../client/src/components/static/privacy.vue  |   3 +-
 website/common/locales/be/questscontent.json  |   4 +-
 website/common/locales/cs/gear.json           |   6 +-
 website/common/locales/de/front.json          |  13 +-
 website/common/locales/de/groups.json         |   7 +-
 website/common/locales/de/npc.json            |   5 +-
 website/common/locales/de/questscontent.json  |   4 +-
 website/common/locales/de/subscriber.json     |   2 +-
 website/common/locales/en/gear.json           |  32 +++
 website/common/locales/en/limited.json        |   4 +
 website/common/locales/es/gear.json           |  16 +-
 website/common/locales/it/backgrounds.json    |   4 +-
 website/common/locales/it/front.json          |  13 +-
 website/common/locales/it/npc.json            |   5 +-
 website/common/locales/it/questscontent.json  |   2 +-
 website/common/locales/it/subscriber.json     |   2 +-
 website/common/locales/ja/front.json          |   2 +-
 website/common/locales/ja/gear.json           |   4 +-
 website/common/locales/ja/questscontent.json  |   2 +-
 website/common/locales/pt_BR/front.json       |  13 +-
 website/common/locales/pt_BR/gear.json        |  92 ++++----
 website/common/locales/pt_BR/limited.json     |   2 +-
 website/common/locales/pt_BR/npc.json         |   5 +-
 .../common/locales/pt_BR/questscontent.json   |   2 +-
 website/common/locales/pt_BR/subscriber.json  |   2 +-
 website/common/locales/ru/faq.json            |   2 +-
 website/common/locales/ru/front.json          |  11 +-
 website/common/locales/ru/gear.json           |  11 +-
 website/common/locales/ru/groups.json         |   9 +-
 website/common/locales/ru/npc.json            |   2 +-
 website/common/locales/ru/questscontent.json  |   2 +-
 website/common/locales/ru/subscriber.json     |   2 +-
 .../locales/uk/communityguidelines.json       |   4 +-
 website/common/locales/uk/contrib.json        |   2 +-
 website/common/locales/uk/gear.json           |  10 +-
 website/common/locales/uk/groups.json         |   4 +-
 website/common/locales/uk/quests.json         |   4 +-
 website/common/locales/uk/questscontent.json  |  58 ++---
 .../common/script/content/appearance/sets.js  |   4 +-
 .../common/script/content/constants/events.js |  19 +-
 .../script/content/constants/seasonalSets.js  |   5 +
 .../script/content/gear/sets/special/index.js |  60 ++++++
 .../common/script/content/hatching-potions.js |  18 +-
 .../script/content/shop-featuredItems.js      |  10 +-
 website/common/script/content/spells.js       |   2 +-
 .../script/libs/shops-seasonal.config.js      |  15 +-
 48 files changed, 642 insertions(+), 228 deletions(-)

diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 277ff3f148..f91dc5b14f 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -22875,6 +22875,26 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_fallHealer.png');
   width: 90px;
@@ -23045,6 +23065,26 @@
   width: 114px;
   height: 90px;
 }
+.head_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .head_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_fallHealer.png');
   width: 90px;
@@ -23170,6 +23210,21 @@
   width: 114px;
   height: 90px;
 }
+.shield_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.shield_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_fallHealer.png');
   width: 90px;
@@ -23325,6 +23380,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_fallHealer.png');
   width: 68px;
@@ -23495,6 +23570,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_fallHealer.png');
   width: 68px;
@@ -23620,6 +23715,21 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_fallHealer.png');
   width: 68px;
@@ -23775,6 +23885,26 @@
   width: 68px;
   height: 68px;
 }
+.shop_weapon_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fall2022Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_fallHealer.png');
   width: 68px;
@@ -23935,6 +24065,26 @@
   width: 114px;
   height: 90px;
 }
+.slim_armor_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_fallHealer.png');
   width: 90px;
@@ -24095,6 +24245,26 @@
   width: 114px;
   height: 90px;
 }
+.weapon_special_fall2022Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Healer.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Rogue.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_fall2022Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fall2022Warrior.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_special_fallHealer {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_fallHealer.png');
   width: 90px;
diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index c628774d9e..ec5aee5442 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,7 +1,6 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
-    <group-plan-creation-modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -52,7 +51,6 @@
           </div>
         </div>
       </div>
-      <!-- Upgrading an existing group -->
       <div
         v-if="upgradingGroup._id"
         id="upgrading-group"
@@ -102,53 +100,153 @@
           </div>
         </div>
       </div>
-      <!-- Create a new group -->
       <div
         v-if="!upgradingGroup._id"
         class="container col-6 offset-3 create-option"
       >
         <div class="row">
           <h1 class="col-12 text-center purple-header">
-            Create Your Group Today!
+            Create your Group today!
           </h1>
         </div>
         <div class="row">
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('create-page')"
+              @click="launchModal('create')"
             >
-              Create Your New Group!
+              Create Your New Group
             </button>
           </div>
         </div>
-        <div class="row pricing justify-content-center align-items-center">
-          <div class="dollar">
-            $
+        <div class="row pricing">
+          <div class="col-5">
+            <div class="dollar">
+              $
+            </div>
+            <div class="number">
+              9
+            </div>
+            <div class="name">
+              <div>Group Owner</div>
+              <div>Subscription</div>
+            </div>
           </div>
-          <div class="number">
-            9
+          <div class="col-1">
+            <div class="plus">
+              +
+            </div>
           </div>
-          <div class="name">
-            <div>Group Owner</div>
-            <div>Subscription</div>
-          </div>
-          <div class="plus">
-            +
-          </div>
-          <div class="dollar">
-            $
-          </div>
-          <div class="number">
-            3
-          </div>
-          <div class="name">
-            <div>Each Additional</div>
-            <div>Member</div>
+          <div class="col-6">
+            <div class="dollar">
+              $
+            </div>
+            <div class="number">
+              3
+            </div>
+            <div class="name">
+              <div>Each Additional</div>
+              <div>Member</div>
+            </div>
           </div>
         </div>
       </div>
     </div>
+    <b-modal
+      id="group-plan-modal"
+      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
+      size="md"
+      hide-footer="hide-footer"
+    >
+      <div
+        v-if="activePage === PAGES.CREATE_GROUP"
+        class="col-12"
+      >
+        <div class="form-group">
+          <label
+            class="control-label"
+            for="new-group-name"
+          >Name</label>
+          <input
+            id="new-group-name"
+            v-model="newGroup.name"
+            class="form-control input-medium option-content"
+            required="required"
+            type="text"
+            placeholder="Name"
+          >
+        </div>
+        <div class="form-group">
+          <label for="new-group-description">{{ $t('description') }}</label>
+          <textarea
+            id="new-group-description"
+            v-model="newGroup.description"
+            class="form-control option-content"
+            cols="3"
+            :placeholder="$t('description')"
+          ></textarea>
+        </div>
+        <div
+          v-if="type === 'guild'"
+          class="form-group"
+        >
+          <div class="custom-control custom-radio">
+            <input
+              v-model="newGroup.privacy"
+              class="custom-control-input"
+              type="radio"
+              name="new-group-privacy"
+              value="private"
+            >
+            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
+          </div>
+        </div>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <input
+              id="create-group-leaderOnlyChallenges-checkbox"
+              v-model="newGroup.leaderOnly.challenges"
+              class="custom-control-input"
+              type="checkbox"
+            >
+            <label
+              class="custom-control-label"
+              for="create-group-leaderOnlyChallenges-checkbox"
+            >{{ $t('leaderOnlyChallenges') }}</label>
+          </div>
+        </div>
+        <div
+          v-if="type === 'party'"
+          class="form-group"
+        >
+          <button
+            class="btn btn-secondary form-control"
+            :value="$t('create')"
+            @click="createGroup()"
+          ></button>
+        </div>
+        <div class="form-group">
+          <button
+            class="btn btn-primary btn-lg btn-block"
+            :disabled="!newGroupIsReady"
+            @click="createGroup()"
+          >
+            {{ $t('create') }}
+          </button>
+        </div>
+      </div>
+      <div
+        v-if="activePage === PAGES.PAY"
+        class="col-12"
+      >
+        <div class="text-center">
+          <payments-buttons
+            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
+            :amazon-data="pay(PAYMENTS.AMAZON)"
+          />
+        </div>
+      </div>
+    </b-modal>
   </div>
 </template>
 
@@ -160,8 +258,8 @@
 
     .dollar {
       position: absolute;
-      left: -16px;
-      top: 16px;
+      left: -1em;
+      top: 1em;
     }
 
     .purple-box {
@@ -193,9 +291,9 @@
     background: #432874;
     background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
     color: #fff;
-    padding: 32px;
+    padding: 2em;
     height: 340px;
-    margin-bottom: 32px;
+    margin-bottom: 2em;
     margin-left: -12px;
     margin-right: -12px;
 
@@ -219,7 +317,6 @@
 
     .box {
       height: 416px;
-      border-radius: 8px;
     }
 
     h2 {
@@ -262,19 +359,17 @@
   button.create-group {
     width: 330px;
     height: 96px;
-    border-radius: 8px;
-    font-size: 1.5rem;
   }
 
   .purple-header {
     color: #6133b4;
     font-size: 48px;
-    margin-top: 16px;
+    margin-top: 1em;
   }
 
   .pricing {
-    margin-top: 32px;
-    margin-bottom: 64px;
+    margin-top: 2em;
+    margin-bottom: 4em;
 
     .dollar, .number, .name {
       display: inline-block;
@@ -283,32 +378,30 @@
     }
 
     .plus {
-      font-size: 2.125rem;
+      font-size: 34px;
       color: #a5a1ac;
-      margin-left: 16px;
-      margin-right: 16px;
     }
 
     .dollar {
-      margin-bottom: 24px;
-      font-size: 2rem;
+      margin-bottom: 1.5em;
+      font-size: 32px;
       font-weight: bold;
     }
 
     .name {
-      font-size: 1.5rem;
-      margin-left: 8px;
-      margin-right: 8px;
+      font-size: 24px;
+      margin-bottom: .8em;
+      margin-left: .5em;
     }
 
     .number {
-      font-size: 4.5rem;
+      font-size: 72px;
       font-weight: bolder;
     }
   }
 
   .payment-options {
-    margin-bottom: 64px;
+    margin-bottom: 4em;
 
     h4 {
       color: #34313a;
@@ -317,7 +410,7 @@
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
-      padding: 8px;
+      padding: .5em;
       border-radius: 8px;
       width: 200px;
       height: 215px;
@@ -331,7 +424,7 @@
 
       .name {
         width: 100px;
-        margin-left: 4.8px;
+        margin-left: .3em;
       }
 
       .plus {
@@ -356,12 +449,10 @@ import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
-import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
 
 export default {
   components: {
     paymentsButtons,
-    groupPlanCreationModal,
   },
   mixins: [paymentsMixin],
   data () {
@@ -410,7 +501,12 @@ export default {
   },
   methods: {
     launchModal () {
-      this.$root.$emit('bv::show::modal', 'create-group');
+      this.changePage(this.PAGES.CREATE_GROUP);
+      this.$root.$emit('bv::show::modal', 'group-plan-modal');
+    },
+    changePage (page) {
+      this.activePage = page;
+      window.scrollTo(0, 0);
     },
     createGroup () {
       this.changePage(this.PAGES.PAY);
diff --git a/website/client/src/components/static/privacy.vue b/website/client/src/components/static/privacy.vue
index 8fbbfbe2ae..c2615ce69b 100644
--- a/website/client/src/components/static/privacy.vue
+++ b/website/client/src/components/static/privacy.vue
@@ -3,7 +3,7 @@
   <div class="container-fluid">
     <h1>Privacy Notice</h1>
     <p class="strong pagemeta">
-      Last Updated: September 15, 2022
+      Last Updated September 19, 2022: Removed reference to Facebook login, which is no longer supported.
     </p>
     <p>
       HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
@@ -41,7 +41,6 @@
       verify your identity. We also use this information to manage your account, including your transactions. If
       you choose to log into your account through Google or Apple, we capture and store the User ID and email
       address connected to the respective account, so we can verify your identity when you log in.
-      (We no longer offer the ability to log in using Facebook's authentication procedure.)
     </p>
     <h3>User Content</h3>
     <p>
diff --git a/website/common/locales/be/questscontent.json b/website/common/locales/be/questscontent.json
index 8a6d9be006..945647680f 100755
--- a/website/common/locales/be/questscontent.json
+++ b/website/common/locales/be/questscontent.json
@@ -609,7 +609,7 @@
     "questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.<br><br>You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’",
     "questSeaSerpentCompletion": "Battered by your commitment, the sea serpent flees, disappearing into the depths. When you arrive in Dilatory, you breathe a sigh of relief before noticing @*~Seraphina~ approaching with three translucent eggs cradled in her arms. “Here, you should have these,” she says. “You know how to handle a sea serpent!” As you accept the eggs, you vow anew to remain steadfast in completing your tasks to ensure that there’s not a repeat occurrence.",
     "questSeaSerpentBoss": "The Mighty Sea Serpent",
-    "questSeaSerpentDropSeaSerpentEgg": "Sea Serpent (Egg)",
+    "questSeaSerpentDropSeaSerpentEgg": "",
     "questSeaSerpentUnlockText": "Unlocks purchasable Sea Serpent eggs in the Market",
     "questKangarooText": "Kangaroo Catastrophe",
     "questKangarooNotes": "Maybe you should have finished that last task… you know, the one you keep avoiding, even though it always comes back around? But @Mewrose and @LilithofAlfheim invited you and @stefalupagus to see a rare kangaroo troop hopping through the Sloensteadi Savannah; how could you say no?! As the troop comes into view, something hits you on the back of the head with a mighty <em>whack!</em><br><br>Shaking the stars from your vision, you pick up the responsible object--a dark red boomerang, with the very task you continually push back etched into its surface. A quick glance around confirms the rest of your party met a similar fate. One larger kangaroo looks at you with a smug grin, like she’s daring you to face her and that dreaded task once and for all!",
@@ -635,4 +635,4 @@
     "questVelociraptorBoss": "Veloci-Rapper",
     "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)",
     "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market"
-}
\ No newline at end of file
+}
diff --git a/website/common/locales/cs/gear.json b/website/common/locales/cs/gear.json
index 4706d78a71..b4f92eb661 100644
--- a/website/common/locales/cs/gear.json
+++ b/website/common/locales/cs/gear.json
@@ -2014,5 +2014,9 @@
     "weaponMystery202102Notes": "Zářivý růžový drahokem v této hůlce dokáže šířit radost a přátelství všude možně! Nepřináší žádné výhody. Předmět pro předplatitele, únor 2021.",
     "weaponMystery202104Notes": "Tvoji nepřátele by si měli dávat pozor - máš totiž mocnou a pichlavou obranu! Nepřináší žádné výhody. Předmět pro předplatitele duben 2021.",
     "weaponMystery202102Text": "Okouzlující hůlka",
-    "weaponMystery202104Text": "Hůl trnitého bodláku"
+    "weaponMystery202104Text": "Hůl trnitého bodláku",
+    "weaponMystery202201Notes": "O silvestrovské půlnoci vypusť oblak zlatého a stříbrného třpytu. Štastný nový rok! Kdo to teď uklidí? Nepřináší žádné výhody. Předmět pro předplatitele leden 2022.",
+    "weaponMystery202201Text": "Konfetové dělo půlnoci",
+    "weaponMystery202111Text": "Chronomancerova hůl",
+    "weaponMystery202111Notes": "Ohýbej tok času s touto tajemnou a mocnou holí. Nepřináší žádné výhody. Předmět pro předplatitele listopad 2021."
 }
diff --git a/website/common/locales/de/front.json b/website/common/locales/de/front.json
index df71b09c58..9aff6c04b6 100644
--- a/website/common/locales/de/front.json
+++ b/website/common/locales/de/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "zu, sowie der",
     "chores": "Hausarbeiten",
     "clearBrowserData": "Browserdaten löschen",
-    "communityExtensions": "<a href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-ons & Erweiterungen</a>",
+    "communityExtensions": "Add-ons & Erweiterungen",
     "communityFacebook": "Facebook",
     "companyAbout": "So funktioniert es",
     "companyBlog": "Blog",
-    "companyContribute": "Mitwirken",
-    "companyDonate": "Spenden",
+    "companyContribute": "Bei Habitica mitwirken",
+    "companyDonate": "An Habitica spenden",
     "forgotPassword": "Passwort vergessen?",
     "emailNewPass": "Einen Link per E-Mail senden, um das Passwort zurückzusetzen",
     "forgotPasswordSteps": "Trage Deinen Benutzernamen oder die E-Mail-Adresse ein, mit der Du Deinen Habitica-Account aktiviert hast.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Willst Du Dein Leben einmal als Spiel betrachten?",
     "marketing4Lead3-2": "Willst Du eine Gruppe für Ausbildung, Wohlbefinden usw. leiten?",
     "marketing4Lead3Title": "Mache Alles zum Spiel",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Android App",
+    "mobileIOS": "iOS App",
     "oldNews": "Neuigkeiten",
     "newsArchive": "Neuigkeiten-Archiv auf Wikia (mehrsprachig)",
     "setNewPass": "Neues Passwort setzen",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Das Passwort muss mindestens 8 Zeichen haben.",
     "enterHabitica": "Tritt ein in Habitica",
     "socialAlreadyExists": "Diese Social-Media-Zugangsdaten sind bereits mit einem schon bestehenden Habitica-Konto verknüpft.",
-    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com"
+    "emailUsernamePlaceholder": "z.B., habitrabbit oder gryphon@beispiel.com",
+    "footerProduct": "Produkt"
 }
diff --git a/website/common/locales/de/groups.json b/website/common/locales/de/groups.json
index 73f5f6d95a..88cf4f0851 100644
--- a/website/common/locales/de/groups.json
+++ b/website/common/locales/de/groups.json
@@ -163,8 +163,8 @@
     "onlyGroupLeaderCanEditTasks": "Nicht berechtigt, Aufgaben zu bearbeiten!",
     "onlyGroupTasksCanBeAssigned": "Nur Team-Aufgaben können verteilt werden",
     "assignedTo": "Zugewiesen an",
-    "assignedToUser": "<strong><%- userName %></strong> zugewiesen",
-    "assignedToMembers": "<strong><%= userCount %></strong> Mitgliedern zugewiesen",
+    "assignedToUser": "Zugewiesen: <strong>@<%- userName %></strong>",
+    "assignedToMembers": "<%= userCount %> Mitgliedern",
     "assignedToYouAndMembers": "Dir und <strong><%= userCount %> Mitliedern</strong> zugewiesen",
     "youAreAssigned": "Dir zugewiesen",
     "taskIsUnassigned": "Diese Aufgabe ist niemandem zugewiesen",
@@ -380,5 +380,6 @@
     "viewDetails": "Details ansehen",
     "upgradeToGroup": "Auf Gruppenplan upgraden",
     "sendGiftTotal": "Insgesamt:",
-    "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut."
+    "chatTemporarilyUnavailable": "Chat aktuell nicht verfügbar. Bitte versuche es später erneut.",
+    "assignTo": "Zugewiesen an"
 }
diff --git a/website/common/locales/de/npc.json b/website/common/locales/de/npc.json
index 343a58e5e2..46c25a0323 100644
--- a/website/common/locales/de/npc.json
+++ b/website/common/locales/de/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Neues Update von Bailey!",
     "tellMeLater": "Erzähl es mir später",
     "dismissAlert": "Als gelesen markieren",
-    "donateText3": "Als Open-Source-Projekt ist Habitica auf die Hilfe unserer Benutzer angewiesen. Das Geld, was Du für Edelsteine ausgibst, hilft uns dabei unsere Server am Laufen zu halten, ein paar Mitarbeiter zu bezahlen, neue Features zu entwickeln und unseren ehrenamtlichen Programmierern Anreize zu bieten. Vielen Dank für Deine Großzügigkeit!",
+    "donateText3": "Als Open-Source-Projekt ist Habitica auf die Hilfe unserer Benutzer angewiesen. Das Geld, was Du für Edelsteine ausgibst, hilft uns dabei unsere Server am Laufen zu halten, ein paar Mitarbeiter zu bezahlen, neue Features zu entwickeln und unseren ehrenamtlichen Helferlein Anreize zu bieten.",
     "card": "Kreditkarte",
     "paymentMethods": "Kauf mit",
     "paymentSuccessful": "Die Zahlung war erfolgreich!",
@@ -131,5 +131,6 @@
     "limitedAvailabilityHours": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "limitedAvailabilityDays": "Für <%= days %>t <%= hours %>std und <%= minutes %>min verfügbar",
     "amountExp": "<%= amount %> Exp",
-    "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>"
+    "newStuffPostedOn": "Veröffentlicht am <%= publishDate %> um <%= publishTime %>",
+    "helpSupportHabitica": "Hilf Habitica zu unterstützen"
 }
diff --git a/website/common/locales/de/questscontent.json b/website/common/locales/de/questscontent.json
index 3aeddfa3e8..1d0499bcb6 100644
--- a/website/common/locales/de/questscontent.json
+++ b/website/common/locales/de/questscontent.json
@@ -184,7 +184,7 @@
     "questTRexCompletion": "Der wilde Dinosaurier hört endlich zu toben und zu randalieren auf, setzt sich ruhig hin und fängt an sich mit den riesigen Hähnen anzufreunden. @Urse strahlt ihn an. \"Sie sind doch gar keine so schlimmen Haustiere! Sie brauchen einfach nur ein bisschen Disziplin. Hier, nimm Dir ein paar Tyrannosaurus-Eier mit!\"",
     "questTRexBoss": "Fleischerner Tyrannosaurus",
     "questTRexUndeadText": "Der Dinosaurier aus den Tiefen der Erde",
-    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch HabitCity wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus-Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
+    "questTRexUndeadNotes": "Während die uralten Dinosaurier der Stoïstillen Steppen durch Habit City wandern, hört man auf ein mal einen angstvollen Schrei aus Richtung des Grand Museums. @Baconsaur ruft: \"Das Tyrannosaurus-Skelett im Museum fängt an sich zu bewegen! Es muss die Anwesenheit seiner Artgenossen gewittert haben!\" Das knöcherne Biest bleckt seine monströsen Zähne und klappert auf Dich zu. Wie wirst Du in der Lage sein eine Kreatur zu besiegen, die bereits tot ist? Du wirst schnell zuschlagen müssen, bevor sie sich selbst heilt!",
     "questTRexUndeadCompletion": "Die glühenden Augen des Tyrannosaurus werden dunkel und trüb und er begibt sich zurück zu seinem Sockel. Alle atmen vor Erleichterung auf. \"Seht nur!\", sagt @Baconsaur, \"einige der versteinerten Eier sind plötzlich wie neu! Vielleicht werden sie ja für Dich ausschlüpfen.\"",
     "questTRexUndeadBoss": "Skelettierter Tyrannosaurus",
     "questTRexUndeadRageTitle": "Knöcherne Heilung",
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Nilpferd (Ei)",
     "questHippoUnlockText": "Schaltet den Kauf von Nilpferdeiern auf dem Marktplatz frei",
     "farmFriendsText": "\"Farmfreunde\" Quest-Paket",
-    "farmFriendsNotes": "Beinhaltet 'Die Muhtantische Kuh', 'Reite die Nacht-Mähre', und 'Der Donner-Bock'. Verfügbar bis zum 31. August.",
+    "farmFriendsNotes": "Beinhaltet 'Die Muhtantische Kuh', 'Reite die Nacht-Mähre', und 'Der Donner-Bock'. Verfügbar bis zum 30. September.",
     "witchyFamiliarsText": "\"Hexenhafte Haustiere\" Quest-Paket",
     "witchyFamiliarsNotes": "Beinhaltet 'Der Rattenkönig', 'Die eisige Arachnoide', und 'Sumpf des Chaos-Froschs'. Verfügbar bis zum 31. Oktober.",
     "questGroupLostMasterclasser": "Geheimnis der Klassenmeister",
diff --git a/website/common/locales/de/subscriber.json b/website/common/locales/de/subscriber.json
index b8a5f1986d..bfac46a618 100644
--- a/website/common/locales/de/subscriber.json
+++ b/website/common/locales/de/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Dein Abonnement wurde gekündigt",
     "choosePaymentMethod": "Wähle Deine Zahlungsmethode",
     "buyGemsSupportsDevs": "Der Kauf von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten",
-    "support": "HILFE",
+    "support": "Hilfe",
     "gemBenefitLeadin": "Was kann man mit Edelsteinen kaufen?",
     "gemBenefit1": "Einzigartige und modische Verkleidungen für Deinen Avatar.",
     "gemBenefit2": "Hintergründe, die Deinen Avatar in die Welt von Habitica eintauchen lassen!",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 3c81c01acf..076c94c917 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -447,6 +447,15 @@
   "weaponSpecialSpring2022HealerText": "Peridot Wand",
   "weaponSpecialSpring2022HealerNotes": "Use this wand to tap into peridot’s healing properties, whether it be to bring calm, positivity, or kindheartedness. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
 
+  "weaponSpecialFall2022RogueText": "Cucumber Blade",
+  "weaponSpecialFall2022RogueNotes": "Not only can you defend yourself with this cucumber, it also makes for a tasty meal. Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022WarriorText": "Orcish Ripsword",
+  "weaponSpecialFall2022WarriorNotes": "Maybe more suited for cutting logs or crusty loaves of bread than enemy armor, but RAWR! It sure looks fearsome! Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022MageText": "Wind Blasts",
+  "weaponSpecialFall2022MageNotes": "These mighty gusts remain in your wake as you take off toward the skies. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "weaponSpecialFall2022HealerText": "Right Peeker Eye",
+  "weaponSpecialFall2022HealerNotes": "To claim victory, hold it forth and utter the words of command: 'Eye One!' Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+
   "weaponMystery201411Text": "Pitchfork of Feasting",
   "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
   "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -1083,6 +1092,15 @@
   "armorSpecialSummer2022HealerText": "Angelfish Tail",
   "armorSpecialSummer2022HealerNotes": "Use your colorful fins to scoot about the reef and help those in need of rest and healing. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.",
 
+  "armorSpecialFall2022RogueText": "Kappa Armor",
+  "armorSpecialFall2022RogueNotes": "Whether you’re swimming, sneaking, or wrestling, you will be safe in this armor. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022WarriorText": "Orcish Armor",
+  "armorSpecialFall2022WarriorNotes": "RAWR! BIG SHOULDERS mean you are BIG STRONG! Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022MageText": "Harpy Armor",
+  "armorSpecialFall2022MageNotes": "Fly as fast as the wind with these wonderful wings and hold what you care most about tight in these terrifying talons. Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+  "armorSpecialFall2022HealerText": "Profusion of Peeker Pods",
+  "armorSpecialFall2022HealerNotes": "How many peeps could a Peeker peep, if a Peeker could peep peeps? Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
   "armorMystery201403Text": "Forest Walker Armor",
@@ -1793,6 +1811,15 @@
   "headSpecialSpring2022HealerText": "Peridot Helmet",
   "headSpecialSpring2022HealerNotes": "This mysterious helmet preserves your privacy as you tackle your tasks. Increases Intelligence by <%= int %>. Limited Edition 2022 Spring Gear.",
 
+  "headSpecialFall2022RogueText": "Kappa Mask",
+  "headSpecialFall2022RogueNotes": "With this metal cap upon your head, you will have extra protection when you venture onto land. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022WarriorText": "Orc Mask",
+  "headSpecialFall2022WarriorNotes": "Tusks tough and sharp enough to pierce pumpkins! RAWR! Increases Strength by <%= str %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022MageText": "Harpy Mask",
+  "headSpecialFall2022MageNotes": "Entrance and lure others close with this magical maiden mask. Increases Perception by <%= per %>. Limited Edition 2022 Fall Gear.",
+  "headSpecialFall2022HealerText": "Peeker Mask",
+  "headSpecialFall2022HealerNotes": "Beauty is in there. Somewhere! Increases Intelligence by <%= int %>. Limited Edition 2022 Fall Gear.",
+
   "headSpecialGaymerxText": "Rainbow Warrior Helm",
   "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
 
@@ -2345,6 +2372,11 @@
   "shieldSpecialSummer2022HealerText": "Remedial Ripples",
   "shieldSpecialSummer2022HealerNotes": "Send out restorative magic in gentle ripples through the reef. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.",
 
+  "shieldSpecialFall2022WarriorText": "Orc Shield",
+  "shieldSpecialFall2022WarriorNotes": "RAWR or TREAT! Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+  "shieldSpecialFall2022HealerText": "Left Peeker Eye",
+  "shieldSpecialFall2022HealerNotes": "Eye Two, look upon this costume and tremble. Increases Constitution by <%= con %>. Limited Edition 2022 Fall Gear.",
+
   "shieldMystery201601Text": "Resolution Slayer",
   "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
   "shieldMystery201701Text": "Time-Freezer Shield",
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index 121b414b54..106f1caf69 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -187,6 +187,10 @@
   "summer2022WaterspoutWarriorSet": "Waterspout (Warrior)",
   "summer2022MantaRayMageSet": "Manta Ray (Mage)",
   "summer2022AngelfishHealerSet": "Angelfish (Healer)",
+  "fall2022KappaRogueSet": "Kappa (Rogue)",
+  "fall2022OrcWarriorSet": "Orc (Warrior)",
+  "fall2022HarpyMageSet": "Harpy (Mage)",
+  "fall2022WatcherHealerSet": "Watcher (Healer)",
   "eventAvailability": "Available for purchase until <%= date(locale) %>.",
   "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
   "dateEndJanuary": "January 31",
diff --git a/website/common/locales/es/gear.json b/website/common/locales/es/gear.json
index 2bc8616497..35f0061b27 100644
--- a/website/common/locales/es/gear.json
+++ b/website/common/locales/es/gear.json
@@ -1021,23 +1021,23 @@
     "headSpecialSummer2017RogueText": "Yelmo de Dragón Marino",
     "headSpecialSummer2017RogueNotes": "Este yelmo cambia de color ayudándote a camuflarte con el entorno. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017WarriorText": "Yelmo Castilloarena",
-    "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017WarriorNotes": "El más fino yelmo que podrías esperar vestir... al menos, hasta que suba la marea. Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017MageText": "Sombrero Torbellino",
-    "headSpecialSummer2017MageNotes": "Este sombre está compuesto enteramente por un giratorio torbellino invertido. Aumenta la Percepción en <%= per %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017MageNotes": "Este sombre está compuesto enteramente por un giratorio torbellino invertido. Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialSummer2017HealerText": "Corona de Criaturas Marinas",
-    "headSpecialSummer2017HealerNotes": "Este yelmo está hecho de amistosas criaturas marinas que estás descansando temporalmente sobre tu cabeza, dándote sabios consejos. Aumenta la Inteligencia en <%= int %>. Equipo de Edición Limitada Verano 2017.",
+    "headSpecialSummer2017HealerNotes": "Este yelmo está hecho de amistosas criaturas marinas que estás descansando temporalmente sobre tu cabeza, dándote sabios consejos. Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de verano 2017.",
     "headSpecialFall2017RogueText": "Casco de Calabaza",
-    "headSpecialFall2017RogueNotes": "¿Preparado para tratos? ¡Hora de ponerse este festivo y brillante casco! Aumenta la Percepción en <%= per %>. Edición Limitada 2017 del Equipamiento de Otoño.",
+    "headSpecialFall2017RogueNotes": "¿Preparado para tratos? ¡Hora de ponerse este festivo y brillante casco! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017WarriorText": "Casco de Golosinas de Maíz",
-    "headSpecialFall2017WarriorNotes": "Este casco puede parecer una delicia, ¡pero a las tareas pendientes obstinadas no les parecerá tan dulce! Aumenta la Fuerza en un <%= str %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017WarriorNotes": "Este casco puede parecer una delicia, ¡pero a las tareas pendientes obstinadas no les parecerá tan dulce! Aumenta la Fuerza en <%= str %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017MageText": "Casco del Baile de Máscaras",
-    "headSpecialFall2017MageNotes": "¡Cuando aparezcas con este sombrero emplumado, todos se quedarán preguntándose la identidad del mágico extraño de la sala! Aumenta la Percepción en un <%= per %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017MageNotes": "¡Cuando aparezcas con este sombrero emplumado, todos se quedarán preguntándose la identidad del mágico extraño de la sala! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialFall2017HealerText": "Casco de Casa Encantada",
-    "headSpecialFall2017HealerNotes": "¡Invita a espíritus espeluznantes y a criaturas afables a buscar tus poderes curativos al llevar este casco! Aumenta la Inteligencia en un <%= int %>. Equipamiento de Otoño de Edición Limitada del 2017.",
+    "headSpecialFall2017HealerNotes": "¡Invita a espíritus espeluznantes y a criaturas afables a buscar tus poderes curativos al llevar este casco! Aumenta la Inteligencia en <%= int %>. Equipamiento de edición limitada de otoño 2017.",
     "headSpecialNye2017Text": "Sombrero Festivo Rocambolesco",
     "headSpecialNye2017Notes": "¡Has recibido un Sombrero Festivo Rocambolesco! ¡Llévalo con orgullo mientras resuena en Año Nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2018RogueText": "Casco de Reno",
-    "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en un <%= per %>. Equipamiento de Invierno de Edición Limitada del 2017-2018.",
+    "headSpecialWinter2018RogueNotes": "¡El disfraz festivo perfecto, con un foco delantero incorporado! Aumenta la Percepción en <%= per %>. Equipamiento de edición limitada de invierno 2017-2018.",
     "headSpecialWinter2018WarriorText": "Casco Caja de Regalo",
     "headSpecialWinter2018WarriorNotes": "La superficie y el lazo de esta desenfadada caja no solo son festivos, sino bastante robustos también. Aumenta la Fuerza en un <%= str %>. Armamento de Invierno de Edición Limitada del 2017-2018.",
     "headSpecialWinter2018MageText": "Sombrero de Copa Centelleante",
diff --git a/website/common/locales/it/backgrounds.json b/website/common/locales/it/backgrounds.json
index b33cb01299..68101e0850 100644
--- a/website/common/locales/it/backgrounds.json
+++ b/website/common/locales/it/backgrounds.json
@@ -661,8 +661,8 @@
     "backgroundFrozenPolarWatersNotes": "Esplora le ghiacciate acque polari.",
     "backgrounds122021": "SET 91: Rilasciato a dicembre 2021",
     "backgroundIcePalaceShopNotes": "Regna in un palazzo di ghiaccio.",
-    "backgroundWinterCanyonText": "Forra invernale",
-    "backgroundWinterCanyonNotes": "Avventurati in una forra invernale!",
+    "backgroundWinterCanyonText": "Canyon Invernale",
+    "backgroundWinterCanyonNotes": "Avventurati in un Canyon Invernale!",
     "backgroundIcePalaceText": "Palazzo di ghiaccio",
     "backgroundIcePalaceNotes": "Regna in un palazzo di ghiaccio.",
     "backgrounds012022": "SET 92: Rilasciato Gennaio 2022",
diff --git a/website/common/locales/it/front.json b/website/common/locales/it/front.json
index f6f661178c..fa8c79284f 100644
--- a/website/common/locales/it/front.json
+++ b/website/common/locales/it/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "e l'",
     "chores": "Faccende di casa",
     "clearBrowserData": "Pulizia dati del browser",
-    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>Add-on ed estensioni</a>",
+    "communityExtensions": "Add-on ed Estensioni",
     "communityFacebook": "Facebook",
     "companyAbout": "Come funziona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuisci",
-    "companyDonate": "Fai una donazione",
+    "companyContribute": "Contribuire ad Habitica",
+    "companyDonate": "Fai una donazione ad Habitica",
     "forgotPassword": "Password dimenticata?",
     "emailNewPass": "Ricevi per e-mail il link per reimpostare la password",
     "forgotPasswordSteps": "Inserisci il tuo nome utente o l'indirizzo e-mail che hai usato per registrare il tuo account Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Vuoi vivere la tua vita come in un gioco?",
     "marketing4Lead3-2": "Sei interessato a gestire un gruppo nel settore dell'educazione, del benessere e in altri settori?",
     "marketing4Lead3Title": "Trasforma tutto in gioco",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "App su Android",
+    "mobileIOS": "App su iOS",
     "oldNews": "Novità",
     "newsArchive": "Archivio delle notizie su Wikia (multilingua)",
     "setNewPass": "Imposta nuova password",
@@ -187,5 +187,6 @@
     "minPasswordLength": "La password deve essere di almeno 8 caratteri.",
     "enterHabitica": "Entra in Habitica",
     "socialAlreadyExists": "Questo social è già collegato ad un account di Habitica.",
-    "emailUsernamePlaceholder": "es. habitrabbit oppure grifone@example.com"
+    "emailUsernamePlaceholder": "es. habitrabbit oppure grifone@example.com",
+    "footerProduct": "Prodotto"
 }
diff --git a/website/common/locales/it/npc.json b/website/common/locales/it/npc.json
index cbf2ce303c..c1e152ab13 100644
--- a/website/common/locales/it/npc.json
+++ b/website/common/locales/it/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nuovo aggiornamento da Bailey!",
     "tellMeLater": "Ricordamelo più tardi",
     "dismissAlert": "Nascondi questo annuncio",
-    "donateText3": "Habitica è un progetto open-source che dipende dal supporto degli utenti. I soldi che spendi in Gemme ci aiutano a tenere accesi i nostri server, mantenere un piccolo staff, sviluppare nuove funzionalità e dare degli incentivi ai volontari programmatori. Grazie per la tua generosità!",
+    "donateText3": "Habitica è un progetto open-source che dipende dal supporto degli utenti. I soldi che spendi in Gemme ci aiutano a tenere accesi i nostri server, mantenere un piccolo staff, sviluppare nuove funzionalità e dare degli incentivi ai nostri volontari",
     "card": "Carta di credito",
     "paymentMethods": "Paga utilizzando",
     "paymentSuccessful": "Il tuo pagamento ha avuto successo!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityMinutes": "Disponibile per <%= minutes %> minuti e <%= seconds %> secondi",
     "limitedAvailabilityDays": "Disponibile per <%= days %> giorni, <%= hours %> ore e <%= minutes %> minuti",
     "limitedAvailabilityHours": "Disponibile per <%= hours %> ore e <%= minutes %> minuti",
-    "amountExp": "<%= amount %> Exp"
+    "amountExp": "<%= amount %> Exp",
+    "helpSupportHabitica": "Aiutare a Supportare Habitica"
 }
diff --git a/website/common/locales/it/questscontent.json b/website/common/locales/it/questscontent.json
index 66f856b81c..56d758b977 100644
--- a/website/common/locales/it/questscontent.json
+++ b/website/common/locales/it/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Ippopotamo (Uovo)",
     "questHippoUnlockText": "Sblocca le uova di Ippopotamo acquistabili nel Mercato",
     "farmFriendsText": "Pacchetto missioni Amici della Fattoria",
-    "farmFriendsNotes": "Contiente \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 31 agosto.",
+    "farmFriendsNotes": "Contiene \"La Mucca Muutante\", \"Cavalca il Destriero dell'Incubo\", e \"L'Ariete Tuonante\". Disponibile fino al 30 settembre.",
     "witchyFamiliarsText": "Pacchetto di Missioni dei Familiari Stregati",
     "witchyFamiliarsNotes": "Contiene 'Il Re dei Ratti', 'L'Aracnide Ghiacciato', 'Palude della Rana del Disordine'. Disponibile fino al 31 Ottobre.",
     "questGroupLostMasterclasser": "Mistero dei Masterclasser",
diff --git a/website/common/locales/it/subscriber.json b/website/common/locales/it/subscriber.json
index 1d3418e9a9..81d38b24bd 100644
--- a/website/common/locales/it/subscriber.json
+++ b/website/common/locales/it/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Il tuo abbonameno è stato disdetto",
     "choosePaymentMethod": "Scegli il metodo di pagamento",
     "buyGemsSupportsDevs": "Comprare Gemme supporta gli sviluppatori e aiuta Habitica a continuare a funzionare",
-    "support": "SUPPORTA",
+    "support": "Supporta",
     "gemBenefitLeadin": "Cosa puoi comprare con le Gemme?",
     "gemBenefit1": "Costumi unici e alla moda per il tuo avatar.",
     "gemBenefit2": "Sfondi per immergere il tuo avatar nel mondi di Habitica!",
diff --git a/website/common/locales/ja/front.json b/website/common/locales/ja/front.json
index 6a089706d3..b73f2bd4b7 100644
--- a/website/common/locales/ja/front.json
+++ b/website/common/locales/ja/front.json
@@ -5,7 +5,7 @@
     "accept2Terms": "そして",
     "chores": "雑用",
     "clearBrowserData": "ブラウザデータを削除する",
-    "communityExtensions": "<a href='https://habitica.fandom.com/ja/wiki/拡張機能・アドオン・カスタマイズ' target='_blank'>アドオンと拡張機能</a>",
+    "communityExtensions": "アドオンと拡張機能",
     "communityFacebook": "Facebook",
     "companyAbout": "機能説明",
     "companyBlog": "ブログ",
diff --git a/website/common/locales/ja/gear.json b/website/common/locales/ja/gear.json
index 9bcf0c4211..d6552bd7be 100644
--- a/website/common/locales/ja/gear.json
+++ b/website/common/locales/ja/gear.json
@@ -2696,7 +2696,7 @@
     "shieldMystery202209Notes": "魔術の知識を身につけるには多くの本を読まなければいけませんが、その過程はきっと楽しいはず。効果なし。2022年9月有料会員アイテム。",
     "shieldMystery202209Text": "山積みの魔法書",
     "eyewearArmoireComedyMaskText": "喜劇の仮面",
-    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しよう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
+    "eyewearArmoireComedyMaskNotes": "さあ陽気に！この古風な仮面は、汝の幸せな心のためにある。その陽気さと賑わいを演じ、歓待し、舞台の上で表現しましょう。体質が<%= con %>上がります。ラッキー宝箱：演劇の仮面セット（2個中1個目のアイテム）。",
     "eyewearArmoireTragedyMaskText": "悲劇の仮面",
-    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しよう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
+    "eyewearArmoireTragedyMaskNotes": "何たる悲しみ！ここにあるのは重厚な仮面。汝は哀れを演じる者。舞台上で気取って歩き、頭を抱え、苦悩と悲痛を表現しましょう。知能が<%= int %>上がります。ラッキー宝箱：演劇の仮面セット（2個中2個目のアイテム）。"
 }
diff --git a/website/common/locales/ja/questscontent.json b/website/common/locales/ja/questscontent.json
index af8d99c25c..215a921eeb 100644
--- a/website/common/locales/ja/questscontent.json
+++ b/website/common/locales/ja/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "カバ(たまご)",
     "questHippoUnlockText": "市場でカバのたまごを買えるようになります",
     "farmFriendsText": "「まきばの友達」クエストセット",
-    "farmFriendsNotes": "「モー変異した牛」「悪夢を乗りこなせ」「雷雄羊」のセット。8月31日まで購入できます。",
+    "farmFriendsNotes": "「モー変異した牛」「悪夢を乗りこなせ」「雷雄羊」のセット。9月30日まで購入できます。",
     "witchyFamiliarsText": "「魔女の使い魔」クエストセット",
     "witchyFamiliarsNotes": "「ネズミ王」「氷のクモ」「散らかしカエルの沼」のセット。10月31日まで購入できます。",
     "questGroupLostMasterclasser": "クラス・マスターの謎",
diff --git a/website/common/locales/pt_BR/front.json b/website/common/locales/pt_BR/front.json
index 00ec80fd2c..37322244b5 100644
--- a/website/common/locales/pt_BR/front.json
+++ b/website/common/locales/pt_BR/front.json
@@ -5,12 +5,12 @@
     "accept2Terms": "e com a",
     "chores": "Afazeres",
     "clearBrowserData": "Limpar Dados do Navegador",
-    "communityExtensions": "<a href='https://habitica.fandom.com/pt-br/wiki/Extens%C3%B5es,_Add-ons_e_Personaliza%C3%A7%C3%B5es' target='_blank'>Add-ons e Extensões</a>",
+    "communityExtensions": "Complementos e Extensões",
     "communityFacebook": "Facebook",
     "companyAbout": "Como funciona",
     "companyBlog": "Blog",
-    "companyContribute": "Contribuir",
-    "companyDonate": "Doar",
+    "companyContribute": "Contribuindo para o Habitica",
+    "companyDonate": "Doar para o Habitica",
     "forgotPassword": "Esqueceu a senha?",
     "emailNewPass": "Enviar por Email uma Nova Senha",
     "forgotPasswordSteps": "Digite seu nome de usuário ou o endereço de e-mail que você usou para registrar sua conta no Habitica.",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Quer gamificar sua vida?",
     "marketing4Lead3-2": "Interessado em coordenar um grupo em educação, bem-estar e outros?",
     "marketing4Lead3Title": "Gamifique Tudo",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Aplicativo Android",
+    "mobileIOS": "Aplicativo iOS",
     "oldNews": "Notícias",
     "newsArchive": "Arquivo de notícias na Wikia (multilíngue)",
     "setNewPass": "Defina a Nova Senha",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Senhas devem possuir 8 caracteres ou mais.",
     "enterHabitica": "Entrar no Habitica",
     "emailUsernamePlaceholder": "Ex: habitilebre ou grifo@exemplo.com",
-    "socialAlreadyExists": "Este login já está vinculado a uma conta existente do Habitica."
+    "socialAlreadyExists": "Este login já está vinculado a uma conta existente do Habitica.",
+    "footerProduct": "Produto"
 }
diff --git a/website/common/locales/pt_BR/gear.json b/website/common/locales/pt_BR/gear.json
index 484b60a3e5..c021bccd96 100644
--- a/website/common/locales/pt_BR/gear.json
+++ b/website/common/locales/pt_BR/gear.json
@@ -125,9 +125,9 @@
     "weaponSpecialSpringRogueText": "Garras de Gancho",
     "weaponSpecialSpringRogueNotes": "Ótimo para escalar altos prédios, e também para rasgar carpetes. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2014.",
     "weaponSpecialSpringWarriorText": "Espada de Cenoura",
-    "weaponSpecialSpringWarriorNotes": "Essa poderosa espada pode cortar inimigos com facilidade! Também serve como um delicioso lanche no meio das batalhas. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2014.",
+    "weaponSpecialSpringWarriorNotes": "Essa poderosa espada pode cortar inimigos com facilidade! Também serve como um delicioso lanche no meio das batalhas. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "weaponSpecialSpringMageText": "Cajado de Queijo-Suíço",
-    "weaponSpecialSpringMageNotes": "Apenas os roedores mais poderosos podem confrontar sua fome para empunhar esse potente cajado. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento Edição Limitada de Primavera 2014.",
+    "weaponSpecialSpringMageNotes": "Apenas os roedores mais poderosos podem confrontar sua fome para empunhar esse potente cajado. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "weaponSpecialSpringHealerText": "Osso Encantador",
     "weaponSpecialSpringHealerNotes": "PEGA! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "weaponSpecialSummerRogueText": "Cutelo de Pirata",
@@ -159,9 +159,9 @@
     "weaponSpecialSpring2015WarriorText": "Clava de Osso",
     "weaponSpecialSpring2015WarriorNotes": "É uma legítima clava de osso para cachorrinhos super ferozes e definitivamente não um brinquedo de mastigar que a Feiticeira Sazonal te deu porque quem é um bom garoto? Queeem é um bom garoto?? Você!!! Você é um bom garoto!!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "weaponSpecialSpring2015MageText": "Varinha de Mágico",
-    "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015MageNotes": "Invoque uma cenoura para si mesmo com essa elegante varinha. Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSpring2015HealerText": "Matraca de Gato",
-    "weaponSpecialSpring2015HealerNotes": "Quando você a sacode, faz um clique-claque fascinante que manteria QUALQUER UM entretido por horas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "weaponSpecialSpring2015HealerNotes": "Quando você a sacode, faz um clique-claque fascinante que manteria QUALQUER UM entretido por horas. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "weaponSpecialSummer2015RogueText": "Coral Atirador",
     "weaponSpecialSummer2015RogueNotes": "Este parente do coral de fogo tem a habilidade de expelir seu veneno através da água. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2015.",
     "weaponSpecialSummer2015WarriorText": "Peixe-Espada Solar",
@@ -187,11 +187,11 @@
     "weaponSpecialWinter2016HealerText": "Canhão de Confetes",
     "weaponSpecialWinter2016HealerNotes": "ÊEEEEEEEEEEE!!!!!!! QUE COMECEM AS MARAVILHAS DE INVERNO!!!!!!!! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "weaponSpecialSpring2016RogueText": "Bolas de Fogo",
-    "weaponSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "weaponSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "weaponSpecialSpring2016WarriorText": "Marreta de Queijo",
     "weaponSpecialSpring2016WarriorNotes": "Ninguém tem tantos amigos quanto o rato com queijo mussarela. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "weaponSpecialSpring2016MageText": "Cajado de Sinos",
-    "weaponSpecialSpring2016MageNotes": "Abra-Ga-ta-Bra! Tão deslumbrante, você poderia se hipnotizar! Ooh... Ele brilha... Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "weaponSpecialSpring2016MageNotes": "Abra-Ga-ta-Bra! Tão deslumbrante, você poderia se hipnotizar! Ooh... Ele brilha... Aumenta Inteligência em <%= int %> e Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "weaponSpecialSpring2016HealerText": "Varinha de Flor da Primavera",
     "weaponSpecialSpring2016HealerNotes": "Com um aceno e uma piscada, você faz florestas e campos florescerem! Ou acerta ratos problemáticos na cabeça. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "weaponSpecialSummer2016RogueText": "Varinha Elétrica",
@@ -219,7 +219,7 @@
     "weaponSpecialWinter2017HealerText": "Varinha Açucarada",
     "weaponSpecialWinter2017HealerNotes": "Esta varinha pode atingir seus sonhos e te trazer visões de bombons dançantes. Aumenta a inteligência em <%= int %>. Equipamento de inverno da edição limitada 2016-2017.",
     "weaponSpecialSpring2017RogueText": "Cenouspada",
-    "weaponSpecialSpring2017RogueNotes": "Essas lâminas farão das tarefas algo fácil. E também servem para cortar vegetais! Yum! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "weaponSpecialSpring2017RogueNotes": "Essas lâminas farão das tarefas algo fácil. E também servem para cortar vegetais! Yum! Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "weaponSpecialSpring2017WarriorText": "Chicote Emplumado",
     "weaponSpecialSpring2017WarriorNotes": "Esse poderoso chicote servirá para dominar a tarefa mais difícil de todas. Mas... ela também é... muito DIVERTIDA E DISPERSANTE!! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "weaponSpecialSpring2017MageText": "Varinha Mágica Elegante",
@@ -477,11 +477,11 @@
     "armorSpecialGaymerxText": "Armadura do Guerreiro Arco-Íris",
     "armorSpecialGaymerxNotes": "Para celebrar a Conferência GaymerX, esta armadura especial foi decorada com uma colorida e radiante estampa arco-íris! A GaymerX é uma conferência de games que celebra a comunidade LGBT e jogos e é aberta para todos.",
     "armorSpecialSpringRogueText": "Traje Elegante de Gato",
-    "armorSpecialSpringRogueNotes": "Impecavelmente arrumado. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringRogueNotes": "Impecavelmente arrumado. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringWarriorText": "Armadura de Trevo Metálico",
-    "armorSpecialSpringWarriorNotes": "Suave como um trevo, forte como aço! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringWarriorNotes": "Suave como um trevo, forte como aço! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringMageText": "Túnica de Roedor",
-    "armorSpecialSpringMageNotes": "Ratos são um barato! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "armorSpecialSpringMageNotes": "Ratos são um barato! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "armorSpecialSpringHealerText": "Túnica de Filhote Felpudo",
     "armorSpecialSpringHealerNotes": "Quente e confortável, mas protege seu dono do perigo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "armorSpecialSummerRogueText": "Túnica de Pirata",
@@ -511,9 +511,9 @@
     "armorSpecialSpring2015RogueText": "Túnicas Guinchantes",
     "armorSpecialSpring2015RogueNotes": "Peludo, macio e definitivamente não inflamável. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "armorSpecialSpring2015WarriorText": "Cuidado: Armadura",
-    "armorSpecialSpring2015WarriorNotes": "Apenas o cachorinho mais feroz pode ser tão peludo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "armorSpecialSpring2015WarriorNotes": "Apenas o cachorinho mais feroz pode ser tão peludo. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "armorSpecialSpring2015MageText": "Fantasia de Coelho do Mágico",
-    "armorSpecialSpring2015MageNotes": "O seu casaco combina com seu rabinho! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "armorSpecialSpring2015MageNotes": "O seu casaco combina com seu rabinho! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "armorSpecialSpring2015HealerText": "Fantasia Confortante de Gato",
     "armorSpecialSpring2015HealerNotes": "Essa macia fantasia de gato é confortável e reconfortante como chá de menta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "armorSpecialSummer2015RogueText": "Cauda de Rubi",
@@ -541,13 +541,13 @@
     "armorSpecialWinter2016HealerText": "Manto de Fada Festivo",
     "armorSpecialWinter2016HealerNotes": "Fadas Festivas enrolam suas asas do corpo em torno de si mesmas para proteção enquanto usam as asas da cabeça para pegar ventos contrários e voar por Habitica a velocidades de até 160 km/h, entregando presentes e pulverizando todos com confetes. Que divertido. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "armorSpecialSpring2016RogueText": "Traje Camuflado Canino",
-    "armorSpecialSpring2016RogueNotes": "Um pequeno filhote sabe escolher um disfarce colorido para se esconder quando tudo é verde e vibrante. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016RogueNotes": "Um pequeno filhote sabe escolher um disfarce colorido para se esconder quando tudo é verde e vibrante. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016WarriorText": "Armadura Poderosa",
-    "armorSpecialSpring2016WarriorNotes": "Embora pequeno, você é feroz! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016WarriorNotes": "Embora pequeno, você é feroz! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016MageText": "Túnica do Imponente Malkin",
-    "armorSpecialSpring2016MageNotes": "Brilhantemente colorido, para que você não seja confundido com um nec-ratomante. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016MageNotes": "Brilhantemente colorido, para que você não seja confundido com um nec-ratomante. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSpring2016HealerText": "Calções de Coelhinho Fofinho",
-    "armorSpecialSpring2016HealerNotes": "Saltando por ai! De colina a colina, curando aqueles que precisam. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "armorSpecialSpring2016HealerNotes": "Saltando por ai! De colina a colina, curando aqueles que precisam. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "armorSpecialSummer2016RogueText": "Cauda de Enguia",
     "armorSpecialSummer2016RogueNotes": "Essas eletrificantes vestes transformam seu usuário em um verdadeiro Gatuno Enguia! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2016.",
     "armorSpecialSummer2016WarriorText": "Cauda de Tubarão",
@@ -577,9 +577,9 @@
     "armorSpecialSpring2017WarriorText": "Armadura Fofincrível",
     "armorSpecialSpring2017WarriorNotes": "Essa armadura extravagante é tão brilhante quanto seu melhor casaco, mas com resistência aumentada a ataques. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "armorSpecialSpring2017MageText": "Túnicas de Ilusionista Canino",
-    "armorSpecialSpring2017MageNotes": "Mágica pelo design, fofa por opção. Aumenta Inteligência em <%= int %>. Equipamento Edição Limitada 2017.",
+    "armorSpecialSpring2017MageNotes": "Mágica pelo design, fofa por opção. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSpring2017HealerText": "Túnica do Descanso",
-    "armorSpecialSpring2017HealerNotes": "A suavidade dessa túnica conforta você assim como qualquer pessoa que precisa da sua ajuda de cura! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "armorSpecialSpring2017HealerNotes": "A suavidade dessa túnica conforta você assim como qualquer pessoa que precisa da sua ajuda de cura! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "armorSpecialSummer2017RogueText": "Cauda de Dragão do Mar",
     "armorSpecialSummer2017RogueNotes": "Esta capa colorida transforma o utilizador num Dragão do Mar de verdade! Aumenta Percepção em <%= per %>. Equipamento Edição Limitada, Verão de 2017.",
     "armorSpecialSummer2017WarriorText": "Armadura de Areia",
@@ -911,11 +911,11 @@
     "headSpecialSpringRogueText": "Máscara Furtiva de Gatinho",
     "headSpecialSpringRogueNotes": "Ninguém NUNCA adivinhará que você é um gatuno! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "headSpecialSpringWarriorText": "Capacete de Trevo Metálico",
-    "headSpecialSpringWarriorNotes": "Soldado a partir de belos trevos do campo, esse capacete resiste até mesmo aos mais poderosos golpes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringWarriorNotes": "Soldado a partir de belos trevos do campo, esse capacete resiste até mesmo aos mais poderosos golpes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSpringMageText": "Chapéu de Queijo-Suíço",
-    "headSpecialSpringMageNotes": "Esse chapéu possui muito poder mágico! Tente não mordê-lo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringMageNotes": "Esse chapéu possui muito poder mágico! Tente não mordê-lo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSpringHealerText": "Coroa da Amizade",
-    "headSpecialSpringHealerNotes": "Essa coroa simboliza lealdade e companheirismo. Afinal, um cachorro é o melhor amigo de um aventureiro! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headSpecialSpringHealerNotes": "Essa coroa simboliza lealdade e companheirismo. Afinal, um cachorro é o melhor amigo de um aventureiro! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "headSpecialSummerRogueText": "Chapéu de Pirata",
     "headSpecialSummerRogueNotes": "Apenas os mais produtivos piratas podem usar este belo chapéu. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão de 2014.",
     "headSpecialSummerWarriorText": "Bandana de Marujo",
@@ -945,9 +945,9 @@
     "headSpecialSpring2015RogueText": "Elmo à Prova de Fogo",
     "headSpecialSpring2015RogueNotes": "Fogo? HA! Você guincha ferozmente na cara do fogo! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "headSpecialSpring2015WarriorText": "Cuidado: Elmo",
-    "headSpecialSpring2015WarriorNotes": "Cuidado com o Elmo! Só um cachorrinho feroz pode usá-lo. Pare de rir. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headSpecialSpring2015WarriorNotes": "Cuidado com o Elmo! Só um cachorrinho feroz pode usá-lo. Pare de rir. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "headSpecialSpring2015MageText": "Chapéu de Ilusionista",
-    "headSpecialSpring2015MageNotes": "O que veio primeiro, o coelhinho ou o chapéu? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headSpecialSpring2015MageNotes": "O que veio primeiro, o coelhinho ou o chapéu? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "headSpecialSpring2015HealerText": "Coroa Confortante",
     "headSpecialSpring2015HealerNotes": "A pérola no centro dessa coroa acalma e conforta aqueles ao seu redor. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "headSpecialSummer2015RogueText": "Chapéu dos Renegados",
@@ -977,13 +977,13 @@
     "headSpecialWinter2016HealerText": "Elmo Alado de Fada",
     "headSpecialWinter2016HealerNotes": "Essasasasbatemtãorápidoquenãodápraver! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2015 e 2016.",
     "headSpecialSpring2016RogueText": "Máscara de Cachorrinho Bonitinho",
-    "headSpecialSpring2016RogueNotes": "Ooun, que cachorrinho fofo! Venha aqui e me deixe fazer carinho em você. ...Ei, onde todo meu Ouro foi parar? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headSpecialSpring2016RogueNotes": "Ooun, que cachorrinho fofo! Venha aqui e me deixe fazer carinho em você. ...Ei, onde todo meu Ouro foi parar? Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "headSpecialSpring2016WarriorText": "Elmo de Rato Guarda",
     "headSpecialSpring2016WarriorNotes": "Nunca mais você será acertado na cabeça! Deixe-os tentarem! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "headSpecialSpring2016MageText": "Grande Chapéu de Malkin",
     "headSpecialSpring2016MageNotes": "Vestimenta para colocar você acima dos meros magos simples do mundo. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "headSpecialSpring2016HealerText": "Diadema de Flores",
-    "headSpecialSpring2016HealerNotes": "Ele cintila com o potencial de uma nova vida pronta para florescer. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headSpecialSpring2016HealerNotes": "Ele cintila com o potencial de uma nova vida pronta para florescer. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "headSpecialSummer2016RogueText": "Capacete de Enguia",
     "headSpecialSummer2016RogueNotes": "Espie por frestas de rochas enquanto estiver usando esse elmo discreto. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Verão 2016.",
     "headSpecialSummer2016WarriorText": "Capacete de Tubarão",
@@ -1011,13 +1011,13 @@
     "headSpecialWinter2017HealerText": "Elmo Champagne",
     "headSpecialWinter2017HealerNotes": "Essas pétalas cintilantes concentram sua capacidade intelectual! Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada. Inverno de 2016 e 2017.",
     "headSpecialSpring2017RogueText": "Elmo de Coelhinho Sorrateiro",
-    "headSpecialSpring2017RogueNotes": "Essa máscara vai evitar que a sua fofura te entregue quando você estiver se esgueirando para atacar Tarefas (ou trevos)! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headSpecialSpring2017RogueNotes": "Essa máscara vai evitar que a sua fofura te entregue quando você estiver se esgueirando para atacar Tarefas (ou trevos)! Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSpring2017WarriorText": "Elmo Felino",
-    "headSpecialSpring2017WarriorNotes": "Proteja sua adorável e macia cabeça com este elmo finamente decorado. Aumenta Força em <%= str %>. Equipamento de Edição Limitada, Primavera de 2017.",
+    "headSpecialSpring2017WarriorNotes": "Proteja sua adorável e macia cabeça com este elmo finamente decorado. Aumenta Força em <%= str %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSpring2017MageText": "Chapéu de Conjurador Canino",
     "headSpecialSpring2017MageNotes": "Este chapéu pode te ajudar a conjurar poderosos feitiços... Ou você pode usá-lo apenas para invocar bolas de tênis. Você escolhe. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "headSpecialSpring2017HealerText": "Tiara de Pétalas",
-    "headSpecialSpring2017HealerNotes": "Essa coroa delicada emite o confortante cheiro da Primavera. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada, Primavera de 2017.",
+    "headSpecialSpring2017HealerNotes": "Essa coroa delicada emite o confortante cheiro da Primavera. Aumenta Inteligência em <%= int %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "headSpecialSummer2017RogueText": "Elmo de Dragão do Mar",
     "headSpecialSummer2017RogueNotes": "Esse elmo muda de cor para te ajudar a se misturar com seus arredores. Aumenta Percepção em <%= per %>. Equipamento de Edição Limitada, Verão de 2017.",
     "headSpecialSummer2017WarriorText": "Elmo do Castelo de Areia",
@@ -1321,7 +1321,7 @@
     "shieldSpecialSpringRogueText": "Garras de Gancho",
     "shieldSpecialSpringRogueNotes": "Ótimo para escalar altos prédios e também para rasgar carpetes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "shieldSpecialSpringWarriorText": "Escudo de Ovo",
-    "shieldSpecialSpringWarriorNotes": "Esse escudo nunca racha, não importa o quão forte você bata nele! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
+    "shieldSpecialSpringWarriorNotes": "Esse escudo nunca racha, não importa o quão forte você bata nele! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2014.",
     "shieldSpecialSpringHealerText": "Bola Barulhenta da Proteção Final",
     "shieldSpecialSpringHealerNotes": "Libera um barulho desagradável e contínuo quando mordida, afastando os inimigos para longe. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2014.",
     "shieldSpecialSummerRogueText": "Cutelo de Pirata",
@@ -1345,9 +1345,9 @@
     "shieldSpecialSpring2015RogueText": "Guinchado Explosivo",
     "shieldSpecialSpring2015RogueNotes": "Não deixe o som te enganar - esses explosivos são fortes. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2015.",
     "shieldSpecialSpring2015WarriorText": "Disco de Prato",
-    "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "shieldSpecialSpring2015HealerText": "Travesseiro Estampado",
-    "shieldSpecialSpring2015HealerNotes": "Você pode descansar a cabeça neste travesseiro macio, ou você pode lutar contra ele com suas temíveis garras. Rawr! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2015.",
+    "shieldSpecialSpring2015HealerNotes": "Você pode descansar a cabeça neste travesseiro macio, ou você pode lutar contra ele com suas temíveis garras. Rawr! Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2015.",
     "shieldSpecialSummer2015RogueText": "Coral Atirador",
     "shieldSpecialSummer2015RogueNotes": "Este parente do coral de fogo tem a habilidade de expelir seu veneno através da água. Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2015.",
     "shieldSpecialSummer2015WarriorText": "Escudo de Peixe Sol",
@@ -1369,9 +1369,9 @@
     "shieldSpecialSpring2016RogueText": "Bolas de Fogo",
     "shieldSpecialSpring2016RogueNotes": "Você dominou a bola, a clava e a faca. Agora avance para malabarismo com fogo! Uhuul! Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Primavera de 2016.",
     "shieldSpecialSpring2016WarriorText": "Roda de Queijo",
-    "shieldSpecialSpring2016WarriorNotes": "Você enfrentou diabólicas armadilhas para obter essa comida que aumenta defesa. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "shieldSpecialSpring2016WarriorNotes": "Você enfrentou diabólicas armadilhas para obter essa comida que aumenta defesa. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "shieldSpecialSpring2016HealerText": "Broquel Floral",
-    "shieldSpecialSpring2016HealerNotes": "O Primeiro de Abril diz que este pequeno escudo bloqueará Sementes Brilhantes. Não acredite nele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2016.",
+    "shieldSpecialSpring2016HealerNotes": "O Primeiro de Abril diz que este pequeno escudo bloqueará Sementes Brilhantes. Não acredite nele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2016.",
     "shieldSpecialSummer2016RogueText": "Varinha Elétrica",
     "shieldSpecialSummer2016RogueNotes": "Qualquer um que batalhe com você terá uma surpresa chocante... Aumenta Força em <%= str %>. Equipamento de Edição Limitada. Verão de 2016.",
     "shieldSpecialSummer2016WarriorText": "Dente de Tubarão",
@@ -1393,7 +1393,7 @@
     "shieldSpecialSpring2017RogueText": "Karrotana",
     "shieldSpecialSpring2017RogueNotes": "Essas lâminas irão resolver rápido as tarefas, mas também são úteis para cortar vegetais! Uhmmm! Aumenta Força em <%= str %>. Equipamento de Edição Limitada, Primavera de 2017.",
     "shieldSpecialSpring2017WarriorText": "Escudo de Lã",
-    "shieldSpecialSpring2017WarriorNotes": "Toda fibra deste escudo é trançado com feitiços protetores! Tente não brincar (demais) com ele. Aumenta Constituição em <%= con %>. Equipamento de Primavera de 2017 Edição Limitada.",
+    "shieldSpecialSpring2017WarriorNotes": "Toda fibra deste escudo é trançado com feitiços protetores! Tente não brincar (demais) com ele. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada da Primavera de 2017.",
     "shieldSpecialSpring2017HealerText": "Escudo de Cesta",
     "shieldSpecialSpring2017HealerNotes": "Protetor e também útil para guardar suas várias ervas de cura e acessórios. Aumenta Constituição em <%= con %>. Equipamento de Edição Limitada. Primavera de 2017.",
     "shieldSpecialSummer2017RogueText": "Nadadeiras de Dragão Marinho",
@@ -1618,37 +1618,37 @@
     "headAccessoryBase0Text": "Sem Acessório de Cabeça",
     "headAccessoryBase0Notes": "Sem Acessório de Cabeça.",
     "headAccessorySpecialSpringRogueText": "Orelhas Roxas de Gatinho",
-    "headAccessorySpecialSpringRogueNotes": "Essas orelhas felinas se contraem para detectar ameaças iminentes. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headAccessorySpecialSpringRogueNotes": "Essas orelhas felinas se contraem para detectar ameaças iminentes. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2014.",
     "headAccessorySpecialSpringWarriorText": "Orelhas Verdes de Coelhinho",
     "headAccessorySpecialSpringWarriorNotes": "Orelhas de coelho aguçadas, que detectam cada mordida em uma cenoura. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
     "headAccessorySpecialSpringMageText": "Orelhas Azuis de Ratinho",
     "headAccessorySpecialSpringMageNotes": "Essas orelhas de rato redondas são macias como seda. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
     "headAccessorySpecialSpringHealerText": "Orelhas Amarelas de Cachorrinho",
-    "headAccessorySpecialSpringHealerNotes": "De abano e fofas. Quer brincar? Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2014.",
+    "headAccessorySpecialSpringHealerNotes": "De abano e fofas. Quer brincar? Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2014.",
     "headAccessorySpecialSpring2015RogueText": "Orelhas Amarelas de Ratinho",
     "headAccessorySpecialSpring2015RogueNotes": "Essas orelhas se protegem do som de explosões. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
     "headAccessorySpecialSpring2015WarriorText": "Orelhas Roxas de Cachorrinho",
-    "headAccessorySpecialSpring2015WarriorNotes": "São roxas. São orelhas de cachorro. Não desperdice seu tempo com mais bobagens. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headAccessorySpecialSpring2015WarriorNotes": "São roxas. São orelhas de cachorro. Não desperdice seu tempo com mais bobagens. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2015.",
     "headAccessorySpecialSpring2015MageText": "Orelhas Azuis de Coelhinho",
     "headAccessorySpecialSpring2015MageNotes": "Essas orelhas escutam atentamente, caso em algum lugar um mágico esteja revelando segredos. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
     "headAccessorySpecialSpring2015HealerText": "Orelhas Verdes de Gatinho",
-    "headAccessorySpecialSpring2015HealerNotes": "Essas adoráveis orelhas de gatinho vão deixar os outro verdes de inveja. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2015.",
+    "headAccessorySpecialSpring2015HealerNotes": "Essas adoráveis orelhas de gatinho vão deixar os outro verdes de inveja. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2015.",
     "headAccessorySpecialSpring2016RogueText": "Orelhas Verdes de Cachorrinho",
-    "headAccessorySpecialSpring2016RogueNotes": "Com isto, você pode observar Magos astutos até mesmo quando estão invisíveis! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016RogueNotes": "Com isto, você pode observar Magos astutos até mesmo quando estão invisíveis! Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016WarriorText": "Orelhas Vermelhas de Ratinho",
-    "headAccessorySpecialSpring2016WarriorNotes": "Para melhor escutar sua canção tema pelos clamorosos campos de batalha. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016WarriorNotes": "Para melhor escutar sua canção tema pelos clamorosos campos de batalha. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016MageText": "Orelhas Amarelas de Gatinho",
-    "headAccessorySpecialSpring2016MageNotes": "Estas orelhas afiadas podem detectar o murmurar da Mana no ambiente, ou as passadas silenciosas de um Gatuno. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016MageNotes": "Estas orelhas afiadas podem detectar o murmurar da Mana no ambiente, ou as passadas silenciosas de um Gatuno. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2016HealerText": "Orelhas Roxas de Coelhinho",
-    "headAccessorySpecialSpring2016HealerNotes": "Eles levantam como bandeiras sobre a briga, deixando os outros saberem onde correr por ajuda. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2016.",
+    "headAccessorySpecialSpring2016HealerNotes": "Eles levantam como bandeiras sobre a briga, deixando os outros saberem onde correr por ajuda. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2016.",
     "headAccessorySpecialSpring2017RogueText": "Orelhas Vermelhas de Coelhinho",
-    "headAccessorySpecialSpring2017RogueNotes": "Nenhum som irá escapá-lo graças a essas orelhas. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017RogueNotes": "Nenhum som irá escapá-lo graças a essas orelhas. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessorySpecialSpring2017WarriorText": "Orelhas Azuis de Gatinho",
-    "headAccessorySpecialSpring2017WarriorNotes": "Essas orelhas podem ouvir uma cesta de petiscos felinos ser aberta mesmo no momento mais estrépido de batalha! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017WarriorNotes": "Essas orelhas podem ouvir uma cesta de petiscos felinos ser aberta mesmo no momento mais estrépido de batalha! Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessorySpecialSpring2017MageText": "Orelhas Verde-Azuladas de Cachorrinho",
-    "headAccessorySpecialSpring2017MageNotes": "Você pode ouvir a mágica no ar! Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017MageNotes": "Você pode ouvir a mágica no ar! Não confere benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
     "headAccessorySpecialSpring2017HealerText": "Orelhas Roxas de Ratinho",
-    "headAccessorySpecialSpring2017HealerNotes": "Essas orelhas irão ajudar você a ouvir segredos curadores. Não concede benefícios. Equipamento de Edição Limitada. Primavera de 2017.",
+    "headAccessorySpecialSpring2017HealerNotes": "Essas orelhas irão ajudar você a ouvir segredos curadores. Não confere benefícios. Equipamento de Edição Limitada da Primavera de 2017.",
     "headAccessoryBearEarsText": "Orelhas de Urso",
     "headAccessoryBearEarsNotes": "Estas orelhas te fazem parecer com um corajoso urso! Não concede benefícios.",
     "headAccessoryCactusEarsText": "Orelhas de Cacto",
diff --git a/website/common/locales/pt_BR/limited.json b/website/common/locales/pt_BR/limited.json
index b00dd78f82..b4d0f55090 100644
--- a/website/common/locales/pt_BR/limited.json
+++ b/website/common/locales/pt_BR/limited.json
@@ -2,7 +2,7 @@
     "annoyingFriends": "Amigos(as) Irritantes",
     "annoyingFriendsText": "Foi atingido(a) por bolas de neve <%= count %> vezes por membros do grupo.",
     "alarmingFriends": "Amigos Alarmantes",
-    "alarmingFriendsText": "Foi atingido(a) por bolas de neve <%= count %> vezes pelos membros do grupo.",
+    "alarmingFriendsText": "Foi transformado(a) em fantasma <%= count %> vezes pelos membros do grupo.",
     "agriculturalFriends": "Amigos do Campo",
     "agriculturalFriendsText": "Foi transformado(a) em flor <%= count %> vezes pelos membros do grupo.",
     "aquaticFriends": "Amigos Aquáticos",
diff --git a/website/common/locales/pt_BR/npc.json b/website/common/locales/pt_BR/npc.json
index 9902245cbd..fb3ba3bfbd 100644
--- a/website/common/locales/pt_BR/npc.json
+++ b/website/common/locales/pt_BR/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Nova atualização da Bailey!",
     "tellMeLater": "Lembrar mais tarde",
     "dismissAlert": "Dispensar este alerta",
-    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos programadores voluntários. Obrigado pela sua generosidade!",
+    "donateText3": "Habitica é um projeto de código aberto que depende do suporte dos nossos usuários. O dinheiro que você gasta em gemas nos ajuda a manter os servidores funcionando, manter uma pequena equipe, desenvolver novas funcionalidades e oferecer incentivos para os nossos voluntários.",
     "card": "Cartão de crédito",
     "paymentMethods": "Comprar usando",
     "paymentSuccessful": "Seu pagamento foi efetuado com sucesso!",
@@ -130,5 +130,6 @@
     "limitedAvailabilityDays": "Disponível por <%= days %>d <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityHours": "Disponível por <%= hours %>h <%= minutes %>m",
     "limitedAvailabilityMinutes": "Disponível por <%= minutes %>m <%= seconds %>s",
-    "amountExp": "<%= amount %> de EXP"
+    "amountExp": "<%= amount %> de EXP",
+    "helpSupportHabitica": "Ajude Apoiando o Habitica"
 }
diff --git a/website/common/locales/pt_BR/questscontent.json b/website/common/locales/pt_BR/questscontent.json
index 45a5d02eee..9c0ac2fb10 100644
--- a/website/common/locales/pt_BR/questscontent.json
+++ b/website/common/locales/pt_BR/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Hipopótamo (Ovo)",
     "questHippoUnlockText": "Desbloqueia Ovos de Hipopótamo para compra no mercado",
     "farmFriendsText": "Pacote de Missões Amigos da Fazenda",
-    "farmFriendsNotes": "Contém 'A Vaca Muutante', 'Cavalgue o Pesadelo' e 'O Carneiro do Trovão'. Disponível até 31 de Agosto.",
+    "farmFriendsNotes": "Contém 'A Vaca Muutante', 'Cavalgue o Pesadelo' e 'O Carneiro do Trovão'. Disponível até 30 de setembro.",
     "witchyFamiliarsText": "Pacote de Missões Familiares Bruxos",
     "witchyFamiliarsNotes": "Contém \"O Rei Rato\", \"O Aracnídeo de Gelo\" e \"Pântano do Sapo Bagunceiro\". Disponível até 31 de outubro.",
     "questGroupLostMasterclasser": "Mistério dos Mestres de Classe",
diff --git a/website/common/locales/pt_BR/subscriber.json b/website/common/locales/pt_BR/subscriber.json
index e53d31de20..05a2eaae08 100644
--- a/website/common/locales/pt_BR/subscriber.json
+++ b/website/common/locales/pt_BR/subscriber.json
@@ -120,7 +120,7 @@
     "paypalCanceled": "Sua assinatura foi cancelada",
     "choosePaymentMethod": "Escolha seu método de pagamento",
     "buyGemsSupportsDevs": "A compra de Gemas dá o apoio necessário para os desenvolvedores continuarem movimentando o Habitica",
-    "support": "SUPORTE",
+    "support": "Suporte",
     "gemBenefitLeadin": "O que você pode comprar com Gemas?",
     "gemBenefit1": "Trajes únicos e elegantes para o seu avatar.",
     "gemBenefit2": "Cenários para a imersão do seu avatar no mundo do Habitica!",
diff --git a/website/common/locales/ru/faq.json b/website/common/locales/ru/faq.json
index 821dd55e4e..3abd34643b 100644
--- a/website/common/locales/ru/faq.json
+++ b/website/common/locales/ru/faq.json
@@ -55,5 +55,5 @@
     "iosFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "androidFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВо), задайте его в чате Таверны через Меню > Таверна! Мы с радостью поможем вам.",
     "webFaqStillNeedHelp": "Если у вас есть вопрос, которого нет в этом списке или в [ЧаВо на Вики](https://habitica.fandom.com/ru/wiki/ЧаВО), задайте его в [Гильдии новичков](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! Мы с радостью поможем вам.",
-    "faqQuestion13": "Что такое групповые тарифы?"
+    "faqQuestion13": "Что такое групповые планы?"
 }
diff --git a/website/common/locales/ru/front.json b/website/common/locales/ru/front.json
index dfc37e84c4..f946e8f47f 100644
--- a/website/common/locales/ru/front.json
+++ b/website/common/locales/ru/front.json
@@ -5,11 +5,11 @@
     "accept2Terms": "и",
     "chores": "Домашние дела",
     "clearBrowserData": "Очистить данные браузера",
-    "communityExtensions": "<a href='https://habitica.fandom.com/ru/wiki/Персонализация' target='_blank'>Персонализация</a>",
+    "communityExtensions": "Персонализация",
     "communityFacebook": "Facebook",
     "companyAbout": "Как это работает",
     "companyBlog": "Блог",
-    "companyContribute": "Сделать вклад",
+    "companyContribute": "Вклад в Habitica",
     "companyDonate": "Пожертвования",
     "forgotPassword": "Забыли пароль?",
     "emailNewPass": "Отправьте мне ссылку на сброс пароля",
@@ -53,8 +53,8 @@
     "marketing4Lead3-1": "Хотите жить играючи?",
     "marketing4Lead3-2": "Заинтересованы в создании группы в сферах образования, здоровья или других?",
     "marketing4Lead3Title": "Игра во всём",
-    "mobileAndroid": "Android",
-    "mobileIOS": "iOS",
+    "mobileAndroid": "Приложение для Android",
+    "mobileIOS": "Приложение для iOS",
     "oldNews": "Новости",
     "newsArchive": "Архив новостей на вики (мультиязычный)",
     "setNewPass": "Введите новый пароль",
@@ -187,5 +187,6 @@
     "minPasswordLength": "Пароль должен состоять из 8 или более символов.",
     "enterHabitica": "Войти в Habitica",
     "emailUsernamePlaceholder": "Например, habitrabbit или gryphon@example.com",
-    "socialAlreadyExists": "Этот логин социальной сети уже привязан к существующему аккаунту Хабитики."
+    "socialAlreadyExists": "Этот логин социальной сети уже привязан к существующему аккаунту Хабитики.",
+    "footerProduct": "Продукт"
 }
diff --git a/website/common/locales/ru/gear.json b/website/common/locales/ru/gear.json
index eae64d779d..33c31d33b6 100644
--- a/website/common/locales/ru/gear.json
+++ b/website/common/locales/ru/gear.json
@@ -2688,5 +2688,14 @@
     "weaponMystery202209Text": "Руководство по магии",
     "weaponMystery202209Notes": "Эта книга станет вашим путеводителем на пути к созданию магии. Бонусов не дает. Подарок подписчикам сентября 2022.",
     "shieldMystery202209Notes": "Чтобы приобрести знания в области колдовства, нужно много читать, но вы непременно будете наслаждаться учёбой. Бонусов не дает. Подарок подписчикам сентября 2022.",
-    "shieldMystery202209Text": "Гора волшебных книг"
+    "shieldMystery202209Text": "Гора волшебных книг",
+    "headSpecialSpring2022RogueNotes": "Надев эту маску, вы станете умным, как сорока. Возможно вы даже сможете иммитировать ее стрекотание. Увеличивает восприятие на <%= per %>. Ограниченный выпуск весны 2022.",
+    "eyewearMystery202204BNotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
+    "eyewearArmoireComedyMaskText": "Комедийная Маска",
+    "eyewearArmoireComedyMaskNotes": "Весело! Вот причудливая маска для твоего счастливого сердца, возвещающая радость, выражающая веселье и счастье на сцене. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Набор театральных масок (предмет 1 из 2).",
+    "eyewearArmoireTragedyMaskText": "Трагическая маска",
+    "eyewearMystery202204ANotes": "Какое у вас сегодня настроение? Выражайте себя с помощью этих забавных экранов! Бонусов не дает. Подарок подписчикам апреля 2022.",
+    "eyewearArmoireTragedyMaskNotes": "Увы! Здесь лежит грузная маска для твоего бедного актера, который мечется, выражая горе и печаль на сцене. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор театральных масок (предмет 2 из 2).",
+    "headMystery202207Text": "Желейный шлем",
+    "armorMystery202207Text": "Желейная броня"
 }
diff --git a/website/common/locales/ru/groups.json b/website/common/locales/ru/groups.json
index 1189eb7352..9b262aeb70 100644
--- a/website/common/locales/ru/groups.json
+++ b/website/common/locales/ru/groups.json
@@ -394,5 +394,12 @@
     "lastCompleted": "Последнее выполненное",
     "newGroupsBullet06": "Просмотр статуса задания позволяет быстро увидеть, кто его выполнил",
     "newGroupsBullet07": "Включите функцию отображения общих задач на вашей персональной доске задач",
-    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач"
+    "newGroupsBullet08": "Лидер группы и менеджеры могут быстро добавлять задачи из верхней части столбцов задач",
+    "newGroupsBullet09": "Общую задачу можно вернуть в работу, чтобы показать, что она еще нуждается в доработке",
+    "newGroupsBullet10": "Статус назначения определяет условие выполнения:",
+    "newGroupsBullet10a": "<strong>Оставьте задачу неназначенной</strong>, если любой из участников может ее выполнить",
+    "newGroupsBullet10b": "<strong>Назначьте задачу одному участнику</strong>, чтобы только он мог ее выполнить",
+    "newGroupsBullet10c": "<strong>Назначьте задачу нескольким участникам</strong>, если им всем нужно её выполнить",
+    "newGroupsVisitFAQ": "Посетите <a href='/static/faq#group-plans' target='_blank'>ЧаВо</a> из выпадающего меню \"Помощь\" для получения дополнительной информации.",
+    "newGroupsEnjoy": "Надеемся вам понравиться опыт работы с новыми групповым планами!"
 }
diff --git a/website/common/locales/ru/npc.json b/website/common/locales/ru/npc.json
index f83359a545..a46ef31a45 100644
--- a/website/common/locales/ru/npc.json
+++ b/website/common/locales/ru/npc.json
@@ -81,7 +81,7 @@
     "newBaileyUpdate": "Обновление от Бэйли!",
     "tellMeLater": "Напомнить позже",
     "dismissAlert": "Скрыть эти вести",
-    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим программистам-добровольцам. Благодарим вас за щедрость!",
+    "donateText3": "Habitica – это проект с открытым исходным кодом, зависящий от поддержки своих пользователей. Деньги, которые вы тратите на покупку самоцветов, помогают нам поддерживать сервера в рабочем состоянии, сохранять небольшой штат сотрудников, разрабатывать новые функции и давать стимул нашим волонтерам.",
     "card": "Пластиковой карточкой",
     "paymentMethods": "Приобрести с использованием",
     "paymentSuccessful": "Платеж прошел успешно!",
diff --git a/website/common/locales/ru/questscontent.json b/website/common/locales/ru/questscontent.json
index 745d2cc895..7c2eec8d9e 100644
--- a/website/common/locales/ru/questscontent.json
+++ b/website/common/locales/ru/questscontent.json
@@ -513,7 +513,7 @@
     "questHippoDropHippoEgg": "Бегемот (яйцо)",
     "questHippoUnlockText": "Позволяет покупать на рынке бегемота в яйце",
     "farmFriendsText": "Набор квестов «Друзья фермера»",
-    "farmFriendsNotes": "Содержит квесты «Корова-муутант», «Прокатись на Лошмаре!» и «Грозовой баран». Доступен до 31 августа.",
+    "farmFriendsNotes": "Содержит квесты «Корова-муутант», «Прокатись на Лошмаре!» и «Грозовой баран». Доступен до 30 сентября.",
     "witchyFamiliarsText": "Набор квестов «Фамильяры колдуньи»",
     "witchyFamiliarsNotes": "Содержит квесты «Крысиный король», Ледяной Арахнид» и «Болото Лягушки Беспорядка». Доступен до 31 октября.",
     "questGroupLostMasterclasser": "Тайна ордена Мастеров",
diff --git a/website/common/locales/ru/subscriber.json b/website/common/locales/ru/subscriber.json
index 0346647337..e9f75d2fec 100644
--- a/website/common/locales/ru/subscriber.json
+++ b/website/common/locales/ru/subscriber.json
@@ -11,7 +11,7 @@
     "exclusiveJackalopePet": "Эксклюзивный питомец",
     "giftSubscription": "Хотите подарить преимущества подписки кому-то?",
     "giftSubscriptionText4": "Спасибо за поддержку Habitica!",
-    "groupPlans": "Групповые тарифы",
+    "groupPlans": "Групповые планы",
     "subscribe": "Подписка",
     "nowSubscribed": "Вы оформили подписку на Habitica!",
     "cancelSub": "Отмена подписки",
diff --git a/website/common/locales/uk/communityguidelines.json b/website/common/locales/uk/communityguidelines.json
index 4825968f33..91a4a59fe2 100644
--- a/website/common/locales/uk/communityguidelines.json
+++ b/website/common/locales/uk/communityguidelines.json
@@ -31,7 +31,7 @@
     "commGuidePara029": "<strong>Публічні ґільдії дуже схожі на таверну, за винятком того, що замість того, щоб бути спілкуватись на загальні теми, вони мають конкретну</strong>. Чат публічної ґільдії має зосередитися на цій темі. Наприклад, члени ґільдії \"Майстри слова\" можуть бути розчаровані, якщо розмова раптом зосередиться на садівництві, а не на письмі, а ґільдія \"Любителі драконів\" може не виявляти інтересу до розшифровки стародавніх рун. Деякі ґільдії ставляться до цього більш толерантно, ніж інші, але загалом <strong>намагайтеся залишатися в темі</strong>!",
     "commGuidePara031": "Деякі публічні ґільдії міститимуть делікатні теми, такі як депресія, релігія, політика тощо. Це нормально, якщо розмови в них не порушують жодних положень та умов чи Правил публічного простору, і якщо вони залишаються на темі.",
     "commGuidePara033": "<strong>Публічні ґільдії НЕ можуть містити вміст для аудиторії віком понад 18 років. Якщо вони планують регулярно обговорювати чутливу інформацію, вони повинні вказати це в описі ґільдії</strong>. Це робиться для того, щоб Habitica була безпечною та комфортною для всіх.",
-    "commGuidePara035": "<strong>Якщо у ґільдії, про яку йдеться, є різні чутливі питання, з повагою до ваших співвітчизників-габітян слід розмістити свій коментар за попередженням (наприклад, \"Попередження: посилання на самоушкодження\")</strong>. Вони можуть бути охарактеризовані як попередження про тригер та/або примітки щодо вмісту, і ґільдії можуть мати власні правила на додаток до наведених тут. Якщо можливо, скористайтеся <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a>, щоб приховати потенційно конфіденційний вміст під розривами рядків, щоб усі бажаючі щоб уникнути читання, можна прокрутити його, не побачивши вмісту. Співробітники та модератори Habitica можуть видаляти цей матеріал на свій розсуд.",
+    "commGuidePara035": "<strong>Якщо у ґільдії, про яку йдеться, є різні чутливі питання, з повагою до ваших співвітчизників-габітиканців слід розмістити свій коментар за попередженням (наприклад, \"Попередження: посилання на самоушкодження\")</strong>. Вони можуть бути охарактеризовані як попередження про тригер та/або примітки щодо вмісту, і ґільдії можуть мати власні правила на додаток до наведених тут. Якщо можливо, скористайтеся <a href='https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet' target='_blank'>markdown</a>, щоб приховати потенційно конфіденційний вміст під розривами рядків, щоб усі бажаючі щоб уникнути читання, можна прокрутити його, не побачивши вмісту. Співробітники та модератори Habitica можуть видаляти цей матеріал на свій розсуд.",
     "commGuidePara036": "Крім того, делікатний матеріал має бути актуальним – згадування про самоушкодження в ґільдії, зосередженій на боротьбі з депресією, може мати сенс, але, мабуть, менш доречно в музичній ґільдії. Якщо ви бачите, що хтось неодноразово порушує ці правила, особливо після кількох запитів, повідомте про ці публікації.",
     "commGuidePara037": "<strong>Жодні ґільдії, публічні чи приватні, не повинні створюватися з метою нападу на будь-яку групу чи особу</strong>. Створення такої гільдії є підставою для миттєвого бану. Боріться зі шкідливими звичками, а не з іншими шукачами пригод!",
     "commGuidePara038": "<strong>Усі випробування таверни та публічних ґільдії також мають відповідати цим правилам</strong>.",
@@ -109,7 +109,7 @@
     "commGuidePara013": "У такій великій спільноті, як Habitica, користувачі приходять і йдуть, і іноді співробітнику чи модератору потрібно скласти свою благородну мантію та розслабитися. Нижче наведено почесних працівників і модераторів. Вони більше не мають повноважень співробітника чи модератора, але ми все одно хочемо вшанувати їхню роботу!",
     "commGuidePara014": "Почесні співробітники та модератори:",
     "commGuideHeadingFinal": "Завершальна секція",
-    "commGuidePara067": "Отже, відважний габітітиканцю, Правила спільноти! Витріть піт зі свого чола та отримайте досвід, прочитавши все це. Якщо у вас виникли запитання чи сумніви щодо Правил спільноти, зв’яжіться з нами за адресою <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, ми завжди раді допомогти прояснити речі.",
+    "commGuidePara067": "Отже, відважний габітиканцю, Правила спільноти! Витріть піт зі свого чола та отримайте досвід, прочитавши все це. Якщо у вас виникли запитання чи сумніви щодо Правил спільноти, зв’яжіться з нами за адресою <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>, ми завжди раді допомогти прояснити речі.",
     "commGuidePara068": "А тепер іди вперед, відважний шукаче пригод, і впорайся з декількома щоденками!",
     "commGuideHeadingLinks": "Корисні посилання",
     "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: Ґільдія, де користувачі можуть ставити запитання!",
diff --git a/website/common/locales/uk/contrib.json b/website/common/locales/uk/contrib.json
index 14eb8f2d72..68b2cd3dc6 100644
--- a/website/common/locales/uk/contrib.json
+++ b/website/common/locales/uk/contrib.json
@@ -1,5 +1,5 @@
 {
-    "playerTiersDesc": "Кольорові імена користувачів, які ви бачите в чаті, представляють рівень учасника. Чим вище рівень, тим більше людина внесла свій внесок у Хабітіка за допомогою мистецтва, коду, спільноти тощо!",
+    "playerTiersDesc": "Кольорові імена користувачів, які ви бачите в чаті, представляють рівень учасника. Чим вище рівень, тим більший людина зробила внесок в Habitica за допомогою мистецтва, коду чи допомоги спільноті тощо!",
     "tier1": "Рівень 1 (друг)",
     "tier2": "Рівень 2 (друг)",
     "tier3": "Рівень 3 (елітний)",
diff --git a/website/common/locales/uk/gear.json b/website/common/locales/uk/gear.json
index c729b05ddd..12e08f5a4e 100644
--- a/website/common/locales/uk/gear.json
+++ b/website/common/locales/uk/gear.json
@@ -1747,7 +1747,7 @@
     "eyewearArmoirePlagueDoctorMaskNotes": "",
     "eyewearArmoireGoofyGlassesText": "",
     "eyewearArmoireGoofyGlassesNotes": "",
-    "twoHandedItem": "",
+    "twoHandedItem": "Дворучна зброя.",
     "weaponSpecialKS2019Text": "Глефа міфічного грифона",
     "weaponSpecialKS2019Notes": "Зігнута, немов дзьоб та кігті грифона, ця пишна древкова зброя надає енергію, коли завдання здаються страшними. Збільшує силу на <%= str %>.",
     "weaponSpecialSpring2019RogueText": "Блискавка",
@@ -1923,7 +1923,7 @@
     "weaponArmoireJugglingBallsText": "Жонглювання м'ячами",
     "armorSpecialSummer2020HealerNotes": "Ви терплячі, як океан, сильні, як течії, такі ж надійні, як і припливи. Збільшує статуру на <%= con %>. Обмежена серія 2020 літнього спорядження.",
     "armorMystery202103Notes": "Ці м’які та вітряні халати ідеально підходять для чаювання під ефектними весняними деревами. Ніякої вигоди не приносить. Березень 2021 предмет підписки.",
-    "weaponArmoireJugglingBallsNotes": "Хабітікани-майстри багатозадачності, тому у вас не повинно виникнути проблем із утриманням усіх цих кульок у повітрі! Збільшує інтелект на <%= int %>. Зачарована шафа: незалежний предмет.",
+    "weaponArmoireJugglingBallsNotes": "Габітиканці - майстри багатозадачності, тому у вас не повинно виникнути проблем із утриманням усіх цих кульок у повітрі! Збільшує інтелект на <%= int %>. Зачарована шафа: незалежний предмет.",
     "armorArmoireBoxArmorText": "Броня коробка",
     "weaponArmoireHappyBannerText": "Щасливий банер",
     "armorSpecialWinter2020HealerText": "Сукня з апельсинової шкірки",
@@ -1961,7 +1961,7 @@
     "armorSpecialFall2019MageNotes": "Його тезку спіткала жахлива доля. Але вас не так просто обдурити! Одягніться в цю мантію легенд, і ніхто вас не перевершить. Збільшує інтелект на <%= int %>. Обмежена серія 2019 осіннього спорядження.",
     "armorMystery202103Text": "Халати для перегляду цвіту",
     "weaponArmoireClubOfClubsText": "Клуб... Клуби",
-    "armorSpecialBirthday2020Notes": "З днем народження, Хабітіка! Одягніть ці епатажні партійні халати, щоб відсвяткувати цей чудовий день. Ніякої вигоди не приносить.",
+    "armorSpecialBirthday2020Notes": "З днем народження, Habitica! Одягніть ці епатажні святкові халати, щоб весело провести цей чудовий день. Не дає жодних бонусів.",
     "armorMystery202007Notes": "Плавайте, перевертайтесь, пірнайте та бігайте з цим красивим і потужним хвостом! Ніякої вигоди не приносить. Предмет підписки за липень 2020 року.",
     "weaponArmoireJadeGlaiveNotes": "Діапазон цієї гліви убереже вас від ваших ворогів! Крім того, ви можете збити речі з високих полиць. Збільшує силу на <%= str %>. Зачарована шафа: набір воїнів з нефриту (предмет 3 із 3).",
     "armorArmoireDuffleCoatNotes": "Подорожуйте стильним морозним царством із цим затишним вовняним пальто. Збільшує статуру та сприйняття на <%= attrs %> кожен. Зачарована шафа: набір дамських пальто (предмет 1 з 2).",
@@ -1987,8 +1987,8 @@
     "weaponArmoireAlchemistsDistillerText": "Дистилятор алхіміка",
     "armorSpecialBirthday2020Text": "Епатажні халати для вечірок",
     "armorArmoireAlchemistsRobeText": "Халат алхіміка",
-    "armorArmoireShadowMastersRobeNotes": "Тканина цього стрункого халата виткана з найтемніших тіней у найглибших печерах Хабітіки. Збільшує статуру на <%= con %>. Зачарована шафа: набір майстрів тіней (предмет 1 з 4).",
-    "armorSpecialBirthday2021Notes": "З днем народження, Хабітіка! Одягніть ці екстравагантні халати для святкування цього чудового дня. Ніякої вигоди не приносить.",
+    "armorArmoireShadowMastersRobeNotes": "Тканина цього стрункого халата виткана з найтемніших тіней у найглибших печерах Habitica. Збільшує витривалість yf <%= con %>. Зачарована шафа: набір майстрів тіней (предмет 1 з 4).",
+    "armorSpecialBirthday2021Notes": "З днем народження, Habitica! Одягніть ці екстравагантні халати для святкування цього чудового дня. Ніякої вигоди не приносить.",
     "weaponArmoireFiddlersBowText": "Скрипальний лук",
     "armorMystery201910Notes": "Ця загадкова броня захистить вас від видимих і невидимих жахів. Ніякої вигоди не приносить. Предмет підписки за жовтень 2019.",
     "armorArmoireMatchMakersApronText": "Фартух сірника",
diff --git a/website/common/locales/uk/groups.json b/website/common/locales/uk/groups.json
index 89aff4426c..b93f79b6bb 100644
--- a/website/common/locales/uk/groups.json
+++ b/website/common/locales/uk/groups.json
@@ -41,7 +41,7 @@
     "sendChat": "Надіслати",
     "group": "Спільнота",
     "groupName": "Назва ватаги",
-    "groupLeader": "Лідер групи",
+    "groupLeader": "Лідер команди",
     "groupID": "ID групи",
     "members": "Учасники",
     "memberList": "Список учасників",
@@ -346,7 +346,7 @@
     "PMCanNotReply": "Ви не можете відповісти на цю розмову",
     "PMUserDoesNotReceiveMessages": "Цей користувач більше не отримує приватних повідомлень",
     "PMDisabled": "Вимкніть приватні повідомлення",
-    "editParty": "Редагувати вечірку",
+    "editParty": "Редагувати команду",
     "joinGuild": "Приєднатись до ґільдії",
     "editGuild": "Редагувати ґільдію",
     "viewDetails": "Переглянути деталі",
diff --git a/website/common/locales/uk/quests.json b/website/common/locales/uk/quests.json
index 811e22aa49..6c97c80732 100644
--- a/website/common/locales/uk/quests.json
+++ b/website/common/locales/uk/quests.json
@@ -58,7 +58,7 @@
     "noActiveQuestToAbort": "Немає активних квестів для їх переривання.",
     "onlyLeaderAbortQuest": "Тільки лідер групи або квесту може перервати його.",
     "questAlreadyRejected": "Ви вже відхилили запрошення на квест.",
-    "cantCancelActiveQuest": "Ви не можете відмінити активний квест, використайте функцію переривання.",
+    "cantCancelActiveQuest": "Ви не можете скасувати активний квест, використайте функцію переривання.",
     "onlyLeaderCancelQuest": "Тільки лідер групи або квесту може відміняти його.",
     "questNotPending": "Немає квесту, котрий можна було б розпочати.",
     "questOrGroupLeaderOnlyStartQuest": "Тільки лідер групи або квесту може почати його",
@@ -73,7 +73,7 @@
     "bossRage": "<%= currentRage %> / <%= maxRage %> Лють",
     "rageStrikes": "Удари люті",
     "questOwner": "Лідер квесту",
-    "cancelQuest": "Відмінити квест",
+    "cancelQuest": "Скасувати квест",
     "backToSelection": "Назад до вибору квесту",
     "yourQuests": "Ваші квести",
     "selectQuestModal": "Оберіть квест",
diff --git a/website/common/locales/uk/questscontent.json b/website/common/locales/uk/questscontent.json
index a15e9888c7..8fda3e008b 100644
--- a/website/common/locales/uk/questscontent.json
+++ b/website/common/locales/uk/questscontent.json
@@ -20,25 +20,25 @@
     "questHedgehogNotes": "Їжаки - веселі тваринки. Вони є одними з найбільш ласкавих домашніх улюбленців, які можуть бути у габітиканців. Але подейкують, якщо погодувати їх молоком після опівночі, вони стають досить дратівливими. І в п’ятдесят разів більшими. На жаль, <strong>InspectorCaracal</strong> зробив саме це. Ой-йой.",
     "questHedgehogCompletion": "Ваш гурт успішно заспокоїв Їжачиху! Вона зменшилася до нормального розміру та пошкутильгала до своїх яєць. Вона щось пищить та викочує деякі свої яйця до Вашого гурту. Будемо сподіватися, що ці їжачки полюблять молочко!",
     "questHedgehogBoss": "Тинозвір",
-    "questHedgehogDropHedgehogEgg": "Яйце їжака",
-    "questHedgehogUnlockText": "Розблоковує яйця їжака для придбання на ринку",
+    "questHedgehogDropHedgehogEgg": "Яйце з їжаком",
+    "questHedgehogUnlockText": "Розблоковує придбання на ринку яєць з їжаком",
     "questGhostStagText": "Дух весни",
     "questGhostStagNotes": "(глибокий вдих) Ах, весна. Пора року, коли колір знову починає наповнювати ландшафт. Зникли холодні засніжені горби зими. Там, де колись стояв мороз, місце займає яскраве життя рослин. Соковито зелене листя заливає дерева, трава повертається до колишнього яскравого відтінку, веселка квітів здіймається вздовж рівнини, а білий містичний туман вкриває землю! ... Зачекайте. Містичний туман? «Ні, — з побоюванням каже <strong>@InspectorCaracal</strong>, — здається, що причиною цього туману є якийсь дух. О, ні. Він мчить прямо на вас».",
-    "questGhostStagCompletion": "Дух, здається, був здоровий, потім він почав принюхуватися до землі. Спокійний голос огортає Ваш гурт. „Даруйте за мою неґречність. Я тільки-но прокинувся від свого сну, і ще не всі клепки повернулись на свої місця. Будь ласка, візьміть це на знак мого вибачення.“ Купка яєць з'являється на траві перед духом. Без жодного слова дух утікає далі до лісу, а у місцях, де він пробігає, оживають квіти.",
+    "questGhostStagCompletion": "Дух, здається, зовсім не ушкоджений, починає принюхуватися до землі. Спокійним голос він звертається до вашої команди. \"Даруйте за мою неґречність. Я тільки-но прокинувся від свого сну, і ще не всі клепки повернулись на свої місця. Будь ласка, візьміть це на знак мого вибачення\". Купка яєць з'являється на траві перед ним. Без жодного слова дух біжить до лісу, а у місцях, де він пробігає, проростають квіти.",
     "questGhostStagBoss": "Олень-Привид",
-    "questGhostStagDropDeerEgg": "Яйце оленя",
-    "questGhostStagUnlockText": "Розблоковує оленячі яйця для придбання на ринку",
+    "questGhostStagDropDeerEgg": "Яйце з оленем",
+    "questGhostStagUnlockText": "Розблоковує придбання на ринку яєць з оленем",
     "questRatText": "Щурячий король",
     "questRatNotes": "Сміття! Величезні купи невиконаних щоденок лежать по всій Габітиці. Проблема стала настільки серйозною, що натовпи пацюків тепер можна побачити повсюди. Ви помітили, як @Pandah ніжно гладить одного з них. Вона пояснює, що щури — це ніжні істоти, які харчуються невиконаними щоденками. Справжня проблема полягає в тому, що щоденки впали в каналізацію, утворивши небезпечний затор, який потрібно розчистити. Коли ви спускаєтесь у каналізацію, величезний щур із криваво-червоними очима та кривими жовтими зубами нападає на вас, захищаючи свою гору сміття. Чи вистачить вам сміливості, щоб зіткнутись з легендарним Щурячим королем?",
-    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька щурячих яєць. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні тварини».",
+    "questRatCompletion": "Ваш останній удар позбавив гігантського щура сили, його очі стали тьмяно-сірими. Звір розпадається на безліч крихітних мишенят, які злякано тікають геть. Ви помічаєте @Pandah, яка стоїть позаду вас і дивиться на колись могутню істоту. Вона пояснює, що жителі Habitica надихнулися вашою мужністю і швидко виконують усі свої щоденки. Вона попереджає вас, що ми повинні бути пильними, бо якщо ми ослабимо пильність, Щурячий король повернеться. В якості оплати @Pandah пропонує вам кілька яєць зі щуром. Помітивши ваш неспокійний вираз обличчя, вона посміхається: «З них вилупляться чудові домашні улюбленці».",
     "questRatBoss": "Щурячий король",
-    "questRatDropRatEgg": "Яйце щура",
-    "questRatUnlockText": "Розблоковує щурячі яйця для придбання на ринку",
+    "questRatDropRatEgg": "Яйце зі щуром",
+    "questRatUnlockText": "Розблоковує придбання на ринку яєць зі щуром",
     "questOctopusText": "Поклик Октотулу",
     "questOctopusNotes": "@Urse, банькатий молодий писар, попрохав вас допомогти з оглядом таємничої печери на морському узбережжі. Серед напівтемних припливних озерцят стоїть величезна брама зі сталактитів та сталагмітів. Коли ви підходите ближче, унизу воріт починає кружляти темний вир. Ви з подивом дивитесь, як звідти вилазить спрутоподібний дракон. „Липке чадо зірок прокинулося“, — несамовито реве @Urse. „Через вігинтильйони років великий Октотулу знову вільний і спраглий до насолод!“",
-    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця восьминога», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
+    "questOctopusCompletion": "З останнім ударом істота вислизає у вир, з якого вона прийшла. Ви не можете сказати, чи @Urse радий вашій перемозі чи засмучений тим, що звір йде. Ваш напарник без слів показує на три слизькі гігантські яйця в сусідній ямі, покладені в гніздо із золотими монетами. «Мабуть, це яйця з восьминогами», — нервово кажете ви. Коли ви повертаєтеся додому, @Urse несамовито строчить щось у щоденнику, і ви підозрюєте, що це не востаннє, коли ви чуєте про великого Октотулу.",
     "questOctopusBoss": "Октотулу",
-    "questOctopusDropOctopusEgg": "Яйце спрута",
+    "questOctopusDropOctopusEgg": "Яйце зі спрутом",
     "questOctopusUnlockText": "Відкриває покупні яйця восьминогів на ринку",
     "questHarpyText": "Рятуйте! Гарпія!",
     "questHarpyNotes": "У лісі зник відважний шукач пригод @UncommonCriminal, який вистежував крилате чудовисько, бачене кілька днів тому. Ви вже налаштувалися на пошуки, аж на вашу руку присів зранений папуга, красиве пір'я якого зіпсував незугарний шрам. До його лапки була прикріплена поспіхом нашкрябана записка, у якій повідомлялося, що, захищаючи папуг, @UncommonCriminal був схоплений злою гарпією і дуже потребує вашої допомоги. Ви підете за птахом і здолаєте гарпію, щоб визволити @UncommonCriminal?",
@@ -53,7 +53,7 @@
     "questRoosterDropRoosterEgg": "Яйце півня",
     "questRoosterUnlockText": "Розблоковує купівлю півнячих яєць на ринку",
     "questSpiderText": "Льодяний Арахнід",
-    "questSpiderNotes": "Як тільки наступили холода, легенький іній почав з'являтись у хабітчанських вікнах у вигляді кружева павутинь... окрім Аркосінових, чиї вікна є повністю заморожені Морозяним Павуком, який зараз вирішує поселитись в його домі.",
+    "questSpiderNotes": "Помалу надворі холоднішає, легенький іній починає з'являтись у вікнах габітиканців, розписуючиї їх красивими візерунками... Окрім вікон @Arcosine, бо вони повністю заморожені Морозним павуком, який вирішив поселитись в його домі.",
     "questSpiderCompletion": "Морозний павук падає, залишаючи за собою невелику купу інею та кілька зачарованих яєць. @Arcosine пропонує їх вам як нагороду — можливо, ви можете виростити небезпечних павуків як домашніх тварин?",
     "questSpiderBoss": "Павук",
     "questSpiderDropSpiderEgg": "Яйце павука",
@@ -393,7 +393,7 @@
     "questTaskwoodsTerror3DropStrawberry": "Полуниця (їжа)",
     "questTaskwoodsTerror3DropWeapon": "",
     "questFerretText": "Підлий тхір",
-    "questFerretNotes": "",
+    "questFerretNotes": "Прогулюючись по Habit-сіті, ви бачите незадоволений натовп, який оточив тхора в червоній мантії.<br><br>\"Це зілля продуктивності, яке ви мені продали не працює!\" - скаржиться @Beffymaroo. «Минулої ночі я дивився три години телевізора замість того, щоб займатися своїми справами!»<br><br>«Так!» кричить @Pandah. «І сьогодні я витратив годину на те, щоб переставляти книжки, замість того, щоб їх читати!»<br><br>Нечестивий тхір невинно розводить руками. «Але це ж більше, ніж зазвичай, чи не так?»<br><br>Натовп вибухає гнівом.<br><br>«Жодних відшкодувань!» кричить тхір. Він пускає магічний постріл у натовп, готуючись втекти через дим.<br><br>\"Будь ласка, габітиканцю!\" каже @Faye, хапаючи вас за руку. «Здолайте тхора і змусьте його повернути нечесно отримані кошти!»",
     "questFerretCompletion": "",
     "questFerretBoss": "Підлий тхір",
     "questFerretDropFerretEgg": "Яйце тхора",
@@ -496,7 +496,7 @@
     "questMayhemMistiflying3DropPinkCottonCandy": "Рожева цукрова кулька(Food)",
     "questMayhemMistiflying3DropShield": "",
     "questMayhemMistiflying3DropWeapon": "",
-    "featheredFriendsText": "",
+    "featheredFriendsText": "Набір квестів \"Пернаті друзі\"",
     "featheredFriendsNotes": "",
     "questNudibranchText": "Зараження мотиваційними морськими молюсками",
     "questNudibranchNotes": "",
@@ -504,7 +504,7 @@
     "questNudibranchBoss": "",
     "questNudibranchDropNudibranchEgg": "",
     "questNudibranchUnlockText": "Розблоковує купівлю молюска в яйці на ринку",
-    "splashyPalsText": "",
+    "splashyPalsText": "Набір квестів \"Плескаючі друзі\"",
     "splashyPalsNotes": "",
     "questHippoText": "",
     "questHippoNotes": "",
@@ -512,9 +512,9 @@
     "questHippoBoss": "",
     "questHippoDropHippoEgg": "",
     "questHippoUnlockText": "Розблоковує купівлю бегемота в яйці на ринку",
-    "farmFriendsText": "",
-    "farmFriendsNotes": "",
-    "witchyFamiliarsText": "",
+    "farmFriendsText": "Набір квестів \"Друзі фермера\"",
+    "farmFriendsNotes": "Містить \"Корова-мууутант\", \"КІНецЬ світу\" та \"Грозовий баран\". Доступний до 30 вересня.",
+    "witchyFamiliarsText": "Набір квестів \"Відьмині друзі\"",
     "witchyFamiliarsNotes": "",
     "questGroupLostMasterclasser": "",
     "questUnlockLostMasterclasser": "",
@@ -558,7 +558,7 @@
     "questYarnBoss": "",
     "questYarnDropYarnEgg": "",
     "questYarnUnlockText": "Розблоковує купівлю пряжі в яйці на ринку",
-    "winterQuestsText": "",
+    "winterQuestsText": "Зимовий набір квестів",
     "winterQuestsNotes": "",
     "questPterodactylText": "",
     "questPterodactylNotes": "",
@@ -593,7 +593,7 @@
     "questDysheartenerDropHippogriffPet": "",
     "questDysheartenerDropHippogriffMount": "",
     "dysheartenerArtCredit": "Графічна робота @AnnDeLune",
-    "hugabugText": "",
+    "hugabugText": "Набір квестів \"Обійми жука\"",
     "hugabugNotes": "",
     "questSquirrelText": "",
     "questSquirrelNotes": "",
@@ -603,7 +603,7 @@
     "questSquirrelUnlockText": "Розблоковує купівлю білки в яйці на ринку",
     "cuddleBuddiesText": "Набір квестів \"Пухнасті друзі\"",
     "cuddleBuddiesNotes": "Містить «Кролик-вбивця», «Нечестивий тхір» і «Банда морських свинок». Доступний до 31 березня.",
-    "aquaticAmigosText": "",
+    "aquaticAmigosText": "Набір квестів \"Водні амігос\"",
     "aquaticAmigosNotes": "",
     "questSeaSerpentText": "Біда в глибинах: Напад морського змія!",
     "questSeaSerpentNotes": "",
@@ -617,7 +617,7 @@
     "questKangarooBoss": "Катастрофічний Кенгуру",
     "questKangarooDropKangarooEgg": "Яйце кенгуру",
     "questKangarooUnlockText": "Розблоковує купівлю кенгуру в яйці на ринку",
-    "forestFriendsText": "",
+    "forestFriendsText": "Набір квестів \"Лісові друзі\"",
     "forestFriendsNotes": "",
     "questAlligatorText": "Інста-гатор",
     "questAlligatorNotes": "",
@@ -625,9 +625,9 @@
     "questAlligatorBoss": "Інста-гатор",
     "questAlligatorDropAlligatorEgg": "Яйце алігатора",
     "questAlligatorUnlockText": "Розблоковує купівлю яєць алігатора на ринку",
-    "oddballsText": "",
+    "oddballsText": "Набір квестів \"Дивні кулі\"",
     "oddballsNotes": "",
-    "birdBuddiesText": "",
+    "birdBuddiesText": "Набір квестів \"Пташечки-співачки\"",
     "birdBuddiesNotes": "",
     "questVelociraptorText": "Велоци-репер",
     "questVelociraptorNotes": "",
@@ -645,5 +645,15 @@
     "questRobotDropRobotEgg": "Яйце робота",
     "questRobotText": "Загадкові механічні дива!",
     "mythicalMarvelsText": "Набір квестів \"Фантастичні звірі\"",
-    "mythicalMarvelsNotes": "Включає квести \"Переконати королеву єдинорогів\", \"Полум'яний ґрифон\" та \"Біда в глибинах: Напад морського змія\". Доступний до 28 лютого."
+    "mythicalMarvelsNotes": "Включає квести \"Переконати королеву єдинорогів\", \"Полум'яний ґрифон\" та \"Біда в глибинах: Напад морського змія\". Доступний до 28 лютого.",
+    "rockingReptilesText": "Набір квестів \"Кам'яні рептилії\"",
+    "delightfulDinosText": "Набір квестів \"Давні динозаври\"",
+    "jungleBuddiesText": "Набір квестів \"Товариші з джунглів\"",
+    "sandySidekicksText": "Набір квестів \"Пісочні помічники\"",
+    "questDolphinUnlockText": "Розблоковує придбання на ринку яєць з дельфіном",
+    "questDolphinCompletion": "Ваша битва волі з дельфіном залишила вас втомленими, але ви виходете з неї переможцем. З вашою рішучістю та заохоченням @mewrose, @khdarkwolf і @confusedcicada підхоплюються та позбавляються підступної телепатії дельфіна. Ви четверо захищаєте себе почуттям гордості відо виконаних щоденнок, сильних звичок та завершених справ, аж поки дельфін не заплющує свої сяючі очі, мовчазно визнаючи ваші успіхи. З цим він падає назад у води бухти. Коли ви \"даєте пять\" та вітаєте один одного, ви помічаєте три яйця, які вода винесла на берег.<br><br>«Хм, цікаво, що ми можемо з ними зробити?», — міркує @khdarkwolf.",
+    "questDolphinBoss": "Дельфін сумніву",
+    "questDolphinDropDolphinEgg": "Яйце з дельфіном",
+    "questDolphinNotes": "Ви гуляєте по пляжу бухти Незавершеності, розмірковуючи про складну роботу, яка вас чекає. Раптом вам впадає в очі плескіт у воді. Чудовий дельфін стрибає над хвилями. Сонячне світло відбивається від його плавників і хвоста. Але зачекайте... це не відблиски сонячниї променів, і дельфін не занурюється назад у море. Він фіксує свій погляд на @khdarkwolf.<br><br>«Я ніколи не закінчу всі ці щоденники», — сказав @khdarkwolf.<br><br>«Я недостатньо хороший, щоб досягти своїх цілей», — сказав @confusedcicada, коли дельфін спрямував на неї свій яскравий погляд.<br><br>«Навіщо я взагалі намагався?» запитала @mewrose, в’янучи під поглядом звіра.<br><br>Його погляд зустрічається з вашими, і ви відчуваєте, як ваш розум починає тонути під наростаючою хвилею сумнівів. Ви берете себе в руи; хтось повинен здолати цю істоту, і це будете ви!",
+    "questDolphinText": "Дельфін сумніву"
 }
diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js
index c69ca9d7a2..65152186c0 100644
--- a/website/common/script/content/appearance/sets.js
+++ b/website/common/script/content/appearance/sets.js
@@ -15,7 +15,7 @@ export default prefill({
     setPrice: 5, availableFrom: '2022-04-14T08:00-05:00', availableUntil: '2022-04-30T20:00-05:00', text: t('shimmerColors'),
   },
   hauntedHairColors: {
-    setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('hauntedColors'),
+    setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'),
   },
   winteryHairColors: {
     setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: '2022-01-31T20:00-05:00', text: t('winteryColors'),
@@ -27,7 +27,7 @@ export default prefill({
   },
   spookySkins: { setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins') },
   supernaturalSkins: {
-    setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('supernaturalSkins'),
+    setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('supernaturalSkins'),
   },
   splashySkins: {
     setPrice: 5, availableFrom: '2022-07-05T08:00-05:00', availableUntil: EVENTS.summer2022.end, text: t('splashySkins'),
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 49cb72cac6..3073f0991c 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -9,17 +9,28 @@ const gemsPromo = {
 };
 
 export const EVENTS = {
-  noCurrentEvent: {
-    start: '2022-09-30T20:00-04:00',
+  afterGala: {
+    start: '2022-10-31T20:00-04:00',
     end: '2022-12-21T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  fall2022: {
+    start: '2022-09-20T08:00-04:00',
+    end: '2022-10-31T20:00-04:00',
+    npcImageSuffix: '_fall',
+    season: 'fall',
+    gear: true,
+  },
+  beforeGala: {
+    start: '2022-07-31T20:00-04:00',
+    end: '2022-09-20T08:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   bundle202209: {
     start: '2022-09-13T08:00-04:00',
     end: '2022-09-30T20:00-04:00',
-    season: 'normal',
-    npcImageSuffix: '',
   },
   potions202208: {
     start: '2022-08-16T08:00-04:00',
diff --git a/website/common/script/content/constants/seasonalSets.js b/website/common/script/content/constants/seasonalSets.js
index 95697b3c7f..009ee62321 100644
--- a/website/common/script/content/constants/seasonalSets.js
+++ b/website/common/script/content/constants/seasonalSets.js
@@ -188,6 +188,11 @@ const SEASONAL_SETS = {
     'fall2021HeadlessWarriorSet',
     'fall2021BrainEaterMageSet',
     'fall2021FlameSummonerHealerSet',
+
+    'fall2022KappaRogueSet',
+    'fall2022OrcWarriorSet',
+    'fall2022HarpyMageSet',
+    'fall2022WatcherHealerSet',
   ],
 };
 
diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js
index 90d3a7df2b..55f9c2d7a6 100644
--- a/website/common/script/content/gear/sets/special/index.js
+++ b/website/common/script/content/gear/sets/special/index.js
@@ -702,15 +702,19 @@ const armor = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -754,6 +758,18 @@ const armor = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const armorStats = {
@@ -1792,15 +1808,19 @@ const head = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -1844,6 +1864,18 @@ const head = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const headStats = {
@@ -2592,12 +2624,15 @@ const shield = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -2626,6 +2661,15 @@ const shield = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const shieldStats = {
@@ -3288,15 +3332,19 @@ const weapon = {
   },
   fall2021Rogue: {
     set: 'fall2021OozeRogueSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Warrior: {
     set: 'fall2021HeadlessWarriorSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Mage: {
     set: 'fall2021BrainEaterMageSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   fall2021Healer: {
     set: 'fall2021FlameSummonerHealerSet',
+    canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
   },
   winter2022Rogue: {
     set: 'winter2022FireworksRogueSet',
@@ -3334,6 +3382,18 @@ const weapon = {
   summer2022Healer: {
     set: 'summer2022AngelfishHealerSet',
   },
+  fall2022Rogue: {
+    set: 'fall2022KappaRogueSet',
+  },
+  fall2022Warrior: {
+    set: 'fall2022OrcWarriorSet',
+  },
+  fall2022Mage: {
+    set: 'fall2022HarpyMageSet',
+  },
+  fall2022Healer: {
+    set: 'fall2022WatcherHealerSet',
+  },
 };
 
 const weaponStats = {
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index e4d75817ef..23f26f370d 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -161,13 +161,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionGhost'),
     limited: true,
-    event: EVENTS.fall2020,
+    event: EVENTS.fall2022,
     canBuy () {
-      return moment().isBefore('2020-11-02');
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2018 }),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
   },
   Holly: {
@@ -337,13 +337,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionShadow'),
     limited: true,
-    event: EVENTS.fall2020,
+    event: EVENTS.fall2022,
     canBuy () {
-      return moment().isBefore('2020-11-02');
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2019 }),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
   },
   Amber: {
@@ -424,13 +424,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionVampire'),
     limited: true,
-    event: EVENTS.fall2021,
+    event: EVENTS.fall2022,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndOctober'),
-      previousDate: t('septemberYYYY', { year: 2020 }),
+      previousDate: t('octoberYYYY', { year: 2021 }),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.fall2021.end);
+      return moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end);
     },
   },
   AutumnLeaf: {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index f79f352b6e..3fe7c933a8 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween(EVENTS.potions202208.start, EVENTS.potions202208.end)) {
+    if (moment().isBetween(EVENTS.fall2022.start, EVENTS.fall2022.end)) {
       return [
         {
           type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Moonglow',
+          path: 'premiumHatchingPotions.Vampire',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Porcelain',
+          path: 'premiumHatchingPotions.Ghost',
         },
         {
-          type: 'food',
-          path: 'food.Milk',
+          type: 'premiumHatchingPotion',
+          path: 'premiumHatchingPotions.Shadow',
         },
       ];
     }
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index d6d330e651..9d9748e08d 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -325,7 +325,7 @@ spells.special = {
     target: 'user',
     notes: t('spellSpecialSpookySparklesNotes'),
     canOwn () {
-      return moment().isBetween('2021-10-12T08:00-04:00', EVENTS.fall2021.end);
+      return moment().isBetween('2021-10-11T08:00-04:00', EVENTS.fall2022.end);
     },
     cast (user, target, req) {
       if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language));
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 634c20525b..077a011288 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -30,16 +30,15 @@ export default {
 
   pinnedSets: SHOP_OPEN
     ? {
-      healer: 'summer2022AngelfishHealerSet',
-      rogue: 'summer2022CrabRogueSet',
-      warrior: 'summer2022WaterspoutWarriorSet',
-      wizard: 'summer2022MantaRayMageSet',
+      healer: 'fall2022WatcherHealerSet',
+      rogue: 'fall2022KappaRogueSet',
+      warrior: 'fall2022OrcWarriorSet',
+      wizard: 'fall2022HarpyMageSet',
     }
     : {},
-
-  availableSpells: SHOP_OPEN && moment().isBetween('2022-07-12T08:00-05:00', CURRENT_EVENT.end)
+  availableSpells: SHOP_OPEN && moment().isBetween('2022-10-04T08:00-05:00', CURRENT_EVENT.end)
     ? [
-      'seafoam',
+      'spookySparkles',
     ]
     : [],
 
@@ -49,5 +48,5 @@ export default {
     ]
     : [],
 
-  featuredSet: 'summer2021NautilusMageSet',
+  featuredSet: 'fall2021BrainEaterMageSet',
 };

From 586897fbfc7eb4741dc316d3c7c64c2850fc44a4 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 20 Sep 2022 17:11:09 -0400
Subject: [PATCH 34/36] Revert "update: remove another duplicate key from
 groups.json"

This reverts commit 014a4b653ae99638dd527f7d2f9baca6ebf5da34.
---
 website/common/locales/en/groups.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 9d3aea4ff7..f9e1cdd157 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -352,6 +352,7 @@
   "groupManager": "Manager setting up tasks for employees",
   "groupTeacher": "Teacher setting up tasks for students",
   "gettingStarted": "Getting Started",
+  "next": "Next",
   "nameStar": "Name*",
   "nameStarText": "Add a title",
   "descriptionOptional": "Description",

From 9890e0079a0f90c7dd878b45332755c3a82ed0ec Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 21 Sep 2022 12:02:35 -0400
Subject: [PATCH 35/36] fix: correct groupPlan.vue file

---
 .../src/components/groups/groupPlan.vue       | 204 +++++-------------
 1 file changed, 52 insertions(+), 152 deletions(-)

diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue
index ff48782892..c628774d9e 100644
--- a/website/client/src/components/groups/groupPlan.vue
+++ b/website/client/src/components/groups/groupPlan.vue
@@ -1,6 +1,7 @@
 <template>
   <!-- @TODO: Move to group plans folder-->
   <div>
+    <group-plan-creation-modal />
     <div>
       <div class="header">
         <h1 class="text-center">
@@ -51,6 +52,7 @@
           </div>
         </div>
       </div>
+      <!-- Upgrading an existing group -->
       <div
         v-if="upgradingGroup._id"
         id="upgrading-group"
@@ -100,153 +102,53 @@
           </div>
         </div>
       </div>
+      <!-- Create a new group -->
       <div
         v-if="!upgradingGroup._id"
         class="container col-6 offset-3 create-option"
       >
         <div class="row">
           <h1 class="col-12 text-center purple-header">
-            Create your Group today!
+            Create Your Group Today!
           </h1>
         </div>
         <div class="row">
           <div class="col-12 text-center">
             <button
               class="btn btn-primary create-group"
-              @click="launchModal('create')"
+              @click="launchModal('create-page')"
             >
-              Create Your New Group
+              Create Your New Group!
             </button>
           </div>
         </div>
-        <div class="row pricing">
-          <div class="col-5">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              9
-            </div>
-            <div class="name">
-              <div>Group Owner</div>
-              <div>Subscription</div>
-            </div>
+        <div class="row pricing justify-content-center align-items-center">
+          <div class="dollar">
+            $
           </div>
-          <div class="col-1">
-            <div class="plus">
-              +
-            </div>
+          <div class="number">
+            9
           </div>
-          <div class="col-6">
-            <div class="dollar">
-              $
-            </div>
-            <div class="number">
-              3
-            </div>
-            <div class="name">
-              <div>Each Additional</div>
-              <div>Member</div>
-            </div>
+          <div class="name">
+            <div>Group Owner</div>
+            <div>Subscription</div>
+          </div>
+          <div class="plus">
+            +
+          </div>
+          <div class="dollar">
+            $
+          </div>
+          <div class="number">
+            3
+          </div>
+          <div class="name">
+            <div>Each Additional</div>
+            <div>Member</div>
           </div>
         </div>
       </div>
     </div>
-    <b-modal
-      id="group-plan-modal"
-      :title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
-      size="md"
-      hide-footer="hide-footer"
-    >
-      <div
-        v-if="activePage === PAGES.CREATE_GROUP"
-        class="col-12"
-      >
-        <div class="form-group">
-          <label
-            class="control-label"
-            for="new-group-name"
-          >Name</label>
-          <input
-            id="new-group-name"
-            v-model="newGroup.name"
-            class="form-control input-medium option-content"
-            required="required"
-            type="text"
-            placeholder="Name"
-          >
-        </div>
-        <div class="form-group">
-          <label for="new-group-description">{{ $t('description') }}</label>
-          <textarea
-            id="new-group-description"
-            v-model="newGroup.description"
-            class="form-control option-content"
-            cols="3"
-            :placeholder="$t('description')"
-          ></textarea>
-        </div>
-        <div
-          v-if="type === 'guild'"
-          class="form-group"
-        >
-          <div class="custom-control custom-radio">
-            <input
-              v-model="newGroup.privacy"
-              class="custom-control-input"
-              type="radio"
-              name="new-group-privacy"
-              value="private"
-            >
-            <label class="custom-control-label">{{ $t('inviteOnly') }}</label>
-          </div>
-        </div>
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <input
-              id="create-group-leaderOnlyChallenges-checkbox"
-              v-model="newGroup.leaderOnly.challenges"
-              class="custom-control-input"
-              type="checkbox"
-            >
-            <label
-              class="custom-control-label"
-              for="create-group-leaderOnlyChallenges-checkbox"
-            >{{ $t('leaderOnlyChallenges') }}</label>
-          </div>
-        </div>
-        <div
-          v-if="type === 'party'"
-          class="form-group"
-        >
-          <button
-            class="btn btn-secondary form-control"
-            :value="$t('create')"
-            @click="createGroup()"
-          ></button>
-        </div>
-        <div class="form-group">
-          <button
-            class="btn btn-primary btn-lg btn-block"
-            :disabled="!newGroupIsReady"
-            @click="createGroup()"
-          >
-            {{ $t('create') }}
-          </button>
-        </div>
-      </div>
-      <div
-        v-if="activePage === PAGES.PAY"
-        class="col-12"
-      >
-        <div class="text-center">
-          <payments-buttons
-            :stripe-fn="() => pay(PAYMENTS.STRIPE)"
-            :amazon-data="pay(PAYMENTS.AMAZON)"
-          />
-        </div>
-      </div>
-    </b-modal>
   </div>
 </template>
 
@@ -258,8 +160,8 @@
 
     .dollar {
       position: absolute;
-      left: -1em;
-      top: 1em;
+      left: -16px;
+      top: 16px;
     }
 
     .purple-box {
@@ -291,9 +193,9 @@
     background: #432874;
     background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
     color: #fff;
-    padding: 2em;
+    padding: 32px;
     height: 340px;
-    margin-bottom: 2em;
+    margin-bottom: 32px;
     margin-left: -12px;
     margin-right: -12px;
 
@@ -317,6 +219,7 @@
 
     .box {
       height: 416px;
+      border-radius: 8px;
     }
 
     h2 {
@@ -359,17 +262,19 @@
   button.create-group {
     width: 330px;
     height: 96px;
+    border-radius: 8px;
+    font-size: 1.5rem;
   }
 
   .purple-header {
     color: #6133b4;
     font-size: 48px;
-    margin-top: 1em;
+    margin-top: 16px;
   }
 
   .pricing {
-    margin-top: 2em;
-    margin-bottom: 4em;
+    margin-top: 32px;
+    margin-bottom: 64px;
 
     .dollar, .number, .name {
       display: inline-block;
@@ -378,34 +283,32 @@
     }
 
     .plus {
-      font-size: 34px;
+      font-size: 2.125rem;
       color: #a5a1ac;
+      margin-left: 16px;
+      margin-right: 16px;
     }
 
     .dollar {
-      margin-bottom: 1.5em;
-      font-size: 32px;
+      margin-bottom: 24px;
+      font-size: 2rem;
       font-weight: bold;
     }
 
     .name {
-      font-size: 24px;
-      margin-bottom: .8em;
-      margin-left: .5em;
+      font-size: 1.5rem;
+      margin-left: 8px;
+      margin-right: 8px;
     }
 
     .number {
-      font-size: 72px;
+      font-size: 4.5rem;
       font-weight: bolder;
     }
   }
 
   .payment-options {
-    margin-bottom: 4em;
-
-    h4 {
-      color: #34313a;
-    }
+    margin-bottom: 64px;
 
     h4 {
       color: #34313a;
@@ -414,7 +317,7 @@
     .purple-box {
       background-color: #4f2a93;
       color: #fff;
-      padding: .5em;
+      padding: 8px;
       border-radius: 8px;
       width: 200px;
       height: 215px;
@@ -428,7 +331,7 @@
 
       .name {
         width: 100px;
-        margin-left: .3em;
+        margin-left: 4.8px;
       }
 
       .plus {
@@ -453,10 +356,12 @@ import paymentsMixin from '../../mixins/payments';
 import { mapState } from '@/libs/store';
 import positiveIcon from '@/assets/svg/positive.svg';
 import paymentsButtons from '@/components/payments/buttons/list';
+import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
 
 export default {
   components: {
     paymentsButtons,
+    groupPlanCreationModal,
   },
   mixins: [paymentsMixin],
   data () {
@@ -505,12 +410,7 @@ export default {
   },
   methods: {
     launchModal () {
-      this.changePage(this.PAGES.CREATE_GROUP);
-      this.$root.$emit('bv::show::modal', 'group-plan-modal');
-    },
-    changePage (page) {
-      this.activePage = page;
-      window.scrollTo(0, 0);
+      this.$root.$emit('bv::show::modal', 'create-group');
     },
     createGroup () {
       this.changePage(this.PAGES.PAY);

From 4c4d0be31f2ab308ab1489ff8058c3af6f574252 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 29 Sep 2022 15:07:21 -0500
Subject: [PATCH 36/36] fix(analytics): include client tracking parameter

---
 .../src/components/group-plans/groupPlanCreationModal.vue       | 2 +-
 website/client/src/components/payments/successModal.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index ff61a904b6..d7980031f9 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -324,7 +324,7 @@ export default {
         eventCategory: 'behavior',
         demographics: this.newGroup.demographics,
         type: this.newGroup.type,
-      });
+      }, { trackOnClient: true });
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
         paymentData.groupId = this.upgradingGroup._id;
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index fb3abaf39e..59a2119557 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -365,7 +365,7 @@ export default {
           eventCategory: 'behavior',
           demographics: this.upgradedGroup.demographics,
           type: this.paymentData.group.type, // also tried this.upgradedGroup.type
-        });
+        }, { trackOnClient: true });
       }
       this.paymentData = {};
       this.$root.$emit('bv::hide::modal', 'payments-success-modal');