4.209.0

feat(content): Shade pet/mount collection achievements
fix(analytics): confirm that 2x/day task actions should track on client
2026-05-10 19:20:21 -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
335 changed files with 38601 additions and 32370 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,18 +1,18 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.205.3",
+  "version": "4.209.0",
  "main": "./website/server/index.js",
  "dependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
+    "@babel/core": "^7.15.5",
+    "@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",
@@ -21,7 +21,7 @@
    "compression": "^1.7.4",
    "cookie-session": "^1.4.0",
    "coupon-code": "^0.4.5",
-    "csv-stringify": "^5.6.4",
+    "csv-stringify": "^5.6.5",
    "cwait": "^1.1.1",
    "domain-middleware": "~0.1.0",
    "eslint": "^6.8.0",
@@ -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.171.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.1",
+    "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.1",
+    "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.16.4",
+    "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,648 +1,396 @@
 .quest_TEMPLATE_FOR_MISSING_IMAGE {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -251px -1543px;
+  background-position: -502px -1519px;
  width: 221px;
  height: 39px;
 }
+.quest_dustbunnies {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -220px 0px;
+  width: 219px;
+  height: 219px;
+}
+.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_ferret {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: -220px -232px;
+  width: 219px;
+  height: 219px;
+}
+.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: 0px -1519px;
+  width: 250px;
+  height: 150px;
+}
+.quest_goldenknight3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
+  background-position: 0px 0px;
+  width: 219px;
+  height: 231px;
+}
 .quest_gryphon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px 0px;
+  background-position: -443px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -223px 0px;
+  background-position: 0px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -443px 0px;
+  background-position: -220px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1088px -1326px;
+  background-position: 0px -1332px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -226px;
+  background-position: -440px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -226px;
+  background-position: -660px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -226px;
+  background-position: -880px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -178px;
+  background-position: -660px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -663px 0px;
+  background-position: -880px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -663px -220px;
+  background-position: -880px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -446px;
+  background-position: 0px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -362px;
+  background-position: -1762px -570px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -446px;
+  background-position: -220px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -446px;
+  background-position: -440px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -446px;
+  background-position: -660px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1100px -1106px;
+  background-position: -1540px -214px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -883px 0px;
+  background-position: -880px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -883px -220px;
+  background-position: -1100px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -883px -440px;
+  background-position: -1100px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -666px;
+  background-position: -1100px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -666px;
+  background-position: -1100px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1317px -1106px;
+  background-position: -1540px -431px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1308px -1326px;
+  background-position: -220px -1332px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -666px;
+  background-position: 0px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -1326px;
+  background-position: -1540px -648px;
  width: 216px;
  height: 216px;
 }
 .quest_penguin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -178px;
+  background-position: -1762px -178px;
  width: 190px;
  height: 183px;
 }
 .quest_pterodactyl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -666px;
+  background-position: -220px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_rat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -666px;
+  background-position: -440px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_robot {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px 0px;
+  background-position: -660px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_rock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -217px -1326px;
+  background-position: -1540px -865px;
  width: 216px;
  height: 216px;
 }
 .quest_rooster {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -1246px;
+  background-position: -1528px -1332px;
  width: 213px;
  height: 174px;
 }
 .quest_ruby {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px -220px;
+  background-position: -880px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_sabretooth {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px -440px;
+  background-position: -1100px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_seaserpent {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1103px -660px;
+  background-position: -1320px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_sheep {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -886px;
+  background-position: -1320px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_silver {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -886px;
+  background-position: -1320px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_slime {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -886px;
+  background-position: -1320px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_sloth {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -886px;
+  background-position: -1320px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_snail {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -868px -1326px;
+  background-position: -1320px -1112px;
  width: 219px;
  height: 213px;
 }
 .quest_snake {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -356px;
+  background-position: -877px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_spider {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -1543px;
+  background-position: -251px -1519px;
  width: 250px;
  height: 150px;
 }
 .quest_squirrel {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -886px;
+  background-position: 0px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_stoikalmCalamity1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -513px;
+  background-position: -1762px -721px;
  width: 150px;
  height: 150px;
 }
 .quest_stoikalmCalamity2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1100px -886px;
+  background-position: -220px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_stoikalmCalamity3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px 0px;
+  background-position: -440px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_stone {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -220px;
+  background-position: -660px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_taskwoodsTerror1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -664px;
+  background-position: -1762px -872px;
  width: 150px;
  height: 150px;
 }
 .quest_taskwoodsTerror2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -434px -1326px;
+  background-position: -1540px -1082px;
  width: 216px;
  height: 216px;
 }
 .quest_taskwoodsTerror3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -440px;
+  background-position: -880px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_treeling {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -534px;
+  background-position: -1094px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_trex {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px 0px;
+  background-position: -1762px 0px;
  width: 204px;
  height: 177px;
 }
 .quest_trex_undead {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -712px;
+  background-position: -1311px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_triceratops {
  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -660px;
+  background-position: -1100px -1112px;
  width: 219px;
  height: 219px;
 }
-.quest_turquoise {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1323px -880px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turtle {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px -1106px;
-  width: 219px;
-  height: 219px;
-}
-.quest_unicorn {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -220px -1106px;
-  width: 219px;
-  height: 219px;
-}
-.quest_velociraptor {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: 0px 0px;
-  width: 222px;
-  height: 225px;
-}
-.quest_vice1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -890px;
-  width: 216px;
-  height: 177px;
-}
-.quest_vice2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -440px -1106px;
-  width: 219px;
-  height: 219px;
-}
-.quest_vice3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1543px -1068px;
-  width: 216px;
-  height: 177px;
-}
-.quest_waffle {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -660px -1106px;
-  width: 219px;
-  height: 219px;
-}
-.quest_whale {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -880px -1106px;
-  width: 219px;
-  height: 219px;
-}
-.quest_yarn {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -651px -1326px;
-  width: 216px;
-  height: 216px;
-}
-.quest_atom1_soapBars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -362px;
-  width: 48px;
-  height: 51px;
-}
-.quest_dilatoryDistress1_blueFins {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -414px;
-  width: 51px;
-  height: 48px;
-}
-.quest_dilatoryDistress1_fireCoral {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -513px;
-  width: 48px;
-  height: 51px;
-}
-.quest_egg_plainEgg {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -565px;
-  width: 48px;
-  height: 51px;
-}
-.quest_evilsanta2_branches {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -664px;
-  width: 48px;
-  height: 51px;
-}
-.quest_evilsanta2_tracks {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1898px -815px;
-  width: 54px;
-  height: 60px;
-}
-.quest_goldenknight1_testimony {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -716px;
-  width: 48px;
-  height: 51px;
-}
-.quest_lostMasterclasser1_ancientTome {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1927px -1091px;
-  width: 33px;
-  height: 42px;
-}
-.quest_lostMasterclasser1_forbiddenTome {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1356px;
-  width: 33px;
-  height: 42px;
-}
-.quest_lostMasterclasser1_hiddenTome {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1794px -1356px;
-  width: 33px;
-  height: 42px;
-}
-.quest_mayhemMistiflying2_mistifly1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1898px -884px;
-  width: 48px;
-  height: 51px;
-}
-.quest_mayhemMistiflying2_mistifly2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1898px -953px;
-  width: 48px;
-  height: 51px;
-}
-.quest_mayhemMistiflying2_mistifly3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1898px -1022px;
-  width: 48px;
-  height: 51px;
-}
-.quest_moon1_shard {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -463px;
-  width: 42px;
-  height: 42px;
-}
-.quest_moonstone1_moonstone {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1930px -1264px;
-  width: 30px;
-  height: 30px;
-}
-.quest_robot_bolt {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1829px -1091px;
-  width: 48px;
-  height: 51px;
-}
-.quest_robot_gear {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1878px -1091px;
-  width: 48px;
-  height: 51px;
-}
-.quest_robot_spring {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1160px;
-  width: 48px;
-  height: 51px;
-}
-.quest_ruby_aquariusRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1890px -1264px;
-  width: 39px;
-  height: 40px;
-}
-.quest_ruby_rubyGem {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1809px -1160px;
-  width: 48px;
-  height: 51px;
-}
-.quest_ruby_venusRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1316px;
-  width: 39px;
-  height: 39px;
-}
-.quest_silver_cancerRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1800px -1316px;
-  width: 39px;
-  height: 39px;
-}
-.quest_silver_moonRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1809px -1264px;
-  width: 39px;
-  height: 42px;
-}
-.quest_silver_silverIngot {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1858px -1160px;
-  width: 48px;
-  height: 51px;
-}
-.quest_stoikalmCalamity2_icicleCoin {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1907px -1160px;
-  width: 48px;
-  height: 51px;
-}
-.quest_stone_capricornRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -617px;
-  width: 42px;
-  height: 42px;
-}
-.quest_stone_marsRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1911px -768px;
-  width: 42px;
-  height: 42px;
-}
-.quest_stone_mossyStone {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1212px;
-  width: 48px;
-  height: 51px;
-}
-.quest_taskwoodsTerror2_brownie {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1809px -1212px;
-  width: 48px;
-  height: 51px;
-}
-.quest_taskwoodsTerror2_dryad {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1858px -1212px;
-  width: 48px;
-  height: 51px;
-}
-.quest_taskwoodsTerror2_pixie {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1907px -1212px;
-  width: 48px;
-  height: 51px;
-}
-.quest_turquoise_neptuneRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1840px -1316px;
-  width: 39px;
-  height: 39px;
-}
-.quest_turquoise_sagittariusRune {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1880px -1316px;
-  width: 39px;
-  height: 39px;
-}
-.quest_turquoise_turquoiseGem {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1264px;
-  width: 48px;
-  height: 51px;
-}
-.quest_vice2_lightCrystal {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1849px -1264px;
-  width: 40px;
-  height: 40px;
-}
-.inventory_quest_scroll_alligator {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -815px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_amber {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1829px -815px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_armadillo {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -884px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -953px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom1_locked {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1829px -884px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1022px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom2_locked {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1829px -953px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1760px -1091px;
-  width: 68px;
-  height: 68px;
-}
-.inventory_quest_scroll_atom3_locked {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
-  background-position: -1829px -1022px;
-  width: 68px;
-  height: 68px;
-}
@@ -2,7 +2,7 @@
  position: absolute;
  right: 24px;
  top: -24px;
-  z-index: 999;
+  z-index: 998;
  align-items: center;
 }

@@ -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>
@@ -194,7 +194,7 @@
                  <h4 class="popover-content-title">
                    {{ context.item.text }}
                  </h4>
-                  <questInfo :quest="context.item" />
+                  <questInfo :quest="context.item" :purchased="true" />
                </div>
                <div v-else>
                  <h4 class="popover-content-title">
@@ -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');
@@ -152,6 +152,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    purchased: {
+      type: Boolean,
+      default: false,
+    },
  },
  data () {
    return {
@@ -206,7 +210,7 @@ export default {
      return collect.text;
    },
    countdownString () {
-      if (!this.quest.event) return;
+      if (!this.quest.event || this.purchased) return;
      const diffDuration = moment.duration(moment(this.quest.event.end).diff(moment()));

      if (diffDuration.asSeconds() <= 0) {
@@ -27,7 +27,7 @@
    position: fixed;
    right: 10px;
    width: 350px;
-    z-index: 1400; // 1400 is above modal backgrounds
+    z-index: 999;

    top: var(--current-scrollY);

@@ -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>
@@ -0,0 +1,14 @@
+# List of the current zIndexes
+
+|Type|zIndex|File|
+|:-|:-|:-|
+|Progress Bar|1600|app.vue|
+|Create App Menu|999|create-task.scss|
+|Loading Screen|1050|loading-screen.scss|
+|Modals|1350|modal.scss|
+|Toolbar (Habitica Menu)|1080|menu.vue|
+|Toolbar (Habitica Menu), when a Modal is opened|1035||
+|Top Banner (above Toolbar)|1300|base.vue|
+|Top Banner (above Toolbar), when a Modal is opened|1035|
+|Toolbar Dropdown|1000|.dropdown-menu|
+|Notifications|999|notifications.vue|
@@ -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 {
--- a/Show More
+++ b/Show More