4.209.0

feat(content): Shade pet/mount collection achievements
fix(analytics): confirm that 2x/day task actions should track on client
2026-05-11 02:28:50 -05:00 · 2021-10-21 10:49:41 -05:00 · 2021-10-21 10:49:22 -05:00 · 2021-10-20 10:49:32 -05:00 · 2021-10-14 13:58:53 -05:00 · 2021-10-14 18:20:54 +02:00
270 changed files with 30948 additions and 25015 deletions
@@ -8,10 +8,10 @@ website/client/
 website/common/transpiled-babel/
 dist/
 dist-client/
-apidoc_build/
+apidoc/html/
 content_cache/
 i18n_cache/
 node_modules/

 # Old migrations, disabled
-migrations/archive/*
+migrations/archive/*
@@ -4,7 +4,7 @@

 # Pull Request

-[Please see these instructions for adding a pull request](http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API)
+[Please see these instructions for adding a pull request](https://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica's_Website_and_API)

 # Requesting a feature

@@ -12,4 +12,4 @@ Habitica uses [this Google form](https://docs.google.com/forms/d/e/1FAIpQLScPhrw

 # Contributing Code

-See [Contributing to Habitica](http://habitica.fandom.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29)
+See [Contributing to Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29)
@@ -1,8 +1,8 @@
-[//]: # (Before logging this issue, please contact site administrators from the Habitica website's Help menu. Most bugs can be handled quickly there. If a GitHub issue is needed, staff will let you know. It is recommended that you don't create a new issue unless advised to.)
+[//]: # (Before logging this issue, please contact site administrators from "Report a Bug" in the Habitica website's Help menu. If a GitHub issue is needed, staff will let you know and will most likely log one on your behalf. It is recommended that you don't create a new issue unless advised to.)

-[//]: # (Bugs in the mobile apps can also be reported there.)
+[//]: # (Bugs in the mobile apps can be reported via Menu > About > Support.)

-[//]: # (If you have a feature request, use "Help > Request a Feature", not GitHub or the Report a Bug guild.)
+[//]: # (If you have a feature request, use "Help > Request a Feature", not GitHub.)

 [//]: # (For more guidelines see https://github.com/HabitRPG/habitica/issues/2760)

@@ -1,4 +1,4 @@
-[//]: # (Note: See http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API for more info)
+[//]: # (Note: See https://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API for more info)

 [//]: # (Put Issue # here, if applicable. This will automatically close the issue if your PR is merged in)
 Fixes put_#_and_issue_number_here
@@ -11,4 +11,4 @@ Fixes put_#_and_issue_number_here
 [//]: # (Put User ID in here - found on the Habitica website at User Icon > Settings > API)

 ----
-UUID: 
+UUID:
@@ -5,7 +5,7 @@ website/common/transpiled-babel/
 node_modules
 content_cache
 i18n_cache
-apidoc_build
+apidoc/html
 *.swp
 .idea*
 config.json
@@ -4,8 +4,8 @@ Habitica ![Build Status](https://github.com/HabitRPG/habitica/workflows/Test/bad
 [Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.

 **We need more programmers!** Your assistance will be greatly appreciated. The wiki pages below and the additional pages they link to will tell you how to get started on contributing code and where you can go to seek further help or ask questions:
-* [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths) - an introduction to the technologies used and how the software is organized.
-* [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally) - how to set up a local install of Habitica for development and testing on various platforms.
+* [Guidance for Blacksmiths](https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths) - an introduction to the technologies used and how the software is organized.
+* [Setting up Habitica Locally](https://habitica.fandom.com/wiki/Setting_up_Habitica_Locally) - how to set up a local install of Habitica for development and testing on various platforms.

 Habitica's code is licensed as described at https://github.com/HabitRPG/habitica/blob/develop/LICENSE

@@ -2,6 +2,7 @@
  "name": "Habitica V3 API Documentation",
  "title": "Habitica",
  "url": "https://habitica.com",
+  "sampleUrl": null,
  "header": {
    "title": "Introduction",
    "filename": "apidoc/header.md"
@@ -3,6 +3,3 @@
 This webpage includes the documentation for version 3 of the [Habitica](https://habitica.com) API.

 If you're developing a 3rd party tool that uses the Habitica API you should read the [Guidance for Comrades](https://habitica.fandom.com/wiki/Guidance_for_Comrades) and in particular the section called [Rules for Third-Party Tools](https://habitica.fandom.com/wiki/Guidance_for_Comrades#Rules_for_Third-Party_Tools) which includes suggestions on how to best use the API and the rules to follow when interacting with it.
-
-# Attention: Sample forms are non-functional
-The sample forms were enabled [due to a change in the apidoc package](https://github.com/apidoc/apidoc/pull/915) and do not function, they will be disabled in a future release.
@@ -2,8 +2,9 @@ import gulp from 'gulp';
 import clean from 'rimraf';
 import apidoc from 'apidoc';

-const APIDOC_DEST_PATH = './apidoc_build';
+const APIDOC_DEST_PATH = './apidoc/html';
 const APIDOC_SRC_PATH = './website/server';
+const APIDOC_CONFIG_PATH = './apidoc/apidoc.json';
 gulp.task('apidoc:clean', done => {
  clean(APIDOC_DEST_PATH, done);
 });
@@ -12,6 +13,7 @@ gulp.task('apidoc', gulp.series('apidoc:clean', done => {
  const result = apidoc.createDoc({
    src: APIDOC_SRC_PATH,
    dest: APIDOC_DEST_PATH,
+    config: APIDOC_CONFIG_PATH,
  });

  if (result === false) {
@@ -0,0 +1,82 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20211021_pet_color_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Wolf-Shade'] > 0
+      && pets['TigerCub-Shade'] > 0
+      && pets['PandaCub-Shade'] > 0
+      && pets['LionCub-Shade'] > 0
+      && pets['Fox-Shade'] > 0
+      && pets['FlyingPig-Shade'] > 0
+      && pets['Dragon-Shade'] > 0
+      && pets['Cactus-Shade'] > 0
+      && pets['BearCub-Shade'] > 0) {
+        set['achievements.shadyCustomer'] = true;
+      }
+  }
+
+  if (user && user.items && user.items.mounts) {
+    const mounts = user.items.mounts;
+    if (mounts['Wolf-Shade']
+      && mounts['TigerCub-Shade']
+      && mounts['PandaCub-Shade']
+      && mounts['LionCub-Shade']
+      && mounts['Fox-Shade']
+      && mounts['FlyingPig-Shade']
+      && mounts['Dragon-Shade']
+      && mounts['Cactus-Shade']
+      && mounts['BearCub-Shade'] ) {
+        set['achievements.shadeOfItAll'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2021-10-01') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.206.1",
+  "version": "4.209.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -450,15 +450,15 @@
      }
    },
    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
-      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "version": "7.15.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz",
+      "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==",
      "requires": {
-        "@babel/compat-data": "^7.14.7",
-        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
        "@babel/helper-plugin-utils": "^7.14.5",
        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.14.5"
+        "@babel/plugin-transform-parameters": "^7.15.4"
      }
    },
    "@babel/plugin-proposal-optional-catch-binding": {
@@ -909,9 +909,9 @@
      }
    },
    "@babel/preset-env": {
-      "version": "7.15.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz",
-      "integrity": "sha512-4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ==",
+      "version": "7.15.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz",
+      "integrity": "sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==",
      "requires": {
        "@babel/compat-data": "^7.15.0",
        "@babel/helper-compilation-targets": "^7.15.4",
@@ -927,7 +927,7 @@
        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
        "@babel/plugin-proposal-private-methods": "^7.14.5",
@@ -980,7 +980,7 @@
        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
        "@babel/plugin-transform-unicode-regex": "^7.14.5",
        "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.15.4",
+        "@babel/types": "^7.15.6",
        "babel-plugin-polyfill-corejs2": "^0.2.2",
        "babel-plugin-polyfill-corejs3": "^0.2.2",
        "babel-plugin-polyfill-regenerator": "^0.2.2",
@@ -988,6 +988,20 @@
        "semver": "^6.3.0"
      },
      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.14.9",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+          "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
+        },
+        "@babel/types": {
+          "version": "7.15.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz",
+          "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==",
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.14.9",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
        "semver": {
          "version": "6.3.0",
          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1391,6 +1405,16 @@
        "@slack/types": "^1.2.1",
        "@types/node": ">=12.0.0",
        "axios": "^0.21.1"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.21.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+          "requires": {
+            "follow-redirects": "^1.14.0"
+          }
+        }
      }
    },
    "@szmarczak/http-timer": {
@@ -1641,11 +1665,21 @@
      }
    },
    "amplitude": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/amplitude/-/amplitude-5.1.6.tgz",
-      "integrity": "sha512-e391uXcL6yfbWccLgKhFrYRoW8hScoT11DBhllS6zyZOyaPD/SVV9x3aUih2Wm98bp5pnjco73mFsmTGmPdSJA==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/amplitude/-/amplitude-5.1.7.tgz",
+      "integrity": "sha512-9sqB38TJsI50trTLMt5Z5Yr8yPo+IhNCh2Y/bPxlUSEfgvqKaKegyMGY7vUd8uUEB0H4JZ5a/G77mw7R/+Uklg==",
      "requires": {
-        "axios": "^0.21.1"
+        "axios": "^0.21.4"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.21.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+          "requires": {
+            "follow-redirects": "^1.14.0"
+          }
+        }
      }
    },
    "ansi-align": {
@@ -1816,6 +1850,16 @@
        "axios": "^0.21.1",
        "express": "^4.17.1",
        "jsonwebtoken": "^8.5.1"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.21.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+          "requires": {
+            "follow-redirects": "^1.14.0"
+          }
+        }
      }
    },
    "aproba": {
@@ -2119,11 +2163,12 @@
      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
    },
    "axios": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
-      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz",
+      "integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==",
+      "dev": true,
      "requires": {
-        "follow-redirects": "^1.14.0"
+        "follow-redirects": "^1.14.4"
      }
    },
    "babel-code-frame": {
@@ -3206,9 +3251,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30001255",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
-      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ=="
+      "version": "1.0.30001256",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001256.tgz",
+      "integrity": "sha512-QirrvMLmB4txNnxiaG/xbm6FSzv9LqOZ3Jp9VtCYb3oPIfCHpr/oGn38pFq0udwlkctvXQgPthaXqJ76DaYGnA=="
    },
    "caseless": {
      "version": "0.12.0",
@@ -3586,9 +3631,9 @@
      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
    },
    "colorette": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
-      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
    },
    "colors": {
      "version": "1.4.0",
@@ -3911,11 +3956,11 @@
      "dev": true
    },
    "core-js-compat": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz",
-      "integrity": "sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz",
+      "integrity": "sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==",
      "requires": {
-        "browserslist": "^4.16.8",
+        "browserslist": "^4.17.0",
        "semver": "7.0.0"
      },
      "dependencies": {
@@ -4680,9 +4725,9 @@
      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
    },
    "electron-to-chromium": {
-      "version": "1.3.830",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz",
-      "integrity": "sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ=="
+      "version": "1.3.836",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz",
+      "integrity": "sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg=="
    },
    "emitter-listener": {
      "version": "1.1.2",
@@ -5944,9 +5989,9 @@
      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
    },
    "follow-redirects": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
-      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
    },
    "for-in": {
      "version": "1.0.2",
@@ -6359,9 +6404,9 @@
      "dev": true
    },
    "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -10455,9 +10500,9 @@
      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
    },
    "passport": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
-      "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.0.tgz",
+      "integrity": "sha512-ln+ue5YaNDS+fes6O5PCzXKSseY5u8MYhX9H5Co4s+HfYI5oqvnHKoOORLYDUPh+8tHvrxugF2GFcUA1Q1Gqfg==",
      "requires": {
        "passport-strategy": "1.x.x",
        "pause": "0.0.1"
@@ -10973,9 +11018,9 @@
      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
    },
    "rate-limiter-flexible": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.2.4.tgz",
-      "integrity": "sha512-8u4k5b1afuBcfydX0L0l3J2PNjgcuo3zua8plhvIisyDqOBldrCwfSFut/Fj00LAB1nxJYVM9jeszr2rZyDhQw=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.1.tgz",
+      "integrity": "sha512-u4Ual0ssf/RHHxK3rqKo9W2S7ulVoNdCAOrsk1gR9JLtzqg7fGw+yaCeyBAEncsL2n6XqHh/0qJk3BPDn49BjA=="
    },
    "raw-body": {
      "version": "2.4.0",
@@ -12518,9 +12563,9 @@
      }
    },
    "stripe": {
-      "version": "8.174.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.174.0.tgz",
-      "integrity": "sha512-UFU5TuYH7XwUmSllUIcIKhhsvvhhjw9D6ZwVdfB74wU4VOOaWBiQqszkw6chaEFpdulUmbcAH5eZltV3HwOi7g==",
+      "version": "8.178.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.178.0.tgz",
+      "integrity": "sha512-Yk31NdIKf+MKTOdS2CTUIAHzUHOQwayoJFHBkrKGo7bJAlkPFzrIeOORH8SpduoXPZF8mq0JA7qNcFuFPBqabA==",
      "requires": {
        "@types/node": ">=8.1.0",
        "qs": "^6.6.0"
@@ -1,18 +1,18 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.206.1",
+  "version": "4.209.0",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.15.5",
-    "@babel/preset-env": "^7.15.4",
+    "@babel/preset-env": "^7.15.6",
    "@babel/register": "^7.15.3",
    "@google-cloud/trace-agent": "^5.1.5",
    "@parse/node-apn": "^4.1.1",
    "@slack/webhook": "^6.0.0",
    "accepts": "^1.3.5",
    "amazon-payments": "^0.2.9",
-    "amplitude": "^5.1.6",
+    "amplitude": "^5.1.7",
    "apidoc": "^0.29.0",
    "apple-auth": "^1.0.7",
    "bcrypt": "^5.0.1",
@@ -30,7 +30,7 @@
    "express": "^4.16.3",
    "express-basic-auth": "^1.1.5",
    "express-validator": "^5.2.0",
-    "glob": "^7.1.7",
+    "glob": "^7.2.0",
    "got": "^11.8.2",
    "gulp": "^4.0.0",
    "gulp-babel": "^8.0.0",
@@ -54,20 +54,20 @@
    "nconf": "^0.11.3",
    "node-gcm": "^1.0.5",
    "on-headers": "^1.0.2",
-    "passport": "^0.4.1",
+    "passport": "^0.5.0",
    "passport-facebook": "^3.0.0",
    "passport-google-oauth2": "^0.2.0",
    "passport-google-oauth20": "2.0.0",
    "paypal-rest-sdk": "^1.8.1",
    "pp-ipn": "^1.1.0",
    "ps-tree": "^1.0.0",
-    "rate-limiter-flexible": "^2.2.4",
+    "rate-limiter-flexible": "^2.3.1",
    "redis": "^3.1.2",
    "regenerator-runtime": "^0.13.9",
    "remove-markdown": "^0.3.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^4.2.0",
-    "stripe": "^8.174.0",
+    "stripe": "^8.178.0",
    "superagent": "^6.1.0",
    "universal-analytics": "^0.4.23",
    "useragent": "^2.1.9",
@@ -110,7 +110,7 @@
    "apidoc": "gulp apidoc"
  },
  "devDependencies": {
-    "axios": "^0.21.3",
+    "axios": "^0.22.0",
    "chai": "^4.3.4",
    "chai-as-promised": "^7.1.1",
    "chai-moment": "^0.1.0",
@@ -1 +1 @@
-For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).
+For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](https://habitica.fandom.com/wiki/Using_Your_Local_Install_to_Modify_Habitica's_Website_and_API).
@@ -7,7 +7,7 @@ import {
 } from '../../../../helpers/api-integration/v3';

 const INVITES_LIMIT = 100;
-const PARTY_LIMIT_MEMBERS = 30;
+const PARTY_LIMIT_MEMBERS = 29;
 const MAX_EMAIL_INVITES_BY_USER = 200;

 describe('Post /groups/:groupId/invite', () => {
@@ -650,7 +650,7 @@ describe('Post /groups/:groupId/invite', () => {
        .to.eventually.be.rejected.and.eql({
          code: 400,
          error: 'BadRequest',
-          message: t('partyExceedsMembersLimit', { maxMembersParty: PARTY_LIMIT_MEMBERS }),
+          message: t('partyExceedsMembersLimit', { maxMembersParty: PARTY_LIMIT_MEMBERS + 1 }),
        });
    }).timeout(10000);
  });
@@ -13,32 +13,32 @@
    "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook"
  },
  "dependencies": {
-    "@storybook/addons": "6.2.9",
-    "@storybook/addon-actions": "6.2.9",
+    "@storybook/addons": "6.3.8",
+    "@storybook/addon-actions": "6.3.10",
    "@storybook/addon-knobs": "6.2.9",
-    "@storybook/addon-links": "6.2.9",
+    "@storybook/addon-links": "6.3.9",
    "@storybook/addon-notes": "5.3.21",
-    "@storybook/vue": "6.2.9",
+    "@storybook/vue": "6.3.9",
    "@vue/cli-plugin-babel": "^4.5.13",
    "@vue/cli-plugin-eslint": "^4.5.13",
    "@vue/cli-plugin-router": "^4.5.13",
    "@vue/cli-plugin-unit-mocha": "^4.5.13",
    "@vue/cli-service": "^4.5.13",
    "@vue/test-utils": "1.0.0-beta.29",
-    "amplitude-js": "^8.5.0",
-    "axios": "^0.21.3",
+    "amplitude-js": "^8.8.0",
+    "axios": "^0.22.0",
    "axios-progress-bar": "^1.2.0",
    "babel-eslint": "^10.1.0",
    "bootstrap": "^4.6.0",
    "bootstrap-vue": "^2.21.2",
    "chai": "^4.3.4",
-    "core-js": "^3.17.2",
+    "core-js": "^3.18.1",
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
    "eslint-plugin-vue": "^6.2.2",
    "habitica-markdown": "^3.0.0",
-    "hellojs": "^1.19.4",
+    "hellojs": "^1.19.5",
    "inspectpack": "^4.7.1",
    "intro.js": "^4.2.2",
    "jquery": "^3.6.0",
@@ -38,7 +38,7 @@
      <template v-else>
        <template v-if="isUserLoaded">
          <damage-paused-banner />
-          <!-- <gems-promo-banner /> -->
+          <gems-promo-banner />
          <gift-promo-banner />
          <notifications-display />
          <app-menu />
@@ -154,7 +154,7 @@ import { loadProgressBar } from 'axios-progress-bar';
 import AppMenu from './components/header/menu';
 import AppHeader from './components/header/index';
 import DamagePausedBanner from './components/header/banners/damagePaused';
-// import GemsPromoBanner from './components/header/banners/gemsPromo';
+import GemsPromoBanner from './components/header/banners/gemsPromo';
 import GiftPromoBanner from './components/header/banners/giftPromo';
 import AppFooter from './components/appFooter';
 import notificationsDisplay from './components/notifications';
@@ -186,7 +186,7 @@ export default {
    AppHeader,
    AppFooter,
    DamagePausedBanner,
-    // GemsPromoBanner,
+    GemsPromoBanner,
    GiftPromoBanner,
    notificationsDisplay,
    snackbars,
@@ -1,814 +1,814 @@
-.background_harvest_fields {
+.background_harvest_feast {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px 0px;
  width: 141px;
  height: 147px;
 }
-.background_harvest_moon {
+.background_harvest_fields {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px 0px;
  width: 141px;
  height: 147px;
 }
-.background_haunted_forest {
+.background_harvest_moon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px 0px;
  width: 141px;
  height: 147px;
 }
-.background_haunted_house {
+.background_haunted_forest {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -148px;
  width: 141px;
  height: 147px;
 }
-.background_heart_shaped_bubbles {
+.background_haunted_house {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -148px;
  width: 141px;
  height: 147px;
 }
-.background_heather_field {
+.background_haunted_photo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -148px;
  width: 141px;
  height: 147px;
 }
-.background_herding_sheep_in_autumn {
+.background_heart_shaped_bubbles {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px 0px;
  width: 141px;
  height: 147px;
 }
-.background_holiday_hearth {
+.background_heather_field {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -148px;
  width: 141px;
  height: 147px;
 }
-.background_holiday_market {
+.background_herding_sheep_in_autumn {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -296px;
  width: 141px;
  height: 147px;
 }
-.background_holiday_wreath {
+.background_holiday_hearth {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -296px;
  width: 141px;
  height: 147px;
 }
-.background_hot_air_balloon {
+.background_holiday_market {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -296px;
  width: 141px;
  height: 147px;
 }
-.background_hot_spring {
+.background_holiday_wreath {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -296px;
  width: 141px;
  height: 147px;
 }
-.background_ice_cave {
+.background_hot_air_balloon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px 0px;
  width: 141px;
  height: 147px;
 }
-.background_iceberg {
+.background_hot_spring {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -148px;
  width: 141px;
  height: 147px;
 }
-.background_icicle_bridge {
+.background_ice_cave {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -296px;
  width: 141px;
  height: 147px;
 }
-.background_idyllic_cabin {
+.background_iceberg {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -444px;
  width: 141px;
  height: 147px;
 }
-.background_in_a_classroom {
+.background_icicle_bridge {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -444px;
  width: 141px;
  height: 147px;
 }
-.background_in_an_ancient_tomb {
+.background_idyllic_cabin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -444px;
  width: 141px;
  height: 147px;
 }
-.background_in_the_armory {
+.background_in_a_classroom {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -444px;
  width: 141px;
  height: 147px;
 }
-.background_inside_an_ornament {
+.background_in_an_ancient_tomb {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -444px;
  width: 141px;
  height: 147px;
 }
-.background_island_waterfalls {
+.background_in_the_armory {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px 0px;
  width: 141px;
  height: 147px;
 }
-.background_jungle_canopy {
+.background_inside_an_ornament {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -148px;
  width: 141px;
  height: 147px;
 }
-.background_kelp_forest {
+.background_island_waterfalls {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -296px;
  width: 141px;
  height: 147px;
 }
-.background_lake_with_floating_lanterns {
+.background_jungle_canopy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -444px;
  width: 141px;
  height: 147px;
 }
-.background_lighthouse_shore {
+.background_kelp_forest {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -592px;
  width: 141px;
  height: 147px;
 }
-.background_lilypad {
+.background_lake_with_floating_lanterns {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -592px;
  width: 141px;
  height: 147px;
 }
-.background_magic_beanstalk {
+.background_lighthouse_shore {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -592px;
  width: 141px;
  height: 147px;
 }
-.background_magical_candles {
+.background_lilypad {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -592px;
  width: 141px;
  height: 147px;
 }
-.background_magical_museum {
+.background_magic_beanstalk {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -592px;
  width: 141px;
  height: 147px;
 }
-.background_marble_temple {
+.background_magical_candles {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -592px;
  width: 141px;
  height: 147px;
 }
-.background_market {
+.background_magical_museum {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px 0px;
  width: 141px;
  height: 147px;
 }
-.background_meandering_cave {
+.background_marble_temple {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -148px;
  width: 141px;
  height: 147px;
 }
-.background_medieval_kitchen {
+.background_market {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -296px;
  width: 141px;
  height: 147px;
 }
-.background_midnight_castle {
+.background_meandering_cave {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -444px;
  width: 141px;
  height: 147px;
 }
-.background_midnight_clouds {
+.background_medieval_kitchen {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -592px;
  width: 141px;
  height: 147px;
 }
-.background_midnight_lake {
+.background_midnight_castle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -740px;
  width: 141px;
  height: 147px;
 }
-.background_mist_shrouded_mountain {
+.background_midnight_clouds {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -740px;
  width: 141px;
  height: 147px;
 }
-.background_mistiflying_circus {
+.background_midnight_lake {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -740px;
  width: 141px;
  height: 147px;
 }
-.background_monster_makers_workshop {
+.background_mist_shrouded_mountain {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -740px;
  width: 141px;
  height: 147px;
 }
-.background_mountain_lake {
+.background_mistiflying_circus {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -740px;
  width: 141px;
  height: 147px;
 }
-.background_mountain_pyramid {
+.background_monster_makers_workshop {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -740px;
  width: 141px;
  height: 147px;
 }
-.background_mystical_observatory {
+.background_mountain_lake {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -740px;
  width: 141px;
  height: 147px;
 }
-.background_night_dunes {
+.background_mountain_pyramid {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px 0px;
  width: 141px;
  height: 147px;
 }
-.background_ocean_sunrise {
+.background_mystical_observatory {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -148px;
  width: 141px;
  height: 147px;
 }
-.background_old_fashioned_bakery {
+.background_night_dunes {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -296px;
  width: 141px;
  height: 147px;
 }
-.background_on_tree_branch {
+.background_ocean_sunrise {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -444px;
  width: 141px;
  height: 147px;
 }
-.background_open_waters {
+.background_old_fashioned_bakery {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -592px;
  width: 141px;
  height: 147px;
 }
-.background_orchard {
+.background_on_tree_branch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -740px;
  width: 141px;
  height: 147px;
 }
-.background_pagodas {
+.background_open_waters {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -888px;
  width: 141px;
  height: 147px;
 }
-.background_park_with_statue {
+.background_orchard {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -888px;
  width: 141px;
  height: 147px;
 }
-.background_pirate_flag {
+.background_pagodas {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -888px;
  width: 141px;
  height: 147px;
 }
-.background_pixelists_workshop {
+.background_park_with_statue {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -888px;
  width: 141px;
  height: 147px;
 }
-.background_potion_shop {
+.background_pirate_flag {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -888px;
  width: 141px;
  height: 147px;
 }
-.background_productivity_plaza {
+.background_pixelists_workshop {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -888px;
  width: 141px;
  height: 147px;
 }
-.background_pumpkin_carriage {
+.background_potion_shop {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -888px;
  width: 141px;
  height: 147px;
 }
-.background_pumpkin_patch {
+.background_productivity_plaza {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -888px;
  width: 141px;
  height: 147px;
 }
-.background_purple {
+.background_pumpkin_carriage {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px 0px;
  width: 141px;
  height: 147px;
 }
-.background_pyramids {
+.background_pumpkin_patch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -148px;
  width: 141px;
  height: 147px;
 }
-.background_raging_river {
+.background_purple {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -296px;
  width: 141px;
  height: 147px;
 }
-.background_rainbow_meadow {
+.background_pyramids {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -444px;
  width: 141px;
  height: 147px;
 }
-.background_rainbows_end {
+.background_raging_river {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -592px;
  width: 141px;
  height: 147px;
 }
-.background_rainforest {
+.background_rainbow_meadow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -740px;
  width: 141px;
  height: 147px;
 }
-.background_rainy_barnyard {
+.background_rainbows_end {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -888px;
  width: 141px;
  height: 147px;
 }
-.background_rainy_city {
+.background_rainforest {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_red {
+.background_rainy_barnyard {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_relaxation_river {
+.background_rainy_city {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_resting_in_the_inn {
+.background_red {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_river_of_lava {
+.background_relaxation_river {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_rolling_hills {
+.background_resting_in_the_inn {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_rope_bridge {
+.background_river_of_lava {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_rose_garden {
+.background_rolling_hills {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_rowboat {
+.background_rope_bridge {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_salt_lake {
+.background_rose_garden {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px 0px;
  width: 141px;
  height: 147px;
 }
-.background_sandcastle {
+.background_rowboat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -148px;
  width: 141px;
  height: 147px;
 }
-.background_school_of_fish {
+.background_salt_lake {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -296px;
  width: 141px;
  height: 147px;
 }
-.background_scribes_workshop {
+.background_sandcastle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -444px;
  width: 141px;
  height: 147px;
 }
-.background_seafarer_ship {
+.background_school_of_fish {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -592px;
  width: 141px;
  height: 147px;
 }
-.background_seaside_cliffs {
+.background_scribes_workshop {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -740px;
  width: 141px;
  height: 147px;
 }
-.background_shimmering_ice_prism {
+.background_seafarer_ship {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -888px;
  width: 141px;
  height: 147px;
 }
-.background_shimmery_bubbles {
+.background_seaside_cliffs {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_slimy_swamp {
+.background_shimmering_ice_prism {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_snowglobe {
+.background_shimmery_bubbles {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_snowman_army {
+.background_slimy_swamp {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_snowy_day_fireplace {
+.background_snowglobe {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_snowy_pines {
+.background_snowman_army {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_snowy_sunrise {
+.background_snowy_day_fireplace {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_south_pole {
+.background_snowy_pines {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_sparkling_snowflake {
+.background_snowy_sunrise {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_spider_web {
+.background_south_pole {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_splash_in_a_puddle {
+.background_sparkling_snowflake {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_spooky_hotel {
+.background_spider_web {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px 0px;
  width: 141px;
  height: 147px;
 }
-.background_spooky_scarecrow_field {
+.background_splash_in_a_puddle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -148px;
  width: 141px;
  height: 147px;
 }
-.background_spring_rain {
+.background_spooky_hotel {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -296px;
  width: 141px;
  height: 147px;
 }
-.background_spring_thaw {
+.background_spooky_scarecrow_field {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -444px;
  width: 141px;
  height: 147px;
 }
-.background_stable {
+.background_spring_rain {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -592px;
  width: 141px;
  height: 147px;
 }
-.background_stained_glass {
+.background_spring_thaw {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -740px;
  width: 141px;
  height: 147px;
 }
-.background_starry_skies {
+.background_stable {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -888px;
  width: 141px;
  height: 147px;
 }
-.background_starry_winter_night {
+.background_stained_glass {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_stoikalm_volcanoes {
+.background_starry_skies {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_stone_circle {
+.background_starry_winter_night {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_stone_tower {
+.background_stoikalm_volcanoes {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_stormy_rooftops {
+.background_stone_circle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_stormy_ship {
+.background_stone_tower {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_strange_sewers {
+.background_stormy_rooftops {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_strawberry_patch {
+.background_stormy_ship {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_succulent_garden {
+.background_strange_sewers {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_summer_fireworks {
+.background_strawberry_patch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_sunken_ship {
+.background_succulent_garden {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_sunset_meadow {
+.background_summer_fireworks {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_sunset_oasis {
+.background_sunken_ship {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_sunset_savannah {
+.background_sunset_meadow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px 0px;
  width: 141px;
  height: 147px;
 }
-.background_swarming_darkness {
+.background_sunset_oasis {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -148px;
  width: 141px;
  height: 147px;
 }
-.background_swimming_among_jellyfish {
+.background_sunset_savannah {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -296px;
  width: 141px;
  height: 147px;
 }
-.background_tar_pits {
+.background_swarming_darkness {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -444px;
  width: 141px;
  height: 147px;
 }
-.background_tavern {
+.background_swimming_among_jellyfish {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -592px;
  width: 141px;
  height: 147px;
 }
-.background_tea_party {
+.background_tar_pits {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -740px;
  width: 141px;
  height: 147px;
 }
-.background_terraced_rice_field {
+.background_tavern {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -888px;
  width: 141px;
  height: 147px;
 }
-.background_throne_room {
+.background_tea_party {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -1036px;
  width: 141px;
  height: 147px;
 }
-.background_thunderstorm {
+.background_terraced_rice_field {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -1184px;
  width: 141px;
  height: 147px;
 }
-.background_tide_pool {
+.background_throne_room {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -1332px;
  width: 141px;
  height: 147px;
 }
-.background_tornado {
+.background_thunderstorm {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: 0px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_toymakers_workshop {
+.background_tide_pool {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -142px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_training_grounds {
+.background_tornado {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -284px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_treasure_room {
+.background_toymakers_workshop {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -426px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_tree_roots {
+.background_training_grounds {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -568px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_treehouse {
+.background_treasure_room {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -710px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_tulip_garden {
+.background_tree_roots {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -852px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_twinkly_lights {
+.background_treehouse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -994px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_twinkly_party_lights {
+.background_tulip_garden {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1136px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_underwater_among_koi {
+.background_twinkly_lights {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1278px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_underwater_ruins {
+.background_twinkly_party_lights {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1420px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_underwater_vents {
+.background_undead_hands {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1562px -1480px;
  width: 141px;
  height: 147px;
 }
-.background_valentines_day_feasting_hall {
+.background_underwater_among_koi {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1704px 0px;
  width: 141px;
  height: 147px;
 }
-.background_viking_ship {
+.background_underwater_ruins {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1704px -148px;
  width: 141px;
  height: 147px;
 }
-.background_vineyard {
+.background_underwater_vents {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1704px -296px;
  width: 141px;
  height: 147px;
 }
-.background_violet {
+.background_valentines_day_feasting_hall {
  background-image: url('~@/assets/images/sprites/spritesmith-main-1.png');
  background-position: -1704px -444px;
  width: 141px;
@@ -1,42 +1,72 @@
 .quest_TEMPLATE_FOR_MISSING_IMAGE {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -719px -1546px;
+  background-position: -502px -1519px;
  width: 221px;
  height: 39px;
 }
-.quest_ferret {
+.quest_dustbunnies {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -443px 0px;
+  background-position: -220px 0px;
  width: 219px;
  height: 219px;
 }
-.quest_fluorite {
+.quest_egg {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -1762px -362px;
+  width: 165px;
+  height: 207px;
+}
+.quest_evilsanta {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -1762px -1023px;
+  width: 118px;
+  height: 131px;
+}
+.quest_evilsanta2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -440px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_falcon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
  background-position: 0px -232px;
  width: 219px;
  height: 219px;
 }
-.quest_frog {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px 0px;
-  width: 221px;
-  height: 213px;
-}
-.quest_ghost_stag {
+.quest_ferret {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
  background-position: -220px -232px;
  width: 219px;
  height: 219px;
 }
-.quest_goldenknight1 {
+.quest_fluorite {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
  background-position: -440px -232px;
  width: 219px;
  height: 219px;
 }
+.quest_frog {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -1540px 0px;
+  width: 221px;
+  height: 213px;
+}
+.quest_ghost_stag {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -660px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_goldenknight1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -660px -220px;
+  width: 219px;
+  height: 219px;
+}
 .quest_goldenknight2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -217px -1546px;
+  background-position: 0px -1519px;
  width: 250px;
  height: 150px;
 }
@@ -48,349 +78,319 @@
 }
 .quest_gryphon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -663px -1332px;
+  background-position: -443px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -663px 0px;
+  background-position: 0px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -663px -220px;
+  background-position: -220px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -1332px;
+  background-position: 0px -1332px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -452px;
+  background-position: -440px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -452px;
+  background-position: -660px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -452px;
+  background-position: -880px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -1332px;
+  background-position: -660px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -452px;
+  background-position: -880px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -883px 0px;
+  background-position: -880px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -883px -220px;
+  background-position: 0px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1765px -537px;
+  background-position: -1762px -570px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -883px -440px;
+  background-position: -220px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -672px;
+  background-position: -440px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -672px;
+  background-position: -660px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -214px;
+  background-position: -1540px -214px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -672px;
+  background-position: -880px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -672px;
+  background-position: -1100px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -672px;
+  background-position: -1100px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px 0px;
+  background-position: -1100px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px -220px;
+  background-position: -1100px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -431px;
+  background-position: -1540px -431px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -1332px;
+  background-position: -220px -1332px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px -440px;
+  background-position: 0px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -648px;
+  background-position: -1540px -648px;
  width: 216px;
  height: 216px;
 }
 .quest_penguin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1765px -353px;
+  background-position: -1762px -178px;
  width: 190px;
  height: 183px;
 }
 .quest_pterodactyl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px -660px;
+  background-position: -220px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_rat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -892px;
+  background-position: -440px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_robot {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -892px;
+  background-position: -660px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_rock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -865px;
+  background-position: -1540px -865px;
  width: 216px;
  height: 216px;
 }
 .quest_rooster {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1765px 0px;
+  background-position: -1528px -1332px;
  width: 213px;
  height: 174px;
 }
 .quest_ruby {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -892px;
+  background-position: -880px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_sabretooth {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -892px;
+  background-position: -1100px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_seaserpent {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -892px;
+  background-position: -1320px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_sheep {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1100px -892px;
+  background-position: -1320px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_silver {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px 0px;
+  background-position: -1320px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_slime {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -220px;
+  background-position: -1320px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_sloth {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -440px;
+  background-position: -1320px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_snail {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -1332px;
+  background-position: -1320px -1112px;
  width: 219px;
  height: 213px;
 }
 .quest_snake {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1097px -1332px;
+  background-position: -877px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_spider {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -468px -1546px;
+  background-position: -251px -1519px;
  width: 250px;
  height: 150px;
 }
 .quest_squirrel {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -660px;
+  background-position: 0px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_stoikalmCalamity1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1765px -688px;
+  background-position: -1762px -721px;
  width: 150px;
  height: 150px;
 }
 .quest_stoikalmCalamity2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -880px;
+  background-position: -220px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_stoikalmCalamity3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -1112px;
+  background-position: -440px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_stone {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -1112px;
+  background-position: -660px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_taskwoodsTerror1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1765px -839px;
+  background-position: -1762px -872px;
  width: 150px;
  height: 150px;
 }
 .quest_taskwoodsTerror2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -1082px;
+  background-position: -1540px -1082px;
  width: 216px;
  height: 216px;
 }
 .quest_taskwoodsTerror3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -1112px;
+  background-position: -880px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_treeling {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1314px -1332px;
+  background-position: -1094px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_trex {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1765px -175px;
+  background-position: -1762px 0px;
  width: 204px;
  height: 177px;
 }
 .quest_trex_undead {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1531px -1332px;
+  background-position: -1311px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_triceratops {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turquoise {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turtle {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
  background-position: -1100px -1112px;
  width: 219px;
  height: 219px;
 }
-.quest_unicorn {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1320px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_velociraptor {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px 0px;
-  width: 222px;
-  height: 225px;
-}
-.quest_vice1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -1546px;
-  width: 216px;
-  height: 177px;
-}
@@ -45,7 +45,7 @@
            </li>
            <li>
              <a
-                href="http://habitica.fandom.com/wiki/Whats_New"
+                href="https://habitica.fandom.com/wiki/Whats_New"
                target="_blank"
              >{{ $t('oldNews') }}</a>
            </li>
@@ -130,7 +130,7 @@
                </li>
                <li>
                  <a
-                    href="http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
+                    href="https://habitica.fandom.com/wiki/Guidance_for_Blacksmiths"
                    target="_blank"
                  >{{ $t('guidanceForBlacksmiths') }}</a>
                </li>
@@ -195,7 +195,7 @@
                class="btn btn-contribute btn-front btn-flat"
              >
                <a
-                  href="http://habitica.fandom.com/wiki/Contributing_to_Habitica"
+                  href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
                  target="_blank"
                >
                  <div
@@ -348,7 +348,7 @@
            <li>
              <a
                v-once
-                href="http://habitica.fandom.com/wiki/Habitica_Wiki"
+                href="https://habitica.fandom.com/wiki/Habitica_Wiki"
                target="_blank"
              >{{ $t('wiki') }}</a>
            </li>
@@ -12,7 +12,7 @@
      @click="openGemsModal"
    >
      <img
-        v-if="eventName === 'fall2020'"
+        v-if="eventName === 'fall_extra_gems'"
        class="d-none d-xl-block"
        srcset="
    ~@/assets/images/gems/fall-confetti-left/confetti.png,
@@ -21,7 +21,7 @@
        src="~@/assets/images/gems/fall-confetti-left/confetti.png"
      >
      <img
-        v-else-if="eventName === 'fall2020SecondPromo'"
+        v-else-if="eventName === 'spooky_extra_gems'"
        class="d-none d-xl-block"
        srcset="
    ~@/assets/images/gems/spooky-confetti-left/confetti.png,
@@ -31,7 +31,7 @@
      >
      <div class="promo-test">
        <img
-          v-if="eventName === 'fall2020'"
+          v-if="eventName === 'fall_extra_gems'"
          srcset="
      ~@/assets/images/gems/fall-text/text.png,
      ~@/assets/images/gems/fall-text/text@2x.png 2x,
@@ -39,7 +39,7 @@
          src="~@/assets/images/gems/fall-text/text.png"
        >
        <img
-          v-else-if="eventName === 'fall2020SecondPromo'"
+          v-else-if="eventName === 'spooky_extra_gems'"
          srcset="
      ~@/assets/images/gems/spooky-text/text.png,
      ~@/assets/images/gems/spooky-text/text@2x.png 2x,
@@ -48,7 +48,7 @@
        >
      </div>
      <img
-        v-if="eventName === 'fall2020'"
+        v-if="eventName === 'fall_extra_gems'"
        class="d-none d-xl-block"
        srcset="
    ~@/assets/images/gems/fall-confetti-right/confetti.png,
@@ -57,7 +57,7 @@
        src="~@/assets/images/gems/fall-confetti-right/confetti.png"
      >
      <img
-        v-else-if="eventName === 'fall2020SecondPromo'"
+        v-else-if="eventName === 'spooky_extra_gems'"
        class="d-none d-xl-block"
        srcset="
    ~@/assets/images/gems/spooky-confetti-right/confetti.png,
@@ -72,11 +72,11 @@
 <style lang="scss" scoped>
@import '~@/assets/scss/colors.scss';

-.gems-promo-banner-fall2020 {
+.gems-promo-banner-fall_extra_gems {
  background: $gray-10;
 }

-.gems-promo-banner-fall2020SecondPromo {
+.gems-promo-banner-spooky_extra_gems {
  background: $black;
 }

@@ -105,8 +105,8 @@ export default {
    },
    showGemsPromoBanner () {
      const currEvt = this.currentEvent;
-      if (!currEvt) return false;
-      return currEvt.event === 'fall2020' || currEvt.event === 'fall2020SecondPromo';
+      if (!currEvt || !currEvt.gemsPromo) return false;
+      return true;
    },
    bannerClass () {
      const bannerClass = 'gems-promo-banner';
@@ -145,6 +145,9 @@ export default {
      currentWidth: 0,
      inviteModalGroup: undefined,
      inviteModalGroupType: undefined,
+      group: {},
+      members: [],
+      membersLoaded: false,
    };
  },
  computed: {
@@ -236,14 +239,26 @@ export default {
        this.$root.$emit('bv::show::modal', 'create-party-modal');
      }
    },
-    async showPartyMembers () {
-      const party = await this.$store.dispatch('party:getParty');
+    loadMembers (payload = null) {
+      // Remove unnecessary data
+      if (payload && payload.challengeId) {
+        delete payload.challengeId;
+      }

+      return this.$store.dispatch('members:getGroupMembers', payload);
+    },
+    async showPartyMembers () {
+      this.group = await this.$store.dispatch('party:getParty');
+      this.group = this.$store.state.party.data;
+      this.membersLoaded = true;
+      this.members = this.partyMembers;
+      this.$store.state.memberModalOptions.loading = false;
      this.$root.$emit('habitica:show-member-modal', {
-        groupId: party.data._id,
-        viewingMembers: this.partyMembers,
-        group: party.data,
-        fetchMoreMembers: p => this.$store.dispatch('members:getGroupMembers', p),
+        groupId: this.group._id,
+        group: this.group,
+        memberCount: this.group.memberCount,
+        viewingMembers: this.members,
+        fetchMoreMembers: this.loadMembers,
      });
    },
    setPartyMembersWidth ($event) {
@@ -329,12 +329,12 @@
              >{{ $t('requestAF') }}</a>
              <a
                class="topbar-dropdown-item dropdown-item"
-                href="http://habitica.fandom.com/wiki/Contributing_to_Habitica"
+                href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
                target="_blank"
              >{{ $t('contributing') }}</a>
              <a
                class="topbar-dropdown-item dropdown-item"
-                href="http://habitica.fandom.com/wiki/Habitica_Wiki"
+                href="https://habitica.fandom.com/wiki/Habitica_Wiki"
                target="_blank"
              >{{ $t('wiki') }}</a>
            </div>
@@ -14,7 +14,7 @@

    <div class="modal-footer d-flex align-items-center pb-0">
      <a
-        href="http://habitica.fandom.com/wiki/Whats_New"
+        href="https://habitica.fandom.com/wiki/Whats_New"
        target="_blank"
        class="mr-auto"
      >{{ $t('newsArchive') }}</a>
@@ -426,6 +426,22 @@ const NOTIFICATIONS = {
      achievement: 'domesticated',
    },
  },
+  ACHIEVEMENT_SHADY_CUSTOMER: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementShadyCustomer')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'shadyCustomer',
+    },
+  },
+  ACHIEVEMENT_SHADE_OF_IT_ALL: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementShadeOfItAll')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'shadeOfItAll',
+    },
+  },
 };

 export default {
@@ -489,6 +505,7 @@ export default {
      'ACHIEVEMENT_BONE_COLLECTOR', 'ACHIEVEMENT_SKELETON_CREW', 'ACHIEVEMENT_SEEING_RED',
      'ACHIEVEMENT_RED_LETTER_DAY', 'ACHIEVEMENT_LEGENDARY_BESTIARY', 'ACHIEVEMENT_SEASONAL_SPECIALIST',
      'ACHIEVEMENT_VIOLETS_ARE_BLUE', 'ACHIEVEMENT_WILD_BLUE_YONDER', 'ACHIEVEMENT_DOMESTICATED',
+      'ACHIEVEMENT_SHADY_CUSTOMER', 'ACHIEVEMENT_SHADE_OF_IT_ALL',
    ].forEach(type => {
      handledNotifications[type] = true;
    });
@@ -920,6 +937,8 @@ export default {
          case 'ACHIEVEMENT_VIOLETS_ARE_BLUE':
          case 'ACHIEVEMENT_WILD_BLUE_YONDER':
          case 'ACHIEVEMENT_DOMESTICATED':
+          case 'ACHIEVEMENT_SHADY_CUSTOMER':
+          case 'ACHIEVEMENT_SHADE_OF_IT_ALL':
          case 'GENERIC_ACHIEVEMENT':
            this.showNotificationWithModal(notification);
            break;
@@ -21,7 +21,7 @@
            class="col-12 text-center"
          >
            <img
-              v-if="eventName === 'fall2020'"
+              v-if="eventName === 'fall_extra_gems'"
              :alt="$t('supportHabitica')"
              srcset="
          ~@/assets/images/gems/fall-header.png,
@@ -30,7 +30,7 @@
              src="~@/assets/images/gems/fall-header.png"
            >
            <img
-              v-else-if="eventName === 'fall2020SecondPromo'"
+              v-else-if="eventName === 'spooky_extra_gems'"
              :alt="$t('supportHabitica')"
              srcset="
          ~@/assets/images/gems/spooky-header.png,
@@ -207,8 +207,8 @@
    }
  }

-  // Fall 2020 events styles
-  /* #buy-gems.event-fall2020, #buy-gems.event-fall2020SecondPromo {
+  // Fall events styles
+  #buy-gems.event-fall_extra_gems, #buy-gems.event-spooky_extra_gems {
    .header-wrap {
      padding-top: 4.5rem;
      padding-bottom: 1.5rem;
@@ -234,21 +234,21 @@
    .close-icon:hover svg path {
      stroke: $gray-400;
    }
-  } */
+  }

-  /* #buy-gems.event-fall2020 {
+  #buy-gems.event-fall_extra_gems {
    .header-wrap {
      background-image: url('~@/assets/images/gems/fall-header-bg@2x.png');
      background-size: 100%;
    }
  }

-  #buy-gems.event-fall2020SecondPromo {
+  #buy-gems.event-spooky_extra_gems {
    .header-wrap {
      background-image: url('~@/assets/images/gems/spooky-header-bg@2x.png');
      background-size: 100%;
    }
-  } */
+  }
 </style>

 <style lang="scss" scoped>
@@ -74,6 +74,19 @@
        v-if="members.length > 3"
        class="row gradient"
      ></div>
+      <div
+        v-if="isLoadMoreAvailable"
+        class="row"
+      >
+        <div class="col-12 text-center">
+          <button
+            class="btn btn-secondary"
+            @click="loadMoreMembers()"
+          >
+            {{ $t('loadMore') }}
+          </button>
+        </div>
+      </div>
    </b-modal>
  </div>
 </template>
@@ -157,11 +170,13 @@ export default {
  components: {
    MemberDetails,
  },
-  props: ['group', 'hideBadge', 'item'],
+  props: ['hideBadge', 'item'],
  data () {
    return {
      sortOption: '',
      members: [],
+      group: {},
+      invites: [],
      memberToRemove: '',
      sortOptions: [
        {
@@ -210,6 +225,14 @@ export default {

      return this.members;
    },
+    isLoadMoreAvailable () {
+      // Only available if the current length of `members` is less than the
+      // total size of the Group/Challenge
+      return this.members.length < this.$store.state.memberModalOptions.memberCount;
+    },
+    challengeId () {
+      return this.$store.state.memberModalOptions.challengeId;
+    },
    groupId () {
      return this.$store.state.groupId || this.group._id;
    },
@@ -222,7 +245,20 @@ export default {
    },
  },
  methods: {
+    loadMembers (payload = null) {
+      // Remove unnecessary data
+      if (payload && payload.challengeId) {
+        delete payload.challengeId;
+      }
+
+      return this.$store.dispatch('members:getGroupMembers', payload);
+    },
    async getMembers () {
+      this.group = await this.$store.dispatch('party:getParty');
+      this.group = this.$store.state.party.data;
+      this.$store.state.memberModalOptions.memberCount = this.group.memberCount;
+      this.$store.state.memberModalOptions.fetchMoreMembers = this.loadMembers;
+
      const { groupId } = this;
      if (groupId && groupId !== 'challenge') {
        const members = await this.$store.dispatch('members:getGroupMembers', {
@@ -230,6 +266,11 @@ export default {
          includeAllPublicFields: true,
        });
        this.members = members;
+        const invites = await this.$store.dispatch('members:getGroupInvites', {
+          groupId,
+          includeAllPublicFields: true,
+        });
+        this.invites = invites;
      }

      if ((!this.members || this.members.length === 0)
@@ -241,6 +282,20 @@ export default {
      if (!this.members || (this.members.length === 0 && !this.groupId)) {
        this.members = [this.user];
      }
+      this.$store.state.memberModalOptions.viewingMembers = this.members;
+    },
+    async loadMoreMembers () {
+      const lastMember = this.members[this.members.length - 1];
+      if (!lastMember) return;
+
+      const newMembers = await this.$store.state.memberModalOptions.fetchMoreMembers({
+        challengeId: this.challengeId,
+        groupId: this.groupId,
+        lastMemberId: lastMember._id,
+        includeAllPublicFields: true,
+      });
+
+      this.members = this.members.concat(newMembers);
    },
    close () {
      this.$root.$emit('bv::hide::modal', 'select-member-modal');
@@ -109,7 +109,7 @@ export default {
      // linkStart: '[',
      // linkEnd: '](/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)',
      // },
-      // "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.fandom.com/wiki/FAQ), come ask in the <%= linkStart %>Habitica Help guild<%= linkEnd %>! We're happy to help."
+      // "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the <%= linkStart %>Habitica Help guild<%= linkEnd %>! We're happy to help."
    };
  },
  mounted () {
@@ -83,7 +83,7 @@
          <small>
            <a
              target="_blank"
-              href="http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet"
+              href="https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet"
              :class="cssClass('headings')"
            >{{ $t('markdownHelpLink') }}</a>
          </small>
@@ -45,7 +45,7 @@
      <div class="col-12 text-center">
        <a
          class="footer-link"
-          href="http://habitica.fandom.com/wiki/World_Bosses"
+          href="https://habitica.fandom.com/wiki/World_Bosses"
          target="_blank"
        >{{ $t('worldBossLink') }}</a>
      </div>
@@ -82,7 +82,7 @@ export default {
          uuid: user._id,
          taskType: task.type,
          direction,
-        });
+        }, { trackOnClient: true });
        if (!tasksScoredCount) {
          setLocalSetting(CONSTANTS.keyConstants.TASKS_SCORED_COUNT, 1);
        } else {
@@ -120,7 +120,7 @@ export async function create (store, createdTask) {
        hitType: 'event',
        uuid,
        taskType: taskRes.type,
-      });
+      }, { trackOnClient: true });
      if (!tasksCreatedCount) {
        setLocalSetting(CONSTANTS.keyConstants.TASKS_CREATED_COUNT, 1);
      } else {
@@ -6,9 +6,9 @@
    "achievementLostMasterclasser": "مكمل المغامرات: سلسلة الخبير",
    "achievementLostMasterclasserText": "لقد أكملت جميع المغامرات الستة عشرة في سلسلة مغامرات الخبير و حللت لغز الخبيرة المفقودة!",
    "foundNewItems": "لقد وجدت اغراضاً جديدة!",
-    "onboardingCompleteDescSmall": "إذا اردت المزيد، الق نظرة على الانجازات و ابدأ فى تجميعها!",
+    "onboardingCompleteDescSmall": "ان كنت ترغب بالمزيد، اتطلع على الانجازات و ابدأ بالتحصيل!",
    "onboardingComplete": "لقد أكملت مهام بدء اللعبة!",
-    "earnedAchievement": "لقد حققت إنجازاً!",
+    "earnedAchievement": "لقد حصلت على إنجاز !",
    "viewAchievements": "الإطلاع على الانجازات",
    "letsGetStarted": "هيا بنا!",
    "yourProgress": "تقدمك",
@@ -114,5 +114,8 @@
    "achievementUndeadUndertakerModalText": "لقد أكملت ترويض جميع حيوانات الركوب من الأحياء الموتى!",
    "achievementUndeadUndertakerText": "أكمل/ت ترويض جميع حيوانات الركوب من الأحياء الموتى.",
    "achievementUndeadUndertaker": "متعهد الأحياء الموتى",
-    "achievementKickstarter2019Text": "من مساهمي حملة كيك-ستارتر للدبابيس"
+    "achievementKickstarter2019Text": "من مساهمي حملة كيك-ستارتر للدبابيس",
+    "achievementDomesticatedModalText": "لقد جمعت كل الحيوانات الأليفة المستأنسة!",
+    "achievementDomesticatedText": "لقد فقس جميع الألوان القياسية للحيوانات الأليفة المستأنسة: النمس ، وخنزير غينيا ، والديك ، والخنزير الطائر ، والجرذ ، والأرنب ، والحصان ، والبقر!",
+    "achievementDomesticated": "ا-يا-ا-يا-يو"
 }
@@ -11,10 +11,10 @@
    "challengeCompleted": "اكتمل هذا التحدي، والفائز/ة <span class=\"badge\"><%- user %></span>! ما المراد فعله بالمهمات اليتيمة؟",
    "unsubChallenge": "رابط التحدي لا يعمل: كانت هذه المهمة تتبع لتحد، ولكنك قمت بإلغاء مشاركتك في التحدي. ما المراد فعله بالمهمات اليتيمة؟",
    "challenges": "التحديات",
-    "endDate": "ينتهي",
+    "endDate": "ينتهي في",
    "selectWinner": "اختيار فائز و إنهاء التحدي:",
    "endChallenge": "إنهاء التحدي",
-    "filter": "ترشيح",
+    "filter": "التصفية",
    "groups": "المجموعات",
    "category": "تصنيف",
    "membership": "العضوية",
@@ -30,11 +30,11 @@
    "publicChallengesTitle": "تحديات عامة",
    "officialChallenge": "تحدي رسمي من Habitica",
    "by": "المنشئ",
-    "participants": "<%= membercount %> مشاركين.",
+    "participants": "<%= membercount %> مشاركين",
    "join": "انضمام",
    "exportChallengeCSV": "تصدير لملف CSV",
    "challengeCreated": "تم إنشاء التحدي",
-    "sureDelCha": "هل انت متأكد أنك تريد حذف هذا التحدى؟",
+    "sureDelCha": "هل انت متأكد أنك تريد حذف هذا التحدي؟",
    "sureDelChaTavern": "هل انت متأكد أنك تريد حذف هذا التحدى؟ جواهرك لن يتم ردها.",
    "keepTasks": "الاحتفاظ بالمهام",
    "owned": "له مالك",
@@ -44,58 +44,58 @@
    "congratulations": "مبروك!",
    "hurray": "مرحى!",
    "noChallengeOwner": "لا يوجد مالك",
-    "challengeMemberNotFound": "لم يتم ايجاد المستخدم بين أعضاء التحدي.",
-    "onlyGroupLeaderChal": "يستطيع قائد المجموعه فقط انشاء التحديات.",
-    "tavChalsMinPrize": "Prize must be at least 1 Gem for Public Challenges.",
+    "challengeMemberNotFound": "لم يتم ايجاد المستخدم بين أعضاء التحدي",
+    "onlyGroupLeaderChal": "قائد المجوعة هو الوحيد القادر على انشاء التحديات",
+    "tavChalsMinPrize": "يجب أن تكون الجائزة جوهرة واحدة على الأقل للتحديات العامة.",
    "cantAfford": "لا تقدر على شراء هذه الجائزة. اشتر أكثر من الجواهر أو قلّل مبلغ الجائزة.",
-    "challengeIdRequired": "\"challengeId\" must be a valid UUID.",
-    "winnerIdRequired": "\"winnerId\" must be a valid UUID.",
-    "challengeNotFound": "Challenge not found or you don't have access.",
-    "onlyLeaderDeleteChal": "Only the challenge leader can delete it.",
-    "onlyLeaderUpdateChal": "Only the challenge leader can update it.",
-    "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.",
-    "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.",
-    "userAlreadyInChallenge": "User is already participating in this challenge.",
-    "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked.",
-    "joinedChallenge": "Joined a Challenge",
-    "joinedChallengeText": "This user put themselves to the test by joining a Challenge!",
-    "myChallenges": "My Challenges",
-    "findChallenges": "Discover Challenges",
-    "noChallengeTitle": "You don't have any Challenges.",
-    "challengeDescription1": "Challenges are community events in which players compete and earn prizes by completing a group of related tasks.",
-    "challengeDescription2": "Find recommended Challenges based on your interests, browse Habitica's public Challenges, or create your own Challenges.",
-    "noChallengeMatchFilters": "We couldn't find any matching Challenges.",
-    "createdBy": "Created By",
+    "challengeIdRequired": "يجب أن يكون \"معرف التحدي\" معرفًا فريدًا صالحًا.",
+    "winnerIdRequired": "يجب أن يكون \"معرف الفائز\" معرفًا فريدًا صالحًا.",
+    "challengeNotFound": "التحدي غير موجود أو ليس لديك حق الولوج إليه.",
+    "onlyLeaderDeleteChal": "يمكن لقائد التحدي فقط حذفه.",
+    "onlyLeaderUpdateChal": "يمكن لقائد التحدي فقط تحديثه.",
+    "winnerNotFound": "الفائز بالمعرف \"<%= userId%>\" غير موجود أو ليس جزءًا من التحدي.",
+    "onlyChalLeaderEditTasks": "لا يمكن تحرير المهام التي تنتمي إلى التحدي إلا بواسطة القائد.",
+    "userAlreadyInChallenge": "المستخدم يشارك في هذا التحدي.",
+    "cantOnlyUnlinkChalTask": "يمكن فقط إلغاء ربط مهام التحديات المعطلة.",
+    "joinedChallenge": "انضم إلى التحدي",
+    "joinedChallengeText": "وضع هذا المستخدم نفسه في الاختبار من خلال الانضمام إلى أحد التحديات!",
+    "myChallenges": "تحدياتي",
+    "findChallenges": "اكتشف التحديات الأخرى",
+    "noChallengeTitle": "ليس لديك أي تحديات.",
+    "challengeDescription1": "التحديات هي أحداث مجتمعية يتنافس فيها اللاعبون ويكسبون جوائز من خلال إكمال مجموعة من المهام المتعلقة بالتحدي.",
+    "challengeDescription2": "ابحث عن التحديات الموصى بها بناءً على اهتماماتك ، أو تصفح تحديات Habitica العامة ، أو قم بإنشاء تحدياتك الخاصة.",
+    "noChallengeMatchFilters": "لم نتمكن من العثور على أي تحديات مماثلة.",
+    "createdBy": "انشأ من قبل",
    "joinChallenge": "Join Challenge",
-    "leaveChallenge": "Leave Challenge",
-    "addTask": "Add Task",
-    "editChallenge": "Edit Challenge",
-    "challengeDescription": "Challenge Description",
-    "selectChallengeWinnersDescription": "Select a winner from the Challenge participants",
-    "awardWinners": "Award Winner",
-    "doYouWantedToDeleteChallenge": "Do you want to delete this Challenge?",
-    "deleteChallenge": "Delete Challenge",
-    "challengeNamePlaceholder": "What is your Challenge name?",
-    "challengeSummary": "Summary",
-    "challengeSummaryPlaceholder": "Write a short description advertising your Challenge to other Habiticans. What is the main purpose of your Challenge and why should people join it? Try to include useful keywords in the description so that Habiticans can easily find it when they search!",
-    "challengeDescriptionPlaceholder": "Use this section to go into more detail about everything that Challenge participants should know about your Challenge.",
-    "challengeGuild": "Add to",
-    "challengeMinimum": "Minimum 1 Gem for public Challenges (helps prevent spam, it really does).",
-    "participantsTitle": "Participants",
-    "shortName": "Short Name",
-    "shortNamePlaceholder": "What short tag should be used to identify your Challenge?",
-    "updateChallenge": "Update Challenge",
-    "haveNoChallenges": "This group has no Challenges",
-    "loadMore": "Load More",
-    "exportChallengeCsv": "Export Challenge",
-    "editingChallenge": "Editing Challenge",
-    "nameRequired": "Name is required",
-    "tagTooShort": "Tag name is too short",
-    "summaryRequired": "Summary is required",
-    "summaryTooLong": "Summary is too long",
-    "descriptionRequired": "Description is required",
-    "locationRequired": "Location of challenge is required ('Add to')",
-    "categoiresRequired": "One or more categories must be selected",
+    "leaveChallenge": "ترك التحدي",
+    "addTask": "إضافة مهمة",
+    "editChallenge": "تحرير التحدي",
+    "challengeDescription": "وصف التحدي",
+    "selectChallengeWinnersDescription": "حدد فائزًا من المشاركين في التحدي",
+    "awardWinners": "الفائز بالجائزة",
+    "doYouWantedToDeleteChallenge": "هل تريد حذف هذا التحدي؟",
+    "deleteChallenge": "حذف التحدي",
+    "challengeNamePlaceholder": "ما هو اسم التحدي الخاص بك؟",
+    "challengeSummary": "ملخص",
+    "challengeSummaryPlaceholder": "اكتب وصفًا موجزًا للإعلان عن التحدي الخاص بك لغيرك من السكان الأصليين. ما هو الغرض الرئيسي من التحدي الخاص بك ولماذا يجب على الأشخاص الانضمام إليه؟ حاول تضمين كلمات رئيسية مفيدة في الوصف حتى يتمكن Habiticans من العثور عليها بسهولة عند البحث!",
+    "challengeDescriptionPlaceholder": "استخدم هذا القسم للخوض في مزيد من التفاصيل حول كل ما يجب أن يعرفه المشاركون في التحدي عن التحدي الخاص بك.",
+    "challengeGuild": "اضف إلي",
+    "challengeMinimum": "الحد الأدنى 1 جوهرة للتحديات العامة (يساعد في منع كل ما هو عشوائي).",
+    "participantsTitle": "مشاركون",
+    "shortName": "اسم قصير",
+    "shortNamePlaceholder": "ما هي العلامة القصيرة التي يجب استخدامها لتحديد التحدي الخاص بك؟",
+    "updateChallenge": "تحديث التحدي",
+    "haveNoChallenges": "هذه المجموعة ليس لديها تحديات",
+    "loadMore": "تحميل المزيد",
+    "exportChallengeCsv": "تصدير التحدي",
+    "editingChallenge": "تحرير التحدي",
+    "nameRequired": "الاسم مطلوب",
+    "tagTooShort": "اسم العلامة قصير جدًا",
+    "summaryRequired": "الملخص مطلوب",
+    "summaryTooLong": "الملخص طويل جدًا",
+    "descriptionRequired": "الوصف مطلوب",
+    "locationRequired": "موقع التحدي مطلوب (\"أضف إلى\")",
+    "categoiresRequired": "يجب تحديد فئة واحدة أو أكثر",
    "viewProgressOf": "مشاهدة ملف",
    "viewProgress": "عرض التقد",
    "selectMember": "اختر عضو",
@@ -103,5 +103,5 @@
    "selectParticipant": "اختر مشارك",
    "wonChallengeDesc": "<%= إسم التحدي %> إخترتك لتكون الفائز!تم تسجيل فوزك في \"إنجازاتك\".",
    "yourReward": "مكافئاتك",
-    "filters": "فلاتر"
+    "filters": "التصفيات"
 }
@@ -78,16 +78,16 @@
    "xp": "نقطات خبرة",
    "health": "الصحة",
    "allocateStr": "نقاط مخصصة للقوة:",
-    "allocateStrPop": "Add a Point to Strength",
+    "allocateStrPop": "إضافة نقطة الى القوة",
    "allocateCon": "نقاط مخصصة للبنية الجسدية:",
    "allocateConPop": "Add a Point to Constitution",
    "allocatePer": "نقاط مخصصة للإدراك:",
-    "allocatePerPop": "Add a Point to Perception",
+    "allocatePerPop": "إضافة نقطة الى الإدراك",
    "allocateInt": "نقاط مخصصة للذكاء:",
-    "allocateIntPop": "Add a Point to Intelligence",
-    "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Stat Points. You can continue leveling up, or start a new adventure at level 1 by using the <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a>, now available for free in the Market.",
+    "allocateIntPop": "إضافة نقطة الى الذكاء",
+    "noMoreAllocate": "الآن وقد وصلت إلى المستوى 100 ، لن تكسب المزيد من نقاط Stat Points.  يمكنك الاستمرار في الارتقاء بمستواك أو بدء مغامرة جديدة من المستوى 1 باستخدام <a href='http://habitica.fandom.com/wiki/Orb_of_Rebirth' target='_blank'> Orb of Rebirth </a>!",
    "stats": "Stats",
-    "achievs": "Achievements",
+    "achievs": "الإنجازات",
    "strength": "الطاقة",
    "strText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
    "constitution": "البنية الجسدية",
@@ -132,7 +132,7 @@
    "healerText": "Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don't faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!",
    "optOutOfClasses": "Opt Out",
    "chooseClass": "Choose your Class",
-    "chooseClassLearnMarkdown": "[Learn more about Habitica's class system](http://habitica.wikia.com/wiki/Class_System)",
+    "chooseClassLearnMarkdown": "[تعرف على المزيد من المعلومات حول نظام الصف في Habitica ](http://habitica.wikia.com/wiki/Class_System)",
    "optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User Icon > Settings.",
    "selectClass": "Select <%= heroClass %>",
    "select": "اختيار",
@@ -181,5 +181,7 @@
    "mainHand": "Main-Hand",
    "offHand": "Off-Hand",
    "statPoints": "Stat Points",
-    "pts": "pts"
+    "pts": "pts",
+    "purchaseForGold": "شراء <%= cost %> الذهب؟",
+    "notEnoughGold": "لا تملك مايكفي من الذهب."
 }
@@ -3,7 +3,7 @@
    "dontDespair": "لا تيأس!",
    "deathPenaltyDetails": "لقد فقدت مستوى، كل ذهبك، وقطعة من معداتك الخاصة، ولكن يمكنك إعادة كل منهم مع العمل الجاد! حظاً موفقاً--سوف تبلو بلاءً حسناً.",
    "refillHealthTryAgain": "عبئ صحتك وحاول مرةً أخرى",
-    "dyingOftenTips": "هل هذا يحدث بشكل مكرر؟ <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'> إليك بعض النصائح!</a>",
+    "dyingOftenTips": "هل يحدث هذا غالباً؟ <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'> إليك بعض النصائح!</a>",
    "losingHealthWarning": "احذر، أنت تفقد صحتك!",
    "losingHealthWarning2": "لا تدع صحتك تهبط إلى صفر! إذا فعلت، ستخسر مستوى وذهبك وقطعة من معداتك.",
    "toRegainHealth": "لتستعيد صحتك:",
@@ -14,4 +14,4 @@
    "lowHealthTips4": "إذا كانت يومية غير مستحقة في يوم معين، تستطيع تعطيلها بالضغط على رمز القلم.",
    "goodLuck": "حظاً موفقاً!",
    "cannotRevive": "لا يمكن الإنعاش إذا ليس ميّت"
-}
+}
@@ -1,3 +1,50 @@
 {
-    "FAQ": "الأسئلة الأكثر شيوعا"
+    "FAQ": "الأسئلة الأكثر شيوعا",
+    "communityFacebook": "Facebook",
+    "forgotPassword": "هل نسيت كلمة المرور؟",
+    "logout": "تسجيل الخروج",
+    "footerMobile": "هاتف",
+    "companyDonate": "تبرع",
+    "login": "تسجيل الدخول",
+    "companyBlog": "مقالات",
+    "communityInstagram": "Instagram",
+    "guidanceForBlacksmiths": "إرشادات للحدادين (المبرمجين)",
+    "companyContribute": "ساهم",
+    "marketing1Header": "حسن عاداتك من خلال اللعب",
+    "footerCompany": "الشركة",
+    "companyAbout": "كيف يعمل",
+    "footerCommunity": "المجتمع",
+    "sendLink": "ارسال رابط",
+    "history": "السجل",
+    "footerDevs": "المطورين",
+    "emailNewPass": "إرسال رابط إعادة تعيين كلمة المرور الى البريد الإلكتروني",
+    "footerSocial": "منصات التواصل الاجتماعي",
+    "free": "الإنضمام مجاناً",
+    "marketing1Lead1": "Habitica هي لعبة تساعدك على تحسين عادات الحياة الواقعية.  إنها \"تحاكي\" حياتك عن طريق تحويل كل مهامك (العادات ، الأعمال اليومية ، المهام) إلى وحوش صغيرة عليك التغلب عليها.  كلما كنت أفضل في هذا ، كلما تقدمت في اللعبة.  إذا تعثرت في الحياة ، تبدأ شخصيتك بالتراجع في اللعبة.",
+    "termsAndAgreement": "بالنقر على الزر ادناه، فإنك تشير الى كونك قد قرأت ووافقت على <a href='/static/terms'>شروط الخدمة</a> و <a href='/static/privacy'>سياسة الخصوصية</a>.",
+    "clearBrowserData": "حذف بيانات المتصفح",
+    "communityExtensions": "<a href='https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations' target='_blank'>الإضافات</a>",
+    "forgotPasswordSteps": "أدخل عنوان البريد الإلكتروني الذي استخدمته لتسجيل حسابك في Habitica.",
+    "pkQuestion1": "ما الذي ألهم Habitica؟  كيف بدأ؟",
+    "mobileAndroid": "Android",
+    "playButton": "العب",
+    "playButtonFull": "دخول Habitica",
+    "password": "كلمة المرور",
+    "newsArchive": "أرشيف الأخبار في ويكيا (متعدد اللغات)",
+    "marketing4Lead3-1": "تريد تحويل حياتك الى لعبة؟",
+    "marketing2Lead3Title": "تحدوا بعضكم",
+    "marketing2Lead2Title": "حارب الوحوش",
+    "marketing4Lead3-2": "مهتم بإدارة مجموعة في التعليم، الصحة، وغير ذلك؟",
+    "mobileIOS": "iOS",
+    "marketing1Lead1Title": "حياتك، لعبة تقمص الأدوار",
+    "marketing3Header": "التطبيقات والإضافات",
+    "marketing2Lead1Title": "الإنتاجية الاجتماعية",
+    "marketing4Lead2": "تكاليف الرعاية الصحية في إزدياد، ويجب فعل شيء ما.  تم إنشاء مئات البرامج لتقليل التكاليف وتحسين الصحة.  نعتقد أن Habitica قادر على تمهيد طريق حقيقي نحو أنماط حياة صحية.",
+    "oldNews": "أخبار",
+    "setNewPass": "تعيين كلمة مرور جديدة",
+    "presskitText": "شكراً لاهتمامك ب Habitica!  يمكن استخدام الصور التالية للمقالات أو مقاطع الفيديو حول Habitica.  لمزيد من المعلومات، يرجى التواصل معنا على <٪ = pressEnquiryEmail٪>.",
+    "invalidEmail": "إجراء إعادة تعيين كلمة المرور يتطلب عنوان بريد الكتروني صالح.",
+    "marketing1Lead2": "حسن عاداتك لبناء صورتك الرمزية، تباهى بالعتاد الذي كسبته!",
+    "marketing2Lead2": "ما هي لعبة تقمص الأدوار من دون معارك؟  حارب الوحوش مع فريقك.  الوحوش هي \"super accountability mode\" - اليوم الذي تتغيب فيه عن النادي الرياضي هو يوم يؤذي فيه الوحش * الجميع! *",
+    "marketing3Lead1": "تتيح لك تطبيقات ** الايفون و الاندرويد ** الاعتناء بالأعمال أثناء التنقل.  نحن ندرك أن تسجيل الدخول إلى موقع الويب للنقر على الأزرار يمكن أن يشكل عائق."
 }
--- a/Show More
+++ b/Show More